From 2ca68021d254ae0eb9bd7fe96872de55a7cf7d9d Mon Sep 17 00:00:00 2001
From: Akshit Sharma <akshit.s@outlook.com>
Date: Fri, 23 Oct 2026 06:22:21 +0000
Subject: [PATCH] fix: show org create/update error without added quotes
 (#15323)

---
 .../organizations/AddUpdateOrganization.spec.ts | 17 +++++++++++++++++
 .../iam/organizations/AddUpdateOrganization.vue | 10 ++++------
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/web/src/components/iam/organizations/AddUpdateOrganization.spec.ts b/web/src/components/iam/organizations/AddUpdateOrganization.spec.ts
index f39f987fe8..cfe076b03d 100644
--- a/web/src/components/iam/organizations/AddUpdateOrganization.spec.ts
+++ b/web/src/components/iam/organizations/AddUpdateOrganization.spec.ts
@@ -229,6 +229,23 @@ describe("AddUpdateOrganization", () => {
       expect(toast).toHaveBeenCalledWith(expect.objectContaining({ variant: "error" }));
     });
 
+    it("shows the server message verbatim without added quotes", async () => {
+      vi.spyOn(orgService, "create").mockRejectedValueOnce({
+        response: { data: { message: "Organization creation failed." } },
+      });
+      const wrapper = mountComp();
+
+      await getNameInput(wrapper).setValue("Err Org");
+      await submitForm(wrapper);
+
+      expect(toast).toHaveBeenCalledWith(
+        expect.objectContaining({
+          variant: "error",
+          message: "Organization creation failed.",
+        }),
+      );
+    });
+
     it("renames the organization in update mode", async () => {
       const wrapper = mountComp({ modelValue: { id: "123", name: "Acme" } });
       await getNameInput(wrapper).setValue("Acme Renamed");
diff --git a/web/src/components/iam/organizations/AddUpdateOrganization.vue b/web/src/components/iam/organizations/AddUpdateOrganization.vue
index 6c63e0446e..76c3b50509 100644
--- a/web/src/components/iam/organizations/AddUpdateOrganization.vue
+++ b/web/src/components/iam/organizations/AddUpdateOrganization.vue
@@ -225,12 +225,10 @@ export default defineComponent({
         toast({
           variant: "error",
           message: raw(
-            JSON.stringify(
-              err?.response?.data["message"] ||
-                (organizationId
-                  ? this.t("iam.addUpdateOrganization.updateFailed")
-                  : this.t("iam.addUpdateOrganization.createFailed")),
-            ),
+            err?.response?.data["message"] ||
+              (organizationId
+                ? this.t("iam.addUpdateOrganization.updateFailed")
+                : this.t("iam.addUpdateOrganization.createFailed")),
           ),
         });
       }