@etsoo/materialui 1.4.52 → 1.4.54

package/lib/app/ServiceApp.d.ts

@@ -1,9 +1,10 @@
-import { ApiRefreshTokenDto, AppLoginParams, AppTryLoginParams, ExternalEndpoint, IApi } from "@etsoo/appscript";
+import { ApiRefreshTokenDto, AppLoginParams, AppTryLoginParams, ExternalEndpoint, IApi, IApiPayload } from "@etsoo/appscript";
 import { IServiceApp } from "./IServiceApp";
 import { IServiceAppSettings } from "./IServiceAppSettings";
 import { IServicePageData } from "./IServicePage";
 import { IServiceUser, ServiceUserToken } from "./IServiceUser";
 import { ReactApp } from "./ReactApp";
+import { IActionResult } from "@etsoo/shared";
 /**
  * Core Service App
  * Service login to core system, get the refesh token and access token
@@ -23,6 +24,7 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * Core system origin
      */
     readonly coreOrigin: string;
+    private coreAccessToken;
     /**
      * Constructor
      * @param settings Settings
@@ -61,10 +63,17 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      */
     userLoginEx(user: U & ServiceUserToken, core?: ApiRefreshTokenDto, dispatch?: boolean): void;
     /**
-     * Save core system refresh token
-     * @param token New refresh token
+     * Save core system data
+     * @param data Data
      */
-    protected saveCoreToken(token: string): void;
+    protected saveCoreToken(data: ApiRefreshTokenDto): void;
+    /**
+     * Switch organization
+     * @param organizationId Organization ID
+     * @param fromOrganizationId From organization ID
+     * @param payload Payload
+     */
+    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

@@ -22,6 +22,7 @@ export class ServiceApp extends ReactApp {
      * Core system origin
      */
     coreOrigin;
+    coreAccessToken;
     /**
      * Constructor
      * @param settings Settings
@@ -141,16 +142,50 @@ export class ServiceApp extends ReactApp {
             tokenType: user.tokenScheme ?? "Bearer",
             expiresIn: user.seconds
         };
+        // Cache the core system data
+        this.saveCoreToken(core);
+    }
+    /**
+     * Save core system data
+     * @param data Data
+     */
+    saveCoreToken(data) {
+        // Hold the core system access token
+        this.coreAccessToken = data.accessToken;
         // Cache the core system refresh token
-        this.saveCoreToken(core.refreshToken);
-        this.exchangeTokenAll(core, coreName);
+        this.storage.setData(coreTokenKey, this.encrypt(data.refreshToken));
+        // Exchange tokens
+        this.exchangeTokenAll(data, coreName);
     }
     /**
-     * Save core system refresh token
-     * @param token New refresh token
+     * Switch organization
+     * @param organizationId Organization ID
+     * @param fromOrganizationId From organization ID
+     * @param payload Payload
      */
-    saveCoreToken(token) {
-        this.storage.setData(coreTokenKey, this.encrypt(token));
+    async switchOrg(organizationId, fromOrganizationId, payload) {
+        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)
+            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);
+            delete result.data.core;
+        }
+        // Override the user data's refresh token
+        const user = refreshToken ? { ...result.data, refreshToken } : result.data;
+        // User login
+        this.userLoginEx(user, core, true);
+        return result;
     }
     /**
      * Try login
@@ -185,8 +220,7 @@ export class ServiceApp extends ReactApp {
                 if (data == null)
                     return;
                 // Cache the core system refresh token
-                this.saveCoreToken(data.refreshToken);
-                this.exchangeTokenAll(data, coreName);
+                this.saveCoreToken(data);
                 onSuccess?.();
             });
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.4.52",
+  "version": "1.4.54",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "type": "module",
@@ -35,13 +35,13 @@
     "@emotion/css": "^11.13.5",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
-    "@etsoo/appscript": "^1.5.81",
+    "@etsoo/appscript": "^1.5.82",
     "@etsoo/notificationbase": "^1.1.54",
-    "@etsoo/react": "^1.8.14",
+    "@etsoo/react": "^1.8.15",
     "@etsoo/shared": "^1.2.55",
-    "@mui/icons-material": "^6.2.0",
-    "@mui/material": "^6.2.0",
-    "@mui/x-data-grid": "^7.23.2",
+    "@mui/icons-material": "^6.3.0",
+    "@mui/material": "^6.3.0",
+    "@mui/x-data-grid": "^7.23.5",
     "chart.js": "^4.4.7",
     "chartjs-plugin-datalabels": "^2.2.0",
     "eventemitter3": "^5.0.1",
@@ -49,7 +49,7 @@
     "pulltorefreshjs": "^0.1.22",
     "react": "^18.3.1",
     "react-avatar-editor": "^13.0.2",
-    "react-chartjs-2": "^5.2.0",
+    "react-chartjs-2": "^5.3.0",
     "react-dom": "^18.3.1",
     "react-draggable": "^4.4.6",
     "react-imask": "7.6.1"
@@ -63,11 +63,11 @@
     "@babel/preset-typescript": "^7.26.0",
     "@babel/runtime-corejs3": "^7.26.0",
     "@testing-library/react": "^16.1.0",
-    "@types/pica": "^9.0.4",
+    "@types/pica": "^9.0.5",
     "@types/pulltorefreshjs": "^0.1.7",
-    "@types/react": "^18.3.13",
+    "@types/react": "^18.3.18",
     "@types/react-avatar-editor": "^13.0.3",
-    "@types/react-dom": "^18.3.1",
+    "@types/react-dom": "^18.3.5",
     "@types/react-input-mask": "^3.0.6",
     "@types/react-window": "^1.8.8",
     "@vitejs/plugin-react": "^4.3.4",

package/src/app/ServiceApp.ts

@@ -5,13 +5,15 @@ import {
   AuthApi,
   BridgeUtils,
   ExternalEndpoint,
-  IApi
+  IApi,
+  IApiPayload
 } from "@etsoo/appscript";
 import { IServiceApp } from "./IServiceApp";
 import { IServiceAppSettings } from "./IServiceAppSettings";
 import { IServicePageData } from "./IServicePage";
 import { IServiceUser, ServiceUserToken } from "./IServiceUser";
 import { ReactApp } from "./ReactApp";
+import { IActionResult } from "@etsoo/shared";
 
 const coreName = "core";
 const coreTokenKey = "core-refresh-token";
@@ -46,6 +48,8 @@ export class ServiceApp<
    */
   readonly coreOrigin: string;
 
