@etsoo/materialui 1.4.59 → 1.4.61

package/lib/app/CommonApp.d.ts

@@ -7,9 +7,12 @@ import { ReactApp } from "./ReactApp";
  */
 export declare abstract class CommonApp<U extends IUser = IUser, P extends IPageData = IPageData, S extends IAppSettings = IAppSettings> extends ReactApp<S, U, P> {
     /**
-     * Override persistedFields
+     * Constructor
+     * @param settings Settings
+     * @param name Application name
+     * @param debug Debug mode
      */
-    protected get persistedFields(): string[];
+    constructor(settings: S, name: string, debug?: boolean);
     /**
      * Init call update fields in local storage
      * @returns Fields

package/lib/app/CommonApp.js

@@ -6,10 +6,15 @@ import { ReactApp } from "./ReactApp";
  */
 export class CommonApp extends ReactApp {
     /**
-     * Override persistedFields
+     * Constructor
+     * @param settings Settings
+     * @param name Application name
+     * @param debug Debug mode
      */
-    get persistedFields() {
-        return [...super.persistedFields, CoreConstants.FieldUserIdSaved];
+    constructor(settings, name, debug = false) {
+        super(settings, name, debug);
+        // Add persisted fields
+        this.persistedFields.push(CoreConstants.FieldUserIdSaved);
     }
     /**
      * Init call update fields in local storage

package/lib/app/ReactApp.js

@@ -233,7 +233,8 @@ export class ReactApp extends CoreApp {
      */
     async tryLogin(data) {
         // Destruct
-        const { onFailure = () => {
+        const { onFailure = (type) => {
+            console.log(`Try login failed: ${type}.`);
             this.toLoginPage(rest);
         }, onSuccess, ...rest } = data ?? {};
         // Check status
@@ -255,7 +256,11 @@ export class ReactApp extends CoreApp {
             else if (result != null && !this.tryLoginIgnoreResult(result)) {
                 onFailure("ReactAppRefreshTokenFailed: " + JSON.stringify(result));
             }
-            // Ignore other results
+            else {
+                // Ignore other results
+                onFailure("ReactAppRefreshTokenIgnoredFailure: " + JSON.stringify(result));
+                return true;
+            }
         });
         return true;
     }

package/lib/app/ServiceApp.d.ts

@@ -67,6 +67,7 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * @param payload Payload
      */
     switchOrg(organizationId: number, fromOrganizationId?: number, payload?: IApiPayload<IActionResult<U & ServiceUserToken>>): Promise<IActionResult<U & ServiceUserToken> | undefined>;
+    protected refreshTokenSucceed(user: U, token: string, callback?: (result?: boolean | IActionResult) => boolean | void): Promise<void>;
     /**
      * Try login
      * @param params Login parameters

package/lib/app/ServiceApp.js

@@ -180,6 +180,35 @@ export class ServiceApp extends ReactApp {
         this.userLoginEx(user, core, true);
         return result;
     }
+    async refreshTokenSucceed(user, token, callback) {
+        // Check core system token
+        const coreToken = this.storage.getData(coreTokenKey);
+        if (!coreToken) {
+            callback?.({ ok: false, type: "noData", title: "Core token is blank" });
+            return;
+        }
+        const coreTokenDecrypted = this.decrypt(coreToken);
+        if (!coreTokenDecrypted) {
+            callback?.({
+                ok: false,
+                type: "noData",
+                title: "Core token decrypted is blank"
+            });
+            return;
+        }
+        // Call the core system API refresh token
+        const data = await this.apiRefreshTokenData(this.coreApi, {
+            token: coreTokenDecrypted,
+            appId: this.settings.appId
+        });
+        if (data == null)
+            return;
+        // Cache the core system refresh token
+        // Follow similar logic in userLoginEx
+        this.saveCoreToken(data);
+        // Call the super
+        await super.refreshTokenSucceed(user, token, callback);
+    }
     /**
      * Try login
      * @param params Login parameters
@@ -187,37 +216,13 @@ export class ServiceApp extends ReactApp {
     async tryLogin(params) {
         // Destruct
         params ??= {};
-        let { onFailure, onSuccess, ...rest } = params;
+        let { onFailure, ...rest } = params;
         if (onFailure == null) {
             onFailure = params.onFailure = (type) => {
                 console.log(`Try login failed: ${type}.`);
                 this.toLoginPage(rest);
             };
         }
-        // Check core system token
-        const coreToken = this.storage.getData(coreTokenKey);
-        if (!coreToken) {
-            onFailure("ServiceAppCoreTokenNoData");
-            return false;
-        }
-        const coreTokenDecrypted = this.decrypt(coreToken);
-        if (!coreTokenDecrypted) {
-            onFailure("ServiceAppCoreTokenNoDecryptedData");
-            return false;
-        }
-        params.onSuccess = () => {
-            // Call the core system API refresh token
-            this.apiRefreshTokenData(this.coreApi, {
-                token: coreTokenDecrypted,
-                appId: this.settings.appId
-            }).then((data) => {
-                if (data == null)
-                    return;
-                // Cache the core system refresh token
-                this.saveCoreToken(data);
-                onSuccess?.();
-            });
-        };
         return await super.tryLogin(params);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.4.59",
+  "version": "1.4.61",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "type": "module",
@@ -35,9 +35,9 @@
     "@emotion/css": "^11.13.5",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.0",
-    "@etsoo/appscript": "^1.5.83",
+    "@etsoo/appscript": "^1.5.87",
     "@etsoo/notificationbase": "^1.1.54",
-    "@etsoo/react": "^1.8.17",
+    "@etsoo/react": "^1.8.20",
     "@etsoo/shared": "^1.2.55",
     "@mui/icons-material": "^6.3.1",
     "@mui/material": "^6.3.1",
@@ -72,7 +72,7 @@
     "@types/react-window": "^1.8.8",
     "@vitejs/plugin-react": "^4.3.4",
     "jsdom": "^25.0.1",
-    "typescript": "^5.7.2",
+    "typescript": "^5.7.3",
     "vitest": "^2.1.8"
   }
 }

package/src/app/CommonApp.ts

@@ -12,10 +12,16 @@ export abstract class CommonApp<
   S extends IAppSettings = IAppSettings
 > extends ReactApp<S, U, P> {
   /**
-   * Override persistedFields
+   * Constructor
+   * @param settings Settings
+   * @param name Application name
+   * @param debug Debug mode
    */
-  protected override get persistedFields() {
-    return [...super.persistedFields, CoreConstants.FieldUserIdSaved];
+  constructor(settings: S, name: string, debug: boolean = false) {
+    super(settings, name, debug);
+
+    // Add persisted fields
+    this.persistedFields.push(CoreConstants.FieldUserIdSaved);
   }
 
   /**

package/src/app/ReactApp.ts

@@ -427,7 +427,8 @@ export class ReactApp<
   override async tryLogin(data?: AppTryLoginParams) {
     // Destruct
     const {
-      onFailure = () => {
+      onFailure = (type: string) => {
+        console.log(`Try login failed: ${type}.`);
         this.toLoginPage(rest);
       },
       onSuccess,
@@ -453,8 +454,13 @@ export class ReactApp<
           onFailure("ReactAppRefreshTokenFailed");
         } else if (result != null && !this.tryLoginIgnoreResult(result)) {
           onFailure("ReactAppRefreshTokenFailed: " + JSON.stringify(result));
+        } else {
+          // Ignore other results
+          onFailure(
+            "ReactAppRefreshTokenIgnoredFailure: " + JSON.stringify(result)
+          );
+          return true;
         }
-        // Ignore other results
       }
     );
 

package/src/app/ServiceApp.ts

@@ -244,6 +244,44 @@ export class ServiceApp<
     return result;
   }
 
+  protected override async refreshTokenSucceed(
+    user: U,
+    token: string,
+    callback?: (result?: boolean | IActionResult) => boolean | void
+  ): Promise<void> {
+    // Check core system token
+    const coreToken = this.storage.getData<string>(coreTokenKey);
+    if (!coreToken) {
+      callback?.({ ok: false, type: "noData", title: "Core token is blank" });
+      return;
+    }
+
+    const coreTokenDecrypted = this.decrypt(coreToken);
+    if (!coreTokenDecrypted) {
+      callback?.({
+        ok: false,
+        type: "noData",
+        title: "Core token decrypted is blank"
+      });
+      return;
+    }
+
+    // Call the core system API refresh token
+    const data = await this.apiRefreshTokenData(this.coreApi, {
+      token: coreTokenDecrypted,
+      appId: this.settings.appId
+    });
+
+    if (data == null) return;
+
+    // Cache the core system refresh token
+    // Follow similar logic in userLoginEx
+    this.saveCoreToken(data);
+
+    // Call the super
+    await super.refreshTokenSucceed(user, token, callback);
+  }
+
   /**
    * Try login
    * @param params Login parameters
@@ -251,7 +289,7 @@ export class ServiceApp<
   override async tryLogin(params?: AppTryLoginParams) {
     // Destruct
     params ??= {};
-    let { onFailure, onSuccess, ...rest } = params;
+    let { onFailure, ...rest } = params;
 
     if (onFailure == null) {
       onFailure = params.onFailure = (type) => {
@@ -260,34 +298,6 @@ export class ServiceApp<
       };
     }
 
-    // Check core system token
-    const coreToken = this.storage.getData<string>(coreTokenKey);
-    if (!coreToken) {
-      onFailure("ServiceAppCoreTokenNoData");
-      return false;
-    }
-
-    const coreTokenDecrypted = this.decrypt(coreToken);
-    if (!coreTokenDecrypted) {
-      onFailure("ServiceAppCoreTokenNoDecryptedData");
-      return false;
-    }
-
-    params.onSuccess = () => {
-      // Call the core system API refresh token
-      this.apiRefreshTokenData(this.coreApi, {
-        token: coreTokenDecrypted,
-        appId: this.settings.appId
-      }).then((data) => {
-        if (data == null) return;
-
-        // Cache the core system refresh token
-        this.saveCoreToken(data);
-
-        onSuccess?.();
-      });
-    };
-
     return await super.tryLogin(params);
   }
 }