@etsoo/materialui 1.6.86 → 1.6.88

package/lib/cjs/app/ReactApp.d.ts

@@ -180,7 +180,7 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser> extends C
      * @param refreshToken Refresh token
      * @param dispatch User state dispatch
      */
-    userLogin(user: D, refreshToken: string, dispatch?: boolean): void;
+    userLogin(user: D, refreshToken: string, dispatch?: boolean): Promise<void>;
     /**
      * User login callback
      * @param user New user
@@ -190,7 +190,7 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser> extends C
      * User login dispatch
      * @param user New user
      */
-    protected doLoginDispatch(user: D): void;
+    protected doLoginDispatch(user: D): Promise<void>;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/cjs/app/ReactApp.js

@@ -307,12 +307,12 @@ class ReactApp extends appscript_1.CoreApp {
      * @param refreshToken Refresh token
      * @param dispatch User state dispatch
      */
-    userLogin(user, refreshToken, dispatch) {
+    async userLogin(user, refreshToken, dispatch) {
         // Super call, set token
-        super.userLogin(user, refreshToken);
+        await super.userLogin(user, refreshToken);
         // Dispatch action
         if (dispatch !== false) {
-            this.doLoginDispatch(user);
+            await this.doLoginDispatch(user);
         }
     }
     /**
@@ -326,14 +326,13 @@ class ReactApp extends appscript_1.CoreApp {
      * User login dispatch
      * @param user New user
      */
-    doLoginDispatch(user) {
-        this.onUserLogin(user).then(() => {
-            if (this.userStateDispatch != null)
-                this.userStateDispatch({
-                    type: react_2.UserActionType.Login,
-                    user
-                });
-        });
+    async doLoginDispatch(user) {
+        await this.onUserLogin(user);
+        if (this.userStateDispatch != null)
+            this.userStateDispatch({
+                type: react_2.UserActionType.Login,
+                user
+            });
     }
     /**
      * User logout

package/lib/cjs/app/ServiceApp.js

@@ -141,9 +141,9 @@ class ServiceApp extends ReactApp_1.ReactApp {
             expiresIn: user.seconds
         };
         // Cache the core system data
-        this.saveCoreToken(core);
+        await this.saveCoreToken(core);
         // User login and trigger the dispatch at last
-        this.userLogin(user, refreshToken, dispatch);
+        await this.userLogin(user, refreshToken, dispatch);
     }
     /**
      * Save core system data
@@ -155,7 +155,7 @@ class ServiceApp extends ReactApp_1.ReactApp {
         // Cache the core system refresh token
         this.storage.setData(coreTokenKey, await this.encrypt(data.refreshToken));
         // Exchange tokens
-        this.exchangeTokenAll(data);
+        await this.exchangeTokenAll(data);
     }
     /**
      * On switch organization handler
@@ -189,11 +189,11 @@ class ServiceApp extends ReactApp_1.ReactApp {
         // Override the user data's refresh token
         const user = refreshToken ? { ...result.data, refreshToken } : result.data;
         // User login without dispatch
-        this.userLoginEx(user, core, false);
+        await this.userLoginEx(user, core, false);
         // Handle the switch organization
         await this.onSwitchOrg();
         // Trigger the dispatch at last
-        this.doLoginDispatch(user);
+        await this.doLoginDispatch(user);
         return result;
     }
     async refreshTokenSucceed(user, token, callback) {
@@ -221,7 +221,7 @@ class ServiceApp extends ReactApp_1.ReactApp {
             return;
         // Cache the core system refresh token
         // Follow similar logic in userLoginEx
-        this.saveCoreToken(data);
+        await this.saveCoreToken(data);
         // Call the super
         await super.refreshTokenSucceed(user, token, callback);
     }

package/lib/mjs/app/ReactApp.d.ts

@@ -180,7 +180,7 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser> extends C
      * @param refreshToken Refresh token
      * @param dispatch User state dispatch
      */
-    userLogin(user: D, refreshToken: string, dispatch?: boolean): void;
+    userLogin(user: D, refreshToken: string, dispatch?: boolean): Promise<void>;
     /**
      * User login callback
      * @param user New user
@@ -190,7 +190,7 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser> extends C
      * User login dispatch
      * @param user New user
      */
-    protected doLoginDispatch(user: D): void;
+    protected doLoginDispatch(user: D): Promise<void>;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/mjs/app/ReactApp.js

@@ -299,12 +299,12 @@ export class ReactApp extends CoreApp {
      * @param refreshToken Refresh token
      * @param dispatch User state dispatch
      */
-    userLogin(user, refreshToken, dispatch) {
+    async userLogin(user, refreshToken, dispatch) {
         // Super call, set token
-        super.userLogin(user, refreshToken);
+        await super.userLogin(user, refreshToken);
         // Dispatch action
         if (dispatch !== false) {
-            this.doLoginDispatch(user);
+            await this.doLoginDispatch(user);
         }
     }
     /**
@@ -318,14 +318,13 @@ export class ReactApp extends CoreApp {
      * User login dispatch
      * @param user New user
      */
-    doLoginDispatch(user) {
-        this.onUserLogin(user).then(() => {
-            if (this.userStateDispatch != null)
-                this.userStateDispatch({
-                    type: UserActionType.Login,
-                    user
-                });
-        });
+    async doLoginDispatch(user) {
+        await this.onUserLogin(user);
+        if (this.userStateDispatch != null)
+            this.userStateDispatch({
+                type: UserActionType.Login,
+                user
+            });
     }
     /**
      * User logout

package/lib/mjs/app/ServiceApp.js

@@ -138,9 +138,9 @@ export class ServiceApp extends ReactApp {
             expiresIn: user.seconds
         };
         // Cache the core system data
-        this.saveCoreToken(core);
+        await this.saveCoreToken(core);
         // User login and trigger the dispatch at last
-        this.userLogin(user, refreshToken, dispatch);
+        await this.userLogin(user, refreshToken, dispatch);
     }
     /**
      * Save core system data
@@ -152,7 +152,7 @@ export class ServiceApp extends ReactApp {
         // Cache the core system refresh token
         this.storage.setData(coreTokenKey, await this.encrypt(data.refreshToken));
         // Exchange tokens
-        this.exchangeTokenAll(data);
+        await this.exchangeTokenAll(data);
     }
     /**
      * On switch organization handler
@@ -186,11 +186,11 @@ export class ServiceApp extends ReactApp {
         // Override the user data's refresh token
         const user = refreshToken ? { ...result.data, refreshToken } : result.data;
         // User login without dispatch
-        this.userLoginEx(user, core, false);
+        await this.userLoginEx(user, core, false);
         // Handle the switch organization
         await this.onSwitchOrg();
         // Trigger the dispatch at last
-        this.doLoginDispatch(user);
+        await this.doLoginDispatch(user);
         return result;
     }
     async refreshTokenSucceed(user, token, callback) {
@@ -218,7 +218,7 @@ export class ServiceApp extends ReactApp {
             return;
         // Cache the core system refresh token
         // Follow similar logic in userLoginEx
-        this.saveCoreToken(data);
+        await this.saveCoreToken(data);
         // Call the super
         await super.refreshTokenSucceed(user, token, callback);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.6.86",
+  "version": "1.6.88",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -40,23 +40,23 @@
     "@dnd-kit/react": "^0.5.0",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
-    "@etsoo/appscript": "^1.6.77",
+    "@etsoo/appscript": "^1.6.78",
     "@etsoo/notificationbase": "^1.1.75",
-    "@etsoo/react": "^1.9.2",
+    "@etsoo/react": "^1.9.4",
     "@etsoo/shared": "^1.2.91",
     "@mui/icons-material": "^9.4.0",
     "@mui/material": "^9.4.0",
     "@mui/x-data-grid": "^9.13.0",
     "chart.js": "^4.5.1",
     "chartjs-plugin-datalabels": "^2.2.0",
-    "dompurify": "^3.4.14",
+    "dompurify": "^3.4.15",
     "eventemitter3": "^5.0.4",
     "pica": "^10.0.3",
     "pulltorefreshjs": "^0.1.22",
-    "react": "^19.2.8",
+    "react": "^19.3.0",
     "react-avatar-editor": "^15.1.0",
     "react-chartjs-2": "^5.3.1",
-    "react-dom": "^19.2.8",
+    "react-dom": "^19.3.0",
     "react-draggable": "^4.7.1",
     "react-imask": "7.6.1",
     "signature_pad": "^5.1.4"
@@ -70,9 +70,9 @@
     "@testing-library/react": "^16.3.3",
     "@types/pica": "^9.0.5",
     "@types/pulltorefreshjs": "^0.1.7",
-    "@types/react": "^19.2.18",
+    "@types/react": "^19.3.0",
     "@types/react-avatar-editor": "^13.0.4",
-    "@types/react-dom": "^19.2.7",
+    "@types/react-dom": "^19.3.0",
     "@types/react-input-mask": "^3.0.6",
     "@vitejs/plugin-react": "^6.1.1",
     "jsdom": "^30.0.1",

package/src/app/ReactApp.ts

@@ -113,7 +113,8 @@ export interface IReactAppBase {
  * Core application interface
  */
 export interface IReactApp<S extends IAppSettings, D extends IUser>
-  extends ICoreApp<D, S, React.ReactNode, NotificationReactCallProps>,
+  extends
+    ICoreApp<D, S, React.ReactNode, NotificationReactCallProps>,
     Omit<IReactAppBase, "userState"> {
   /**
    * User state
@@ -478,13 +479,17 @@ export class ReactApp<S extends IAppSettings, D extends IUser>
    * @param refreshToken Refresh token
    * @param dispatch User state dispatch
    */
-  override userLogin(user: D, refreshToken: string, dispatch?: boolean): void {
+  override async userLogin(
+    user: D,
+    refreshToken: string,
+    dispatch?: boolean
+  ): Promise<void> {
     // Super call, set token
-    super.userLogin(user, refreshToken);
+    await super.userLogin(user, refreshToken);
 
     // Dispatch action
     if (dispatch !== false) {
-      this.doLoginDispatch(user);
+      await this.doLoginDispatch(user);
     }
   }
 
@@ -500,14 +505,14 @@ export class ReactApp<S extends IAppSettings, D extends IUser>
    * User login dispatch
    * @param user New user
    */
-  protected doLoginDispatch(user: D) {
-    this.onUserLogin(user).then(() => {
-      if (this.userStateDispatch != null)
-        this.userStateDispatch({
-          type: UserActionType.Login,
-          user
-        });
-    });
+  protected async doLoginDispatch(user: D) {
+    await this.onUserLogin(user);
+
+    if (this.userStateDispatch != null)
+      this.userStateDispatch({
+        type: UserActionType.Login,
+        user
+      });
   }
 
   /**

package/src/app/ServiceApp.ts

@@ -188,10 +188,10 @@ export class ServiceApp<
     };
 
     // Cache the core system data
-    this.saveCoreToken(core);
+    await this.saveCoreToken(core);
 
     // User login and trigger the dispatch at last
-    this.userLogin(user, refreshToken, dispatch);
+    await this.userLogin(user, refreshToken, dispatch);
   }
 
   /**
@@ -206,7 +206,7 @@ export class ServiceApp<
     this.storage.setData(coreTokenKey, await this.encrypt(data.refreshToken));
 
     // Exchange tokens
-    this.exchangeTokenAll(data);
+    await this.exchangeTokenAll(data);
   }
 
   /**
@@ -255,13 +255,13 @@ export class ServiceApp<
     const user = refreshToken ? { ...result.data, refreshToken } : result.data;
 
     // User login without dispatch
-    this.userLoginEx(user, core, false);
+    await this.userLoginEx(user, core, false);
 
     // Handle the switch organization
     await this.onSwitchOrg();
 
     // Trigger the dispatch at last
-    this.doLoginDispatch(user);
+    await this.doLoginDispatch(user);
 
     return result;
   }
@@ -298,7 +298,7 @@ export class ServiceApp<
 
     // Cache the core system refresh token
     // Follow similar logic in userLoginEx
-    this.saveCoreToken(data);
+    await this.saveCoreToken(data);
 
     // Call the super
     await super.refreshTokenSucceed(user, token, callback);