+  private coreAccessToken: string | undefined;
+
   /**
    * Constructor
    * @param settings Settings
@@ -182,18 +186,71 @@ export class ServiceApp<
       expiresIn: user.seconds
     };
 
+    // Cache the core system data
+    this.saveCoreToken(core);
+  }
+
+  /**
+   * Save core system data
+   * @param data Data
+   */
+  protected saveCoreToken(data: ApiRefreshTokenDto) {
+    // Hold the core system access token
+    this.coreAccessToken = data.accessToken;
+
     // Cache the core system refresh token
-    this.saveCoreToken(core.refreshToken);
+    this.storage.setData(coreTokenKey, this.encrypt(data.refreshToken));
 
-    this.exchangeTokenAll(core, coreName);
+    // Exchange tokens
+    this.exchangeTokenAll(data, coreName);
   }
 
   /**
-   * Save core system refresh token
-   * @param token New refresh token
+   * Switch organization
+   * @param organizationId Organization ID
+   * @param fromOrganizationId From organization ID
+   * @param payload Payload
    */
-  protected saveCoreToken(token: string) {
-    this.storage.setData(coreTokenKey, this.encrypt(token));
+  async switchOrg(
+    organizationId: number,
+    fromOrganizationId?: number,
+    payload?: IApiPayload<IActionResult<U & ServiceUserToken>>
+  ) {
+    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) 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") {
+      core = JSON.parse(result.data.core);
+      delete result.data.core;
+    }
+
+    // Override the user data's refresh token
+    const user = refreshToken ? { ...result.data, refreshToken } : result.data;
+
+    // User login
+    this.userLoginEx(user, core, true);
+
+    return result;
   }
 
   /**
@@ -233,9 +290,7 @@ export class ServiceApp<
         if (data == null) return;
 
         // Cache the core system refresh token
-        this.saveCoreToken(data.refreshToken);
-
-        this.exchangeTokenAll(data, coreName);
+        this.saveCoreToken(data);
 
         onSuccess?.();
       });