@etsoo/materialui 1.4.54 → 1.4.56

package/lib/app/ServiceApp.js

@@ -134,7 +134,6 @@ export class ServiceApp extends ReactApp {
     userLoginEx(user, core, dispatch) {
         // User login
         const { refreshToken } = user;
-        this.userLogin(user, refreshToken, dispatch);
         // Core system login
         core ??= {
             refreshToken,
@@ -144,6 +143,8 @@ export class ServiceApp extends ReactApp {
         };
         // Cache the core system data
         this.saveCoreToken(core);
+        // User login and trigger the dispatch at last
+        this.userLogin(user, refreshToken, dispatch);
     }
     /**
      * Save core system data
@@ -167,7 +168,7 @@ 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);
+        const [result, refreshToken] = await new AuthApi(this).switchOrg({ organizationId, fromOrganizationId, token: this.coreAccessToken }, payload);
         if (result == null)
             return;
         if (!result.ok) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.4.54",
+  "version": "1.4.56",
   "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

@@ -176,7 +176,6 @@ export class ServiceApp<
   ) {
     // User login
     const { refreshToken } = user;
-    this.userLogin(user, refreshToken, dispatch);
 
     // Core system login
     core ??= {
@@ -188,6 +187,9 @@ export class ServiceApp<
 
     // Cache the core system data
     this.saveCoreToken(core);
+
+    // User login and trigger the dispatch at last
+    this.userLogin(user, refreshToken, dispatch);
   }
 
   /**
@@ -220,10 +222,7 @@ 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
     );