@etsoo/materialui 1.4.53 → 1.4.55

package/lib/app/ServiceApp.d.ts

@@ -73,7 +73,7 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * @param fromOrganizationId From organization ID
      * @param payload Payload
      */
-    switchOrg(organizationId: number, fromOrganizationId?: number, payload?: IApiPayload<IActionResult<U & ServiceUserToken>>): Promise<void>;
+    switchOrg(organizationId: number, fromOrganizationId?: number, payload?: IApiPayload<IActionResult<U & ServiceUserToken>>): Promise<IActionResult<U & ServiceUserToken> | undefined>;
     /**
      * Try login
      * @param params Login parameters

package/lib/app/ServiceApp.js

@@ -167,9 +167,15 @@ export class ServiceApp extends ReactApp {
         if (!this.coreAccessToken) {
             throw new Error("Core access token is required to switch organization.");
         }
-        const [result, refreshToken] = await new AuthApi(this, this.coreApi).switchOrg({ organizationId, fromOrganizationId, token: this.coreAccessToken }, payload);
-        if (result == null || result.data == null)
+        const [result, refreshToken] = await new AuthApi(this).switchOrg({ organizationId, fromOrganizationId, token: this.coreAccessToken }, payload);
+        if (result == null)
             return;
+        if (!result.ok) {
+            return result;
+        }
+        if (result.data == null) {
+            throw new Error("Invalid switch organization result.");
+        }
         let core;
         if ("core" in result.data && typeof result.data.core === "string") {
             core = JSON.parse(result.data.core);
@@ -179,6 +185,7 @@ export class ServiceApp extends ReactApp {
         const user = refreshToken ? { ...result.data, refreshToken } : result.data;
         // User login
         this.userLoginEx(user, core, true);
+        return result;
     }
     /**
      * Try login

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.4.53",
+  "version": "1.4.55",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "type": "module",
@@ -39,8 +39,8 @@
     "@etsoo/notificationbase": "^1.1.54",
     "@etsoo/react": "^1.8.15",
     "@etsoo/shared": "^1.2.55",
-    "@mui/icons-material": "^6.3.0",
-    "@mui/material": "^6.3.0",
+    "@mui/icons-material": "^6.3.1",
+    "@mui/material": "^6.3.1",
     "@mui/x-data-grid": "^7.23.5",
     "chart.js": "^4.4.7",
     "chartjs-plugin-datalabels": "^2.2.0",

package/src/app/ServiceApp.ts

@@ -220,15 +220,20 @@ export class ServiceApp<
       throw new Error("Core access token is required to switch organization.");
     }
 
-    const [result, refreshToken] = await new AuthApi(
-      this,
-      this.coreApi
-    ).switchOrg(
+    const [result, refreshToken] = await new AuthApi(this).switchOrg(
       { organizationId, fromOrganizationId, token: this.coreAccessToken },
       payload
     );
 
-    if (result == null || result.data == null) return;
+    if (result == null) return;
+
+    if (!result.ok) {
+      return result;
+    }
+
+    if (result.data == null) {
+      throw new Error("Invalid switch organization result.");
+    }
 
     let core: ApiRefreshTokenDto | undefined;
     if ("core" in result.data && typeof result.data.core === "string") {
@@ -241,6 +246,8 @@ export class ServiceApp<
 
     // User login
     this.userLoginEx(user, core, true);
+
+    return result;
   }
 
   /**