@etsoo/materialui 1.4.55 → 1.4.57

package/lib/app/ServiceApp.d.ts

@@ -47,13 +47,6 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * @param action Callback
      */
     signout(action?: () => void | boolean): Promise<void>;
-    /**
-     * User login extended
-     * @param user New user
-     * @param refreshToken Refresh token
-     * @param dispatch User state dispatch
-     */
-    userLogin(user: U, refreshToken: string, dispatch?: boolean): void;
     /**
      *
      * @param user Current user

package/lib/app/ServiceApp.js

@@ -106,12 +106,13 @@ export class ServiceApp extends ReactApp {
         return super.signout(action);
     }
     /**
-     * User login extended
-     * @param user New user
-     * @param refreshToken Refresh token
+     *
+     * @param user Current user
+     * @param core Core system API token data
+     * @param keep Keep in local storage or not
      * @param dispatch User state dispatch
      */
-    userLogin(user, refreshToken, dispatch) {
+    userLoginEx(user, core, dispatch) {
         if (user.clientDeviceId && user.passphrase) {
             // Save the passphrase
             // Interpolated string expressions are different between TypeScript and C# for the null value
@@ -121,21 +122,10 @@ export class ServiceApp extends ReactApp {
                 this.updatePassphrase(passphrase);
             }
         }
-        // Super call, set token
-        super.userLogin(user, refreshToken, dispatch);
-    }
-    /**
-     *
-     * @param user Current user
-     * @param core Core system API token data
-     * @param keep Keep in local storage or not
-     * @param dispatch User state dispatch
-     */
-    userLoginEx(user, core, dispatch) {
         // User login
         const { refreshToken } = user;
-        this.userLogin(user, refreshToken, dispatch);
         // Core system login
+        // It's the extreme case, the core system token should not be the same with the current app user token
         core ??= {
             refreshToken,
             accessToken: user.token,
@@ -144,6 +134,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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.4.55",
+  "version": "1.4.57",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "type": "module",

package/src/app/ServiceApp.ts

@@ -139,12 +139,17 @@ export class ServiceApp<
   }
 
   /**
-   * User login extended
-   * @param user New user
-   * @param refreshToken Refresh token
+   *
+   * @param user Current user
+   * @param core Core system API token data
+   * @param keep Keep in local storage or not
    * @param dispatch User state dispatch
    */
-  override userLogin(user: U, refreshToken: string, dispatch?: boolean): void {
+  userLoginEx(
+    user: U & ServiceUserToken,
+    core?: ApiRefreshTokenDto,
+    dispatch?: boolean
+  ) {
     if (user.clientDeviceId && user.passphrase) {
       // Save the passphrase
       // Interpolated string expressions are different between TypeScript and C# for the null value
@@ -158,27 +163,11 @@ export class ServiceApp<
       }
     }
 
-    // Super call, set token
-    super.userLogin(user, refreshToken, dispatch);
-  }
-
-  /**
-   *
-   * @param user Current user
-   * @param core Core system API token data
-   * @param keep Keep in local storage or not
-   * @param dispatch User state dispatch
-   */
-  userLoginEx(
-    user: U & ServiceUserToken,
-    core?: ApiRefreshTokenDto,
-    dispatch?: boolean
-  ) {
     // User login
     const { refreshToken } = user;
-    this.userLogin(user, refreshToken, dispatch);
 
     // Core system login
+    // It's the extreme case, the core system token should not be the same with the current app user token
     core ??= {
       refreshToken,
       accessToken: user.token,
@@ -188,6 +177,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);
   }
 
   /**