@etsoo/materialui 1.4.9 → 1.4.11

package/lib/app/ServiceApp.d.ts

@@ -54,6 +54,11 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * @param dispatch User state dispatch
      */
     userLoginEx(user: U & ServiceUserToken, core?: ApiRefreshTokenDto, dispatch?: boolean): void;
+    /**
+     * Save core system refresh token
+     * @param token New refresh token
+     */
+    protected saveCoreToken(token: string): void;
     /**
      * Try login
      * @param params Login parameters

package/lib/app/ServiceApp.js

@@ -110,22 +110,33 @@ export class ServiceApp extends ReactApp {
             expiresIn: user.seconds
         });
         // Cache the core system refresh token
-        this.storage.setData(coreTokenKey, core.refreshToken);
+        this.saveCoreToken(core.refreshToken);
         this.exchangeTokenAll(core, coreName);
     }
+    /**
+     * Save core system refresh token
+     * @param token New refresh token
+     */
+    saveCoreToken(token) {
+        this.storage.setData(coreTokenKey, this.encrypt(token));
+    }
     /**
      * Try login
      * @param params Login parameters
      */
     async tryLogin(params) {
-        // Current callback
+        // Destruct
         params ?? (params = {});
-        const onSuccess = params.onSuccess;
-        const onFailure = params.onFailure;
+        let { onFailure, onSuccess, ...rest } = params;
+        if (onFailure == null) {
+            onFailure = params.onFailure = () => {
+                this.toLoginPage(rest);
+            };
+        }
         // Check core system token
         const coreToken = this.storage.getData(coreTokenKey);
         if (!coreToken) {
-            onFailure?.();
+            onFailure();
             return false;
         }
         params.onSuccess = () => {
@@ -134,7 +145,7 @@ export class ServiceApp extends ReactApp {
                 if (data == null)
                     return;
                 // Cache the core system refresh token
-                this.storage.setData(coreTokenKey, data.refreshToken);
+                this.saveCoreToken(data.refreshToken);
                 this.exchangeTokenAll(data, coreName);
                 onSuccess?.();
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.4.9",
+  "version": "1.4.11",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -50,10 +50,10 @@
     "@emotion/css": "^11.13.4",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@etsoo/appscript": "^1.5.50",
-    "@etsoo/notificationbase": "^1.1.49",
-    "@etsoo/react": "^1.7.83",
-    "@etsoo/shared": "^1.2.48",
+    "@etsoo/appscript": "^1.5.52",
+    "@etsoo/notificationbase": "^1.1.50",
+    "@etsoo/react": "^1.7.85",
+    "@etsoo/shared": "^1.2.49",
     "@mui/icons-material": "^6.1.4",
     "@mui/material": "^6.1.4",
     "@mui/x-data-grid": "^7.20.0",
@@ -77,7 +77,7 @@
     "@babel/preset-react": "^7.25.7",
     "@babel/preset-typescript": "^7.25.7",
     "@babel/runtime-corejs3": "^7.25.7",
-    "@testing-library/jest-dom": "^6.5.0",
+    "@testing-library/jest-dom": "^6.6.1",
     "@testing-library/react": "^16.0.1",
     "@types/jest": "^29.5.13",
     "@types/pica": "^9.0.4",

package/src/app/ServiceApp.ts

@@ -162,25 +162,38 @@ export class ServiceApp<
     };
 
     // Cache the core system refresh token
-    this.storage.setData(coreTokenKey, core.refreshToken);
+    this.saveCoreToken(core.refreshToken);
 
     this.exchangeTokenAll(core, coreName);
   }
 
+  /**
+   * Save core system refresh token
+   * @param token New refresh token
+   */
+  protected saveCoreToken(token: string) {
+    this.storage.setData(coreTokenKey, this.encrypt(token));
+  }
+
   /**
    * Try login
    * @param params Login parameters
    */
   override async tryLogin(params?: AppTryLoginParams) {
-    // Current callback
+    // Destruct
     params ??= {};
-    const onSuccess = params.onSuccess;
-    const onFailure = params.onFailure;
+    let { onFailure, onSuccess, ...rest } = params;
+
+    if (onFailure == null) {
+      onFailure = params.onFailure = () => {
+        this.toLoginPage(rest);
+      };
+    }
 
     // Check core system token
     const coreToken = this.storage.getData<string>(coreTokenKey);
     if (!coreToken) {
-      onFailure?.();
+      onFailure();
       return false;
     }
 
@@ -190,13 +203,14 @@ export class ServiceApp<
         if (data == null) return;
 
         // Cache the core system refresh token
-        this.storage.setData(coreTokenKey, data.refreshToken);
+        this.saveCoreToken(data.refreshToken);
 
         this.exchangeTokenAll(data, coreName);
 
         onSuccess?.();
       });
     };
+
     return await super.tryLogin(params);
   }
 }