@etsoo/materialui 1.4.5 → 1.4.7

package/lib/app/CommonApp.d.ts

@@ -1,4 +1,4 @@
-import { IAppSettings, IUser, RefreshTokenProps } from "@etsoo/appscript";
+import { AppTryLoginParams, IAppSettings, IUser } from "@etsoo/appscript";
 import { IPageData } from "@etsoo/react";
 import { ReactApp } from "./ReactApp";
 /**
@@ -15,15 +15,10 @@ export declare abstract class CommonApp<U extends IUser = IUser, P extends IPage
      * @returns Fields
      */
     protected initCallEncryptedUpdateFields(): string[];
-    /**
-     * Refresh token
-     * @param props Props
-     */
-    refreshToken(props?: RefreshTokenProps): Promise<boolean>;
     /**
      * Try login
      * @param showLoading Show loading bar or not
      * @returns Result
      */
-    tryLogin(showLoading?: boolean): Promise<boolean>;
+    tryLogin(params?: AppTryLoginParams): Promise<boolean>;
 }

package/lib/app/CommonApp.js

@@ -20,82 +20,32 @@ export class CommonApp extends ReactApp {
         fields.push(CoreConstants.FieldUserIdSaved);
         return fields;
     }
-    /**
-     * Refresh token
-     * @param props Props
-     */
-    async refreshToken(props) {
-        // Destruct
-        const { callback, showLoading = false } = props ?? {};
-        // Token
-        const token = this.getCacheToken();
-        if (token == null || token === "") {
-            if (callback)
-                callback(false);
-            return false;
-        }
-        // Reqest data
-        const rq = {
-            deviceId: this.deviceId
-        };
-        // Payload
-        const payload = {
-            // No loading bar needed to avoid screen flicks
-            showLoading,
-            config: { headers: { [CoreConstants.TokenHeaderRefresh]: token } },
-            onError: (error) => {
-                if (callback)
-                    callback(error);
-                // Prevent further processing
-                return false;
-            }
-        };
-        // Success callback
-        const success = (result, failCallback) => {
-            // Token
-            const refreshToken = this.getResponseToken(payload.response);
-            if (refreshToken == null || result.data == null) {
-                if (failCallback)
-                    failCallback(this.get("noData"));
-                return false;
-            }
-            // Keep
-            const keep = this.storage.getData(CoreConstants.FieldLoginKeep, false);
-            // User login
-            this.userLogin(result.data, refreshToken, keep);
-            // Callback
-            if (failCallback)
-                failCallback(true);
-            return true;
-        };
-        // Call API
-        const result = await this.api.put("Auth/RefreshToken", rq, payload);
-        if (result == null)
-            return false;
-        if (!result.ok) {
-            // Remove the wrong token
-            this.clearCacheToken();
-            // Callback
-            if (callback)
-                callback(result);
-            return false;
-        }
-        return success(result, callback);
-    }
     /**
      * Try login
      * @param showLoading Show loading bar or not
      * @returns Result
      */
-    async tryLogin(showLoading) {
-        // Reset user state
-        const result = await super.tryLogin(showLoading);
-        if (!result)
+    async tryLogin(params) {
+        // Check status
+        const result = await super.tryLogin(params);
+        if (!result) {
             return false;
+        }
+        // Destruct
+        const { onFailure = () => {
+            this.toLoginPage(rest);
+        }, onSuccess, ...rest } = params ?? {};
         // Refresh token
-        return await this.refreshToken({
-            callback: (result) => this.doRefreshTokenResult(result),
-            showLoading
+        await this.refreshToken({
+            showLoading: params?.showLoading
+        }, (result) => {
+            if (result === true) {
+                onSuccess?.();
+            }
+            else {
+                onFailure();
+            }
         });
+        return true;
     }
 }

package/lib/app/ReactApp.d.ts

@@ -211,10 +211,9 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
      * User login extended
      * @param user New user
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      * @param dispatch User state dispatch
      */
-    userLogin(user: D, refreshToken: string, keep?: boolean, dispatch?: boolean): void;
+    userLogin(user: D, refreshToken: string, dispatch?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/app/ReactApp.js

@@ -257,12 +257,11 @@ export class ReactApp extends CoreApp {
      * User login extended
      * @param user New user
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      * @param dispatch User state dispatch
      */
-    userLogin(user, refreshToken, keep, dispatch) {
+    userLogin(user, refreshToken, dispatch) {
         // Super call, set token
-        super.userLogin(user, refreshToken, keep);
+        super.userLogin(user, refreshToken);
         // Dispatch action
         if (this.userStateDispatch != null && dispatch !== false)
             this.userStateDispatch({

package/lib/app/ServiceApp.d.ts

@@ -1,4 +1,4 @@
-import { ApiRefreshTokenDto, ExternalEndpoint, IApi } from "@etsoo/appscript";
+import { ApiRefreshTokenDto, AppLoginParams, AppTryLoginParams, ExternalEndpoint, IApi } from "@etsoo/appscript";
 import { IServiceApp } from "./IServiceApp";
 import { IServiceAppSettings } from "./IServiceAppSettings";
 import { IServicePageData } from "./IServicePage";
@@ -36,18 +36,16 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
     loadCore(): void;
     /**
      * Go to the login page
-     * @param tryLogin Try to login again
-     * @param removeUrl Remove current URL for reuse
+     * @params Login parameters
      */
-    toLoginPage(tryLogin?: boolean, removeUrl?: boolean): void;
+    toLoginPage(params?: AppLoginParams): void;
     /**
      * User login extended
      * @param user New user
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      * @param dispatch User state dispatch
      */
-    userLogin(user: U, refreshToken: string, keep?: boolean, dispatch?: boolean): void;
+    userLogin(user: U, refreshToken: string, dispatch?: boolean): void;
     /**
      *
      * @param user Current user
@@ -55,5 +53,10 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * @param keep Keep in local storage or not
      * @param dispatch User state dispatch
      */
-    userLoginEx(user: U & ServiceUserToken, core?: ApiRefreshTokenDto, keep?: boolean, dispatch?: boolean): void;
+    userLoginEx(user: U & ServiceUserToken, core?: ApiRefreshTokenDto, dispatch?: boolean): void;
+    /**
+     * Try login
+     * @param params Login parameters
+     */
+    tryLogin(params?: AppTryLoginParams): Promise<boolean>;
 }

package/lib/app/ServiceApp.js

@@ -1,6 +1,7 @@
 import { AuthApi, BridgeUtils } from "@etsoo/appscript";
 import { ReactApp } from "./ReactApp";
 const coreName = "core";
+const coreTokenKey = "core-refresh-token";
 /**
  * Core Service App
  * Service login to core system, get the refesh token and access token
@@ -37,10 +38,11 @@ export class ServiceApp extends ReactApp {
     }
     /**
      * Go to the login page
-     * @param tryLogin Try to login again
-     * @param removeUrl Remove current URL for reuse
+     * @params Login parameters
      */
-    toLoginPage(tryLogin, removeUrl) {
+    toLoginPage(params) {
+        // Destruct
+        const { removeUrl, showLoading, ...rest } = params ?? {};
         // Cache current URL
         this.cachedUrl = removeUrl ? undefined : globalThis.location.href;
         //  Get the redirect URL
@@ -53,7 +55,7 @@ export class ServiceApp extends ReactApp {
             if (!url)
                 return;
             // Add try login flag
-            url = url.addUrlParam("tryLogin", tryLogin ?? false);
+            url = url.addUrlParams(rest);
             // Is it embeded?
             if (this.embedded) {
                 globalThis.parent.postMessage(["login", url], this.coreOrigin);
@@ -74,10 +76,9 @@ export class ServiceApp extends ReactApp {
      * User login extended
      * @param user New user
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      * @param dispatch User state dispatch
      */
-    userLogin(user, refreshToken, keep, dispatch) {
+    userLogin(user, refreshToken, dispatch) {
         if (user.clientDeviceId && user.passphrase) {
             // Save the passphrase
             // Interpolated string expressions are different between TypeScript and C# for the null value
@@ -88,7 +89,7 @@ export class ServiceApp extends ReactApp {
             }
         }
         // Super call, set token
-        super.userLogin(user, refreshToken, keep, dispatch);
+        super.userLogin(user, refreshToken, dispatch);
     }
     /**
      *
@@ -97,10 +98,10 @@ export class ServiceApp extends ReactApp {
      * @param keep Keep in local storage or not
      * @param dispatch User state dispatch
      */
-    userLoginEx(user, core, keep, dispatch) {
+    userLoginEx(user, core, dispatch) {
         // User login
         const { refreshToken } = user;
-        this.userLogin(user, refreshToken, keep, dispatch);
+        this.userLogin(user, refreshToken, dispatch);
         // Core system login
         core ?? (core = {
             refreshToken,
@@ -108,6 +109,30 @@ export class ServiceApp extends ReactApp {
             tokenType: user.tokenScheme ?? "Bearer",
             expiresIn: user.seconds
         });
+        // Cache the core system refresh token
+        this.storage.setData(coreTokenKey, core.refreshToken);
         this.exchangeTokenAll(core, coreName);
     }
+    /**
+     * Try login
+     * @param params Login parameters
+     */
+    async tryLogin(params) {
+        // Check core system token
+        const coreToken = this.storage.getData(coreTokenKey);
+        if (!coreToken)
+            return false;
+        params ?? (params = {});
+        const onSuccess = params.onSuccess;
+        params.onSuccess = () => {
+            // Call the core system API refresh token
+            this.apiRefreshTokenData(this.coreApi, coreToken).then((data) => {
+                if (data == null)
+                    return;
+                this.exchangeTokenAll(data, coreName);
+                onSuccess?.();
+            });
+        };
+        return await super.tryLogin(params);
+    }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.4.5",
+  "version": "1.4.7",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -50,14 +50,14 @@
     "@emotion/css": "^11.13.4",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@etsoo/appscript": "^1.5.39",
+    "@etsoo/appscript": "^1.5.49",
     "@etsoo/notificationbase": "^1.1.49",
-    "@etsoo/react": "^1.7.75",
+    "@etsoo/react": "^1.7.82",
     "@etsoo/shared": "^1.2.48",
-    "@mui/icons-material": "^6.1.3",
-    "@mui/material": "^6.1.3",
+    "@mui/icons-material": "^6.1.4",
+    "@mui/material": "^6.1.4",
     "@mui/x-data-grid": "^7.20.0",
-    "chart.js": "^4.4.4",
+    "chart.js": "^4.4.5",
     "chartjs-plugin-datalabels": "^2.2.0",
     "eventemitter3": "^5.0.1",
     "pica": "^9.0.1",
@@ -87,8 +87,8 @@
     "@types/react-dom": "^18.3.1",
     "@types/react-input-mask": "^3.0.5",
     "@types/react-window": "^1.8.8",
-    "@typescript-eslint/eslint-plugin": "^8.8.1",
-    "@typescript-eslint/parser": "^8.8.1",
+    "@typescript-eslint/eslint-plugin": "^8.9.0",
+    "@typescript-eslint/parser": "^8.9.0",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",
     "typescript": "^5.6.3"

package/src/app/CommonApp.ts

@@ -1,14 +1,6 @@
-import {
-  IApiPayload,
-  IAppSettings,
-  IUser,
-  RefreshTokenProps,
-  RefreshTokenResult,
-  RefreshTokenRQ
-} from "@etsoo/appscript";
+import { AppTryLoginParams, IAppSettings, IUser } from "@etsoo/appscript";
 import { CoreConstants, IPageData } from "@etsoo/react";
 import { ReactApp } from "./ReactApp";
-import { IActionResult } from "@etsoo/shared";
 
 /**
  * Common independent application
@@ -37,101 +29,40 @@ export abstract class CommonApp<
   }
 
   /**
-   * Refresh token
-   * @param props Props
+   * Try login
+   * @param showLoading Show loading bar or not
+   * @returns Result
    */
-  override async refreshToken(props?: RefreshTokenProps) {
-    // Destruct
-    const { callback, showLoading = false } = props ?? {};
-
-    // Token
-    const token = this.getCacheToken();
-    if (token == null || token === "") {
-      if (callback) callback(false);
+  override async tryLogin(params?: AppTryLoginParams) {
+    // Check status
+    const result = await super.tryLogin(params);
+    if (!result) {
       return false;
     }
 
-    // Reqest data
-    const rq: RefreshTokenRQ = {
-      deviceId: this.deviceId
-    };
-
-    // Login result type
-    type LoginResult = IActionResult<U>;
-
-    // Payload
-    const payload: IApiPayload<LoginResult, any> = {
-      // No loading bar needed to avoid screen flicks
-      showLoading,
-      config: { headers: { [CoreConstants.TokenHeaderRefresh]: token } },
-      onError: (error) => {
-        if (callback) callback(error);
-
-        // Prevent further processing
-        return false;
-      }
-    };
+    // Destruct
+    const {
+      onFailure = () => {
+        this.toLoginPage(rest);
+      },
+      onSuccess,
+      ...rest
+    } = params ?? {};
 
-    // Success callback
-    const success = (
-      result: LoginResult,
-      failCallback?: (result: RefreshTokenResult) => void
-    ) => {
-      // Token
-      const refreshToken = this.getResponseToken(payload.response);
-      if (refreshToken == null || result.data == null) {
-        if (failCallback) failCallback(this.get("noData")!);
-        return false;
+    // Refresh token
+    await this.refreshToken(
+      {
+        showLoading: params?.showLoading
+      },
+      (result) => {
+        if (result === true) {
+          onSuccess?.();
+        } else {
+          onFailure();
+        }
       }
-
-      // Keep
-      const keep = this.storage.getData(CoreConstants.FieldLoginKeep, false);
-
-      // User login
-      this.userLogin(result.data, refreshToken, keep);
-
-      // Callback
-      if (failCallback) failCallback(true);
-
-      return true;
-    };
-
-    // Call API
-    const result = await this.api.put<LoginResult>(
-      "Auth/RefreshToken",
-      rq,
-      payload
     );
 
-    if (result == null) return false;
-
-    if (!result.ok) {
-      // Remove the wrong token
-      this.clearCacheToken();
-
-      // Callback
-      if (callback) callback(result);
-
-      return false;
-    }
-
-    return success(result, callback);
-  }
-
-  /**
-   * Try login
-   * @param showLoading Show loading bar or not
-   * @returns Result
-   */
-  override async tryLogin(showLoading?: boolean) {
-    // Reset user state
-    const result = await super.tryLogin(showLoading);
-    if (!result) return false;
-
-    // Refresh token
-    return await this.refreshToken({
-      callback: (result) => this.doRefreshTokenResult(result),
-      showLoading
-    });
+    return true;
   }
 }

package/src/app/ReactApp.ts

@@ -494,17 +494,11 @@ export class ReactApp<
    * User login extended
    * @param user New user
    * @param refreshToken Refresh token
-   * @param keep Keep in local storage or not
    * @param dispatch User state dispatch
    */
-  override userLogin(
-    user: D,
-    refreshToken: string,
-    keep?: boolean,
-    dispatch?: boolean
-  ): void {
+  override userLogin(user: D, refreshToken: string, dispatch?: boolean): void {
     // Super call, set token
-    super.userLogin(user, refreshToken, keep);
+    super.userLogin(user, refreshToken);
 
     // Dispatch action
     if (this.userStateDispatch != null && dispatch !== false)

package/src/app/ServiceApp.ts

@@ -1,5 +1,7 @@
 import {
   ApiRefreshTokenDto,
+  AppLoginParams,
+  AppTryLoginParams,
   AuthApi,
   BridgeUtils,
   ExternalEndpoint,
@@ -12,6 +14,7 @@ import { IServiceUser, ServiceUserToken } from "./IServiceUser";
 import { ReactApp } from "./ReactApp";
 
 const coreName = "core";
+const coreTokenKey = "core-refresh-token";
 
 /**
  * Core Service App
@@ -73,10 +76,12 @@ export class ServiceApp<
 
   /**
    * Go to the login page
-   * @param tryLogin Try to login again
-   * @param removeUrl Remove current URL for reuse
+   * @params Login parameters
    */
-  override toLoginPage(tryLogin?: boolean, removeUrl?: boolean) {
+  override toLoginPage(params?: AppLoginParams) {
+    // Destruct
+    const { removeUrl, showLoading, ...rest } = params ?? {};
+
     // Cache current URL
     this.cachedUrl = removeUrl ? undefined : globalThis.location.href;
 
@@ -90,7 +95,7 @@ export class ServiceApp<
         if (!url) return;
 
         // Add try login flag
-        url = url.addUrlParam("tryLogin", tryLogin ?? false);
+        url = url.addUrlParams(rest);
 
         // Is it embeded?
         if (this.embedded) {
@@ -112,15 +117,9 @@ export class ServiceApp<
    * User login extended
    * @param user New user
    * @param refreshToken Refresh token
-   * @param keep Keep in local storage or not
    * @param dispatch User state dispatch
    */
-  override userLogin(
-    user: U,
-    refreshToken: string,
-    keep?: boolean,
-    dispatch?: boolean
-  ): void {
+  override userLogin(user: U, refreshToken: string, dispatch?: boolean): void {
     if (user.clientDeviceId && user.passphrase) {
       // Save the passphrase
       // Interpolated string expressions are different between TypeScript and C# for the null value
@@ -135,7 +134,7 @@ export class ServiceApp<
     }
 
     // Super call, set token
-    super.userLogin(user, refreshToken, keep, dispatch);
+    super.userLogin(user, refreshToken, dispatch);
   }
 
   /**
@@ -148,12 +147,11 @@ export class ServiceApp<
   userLoginEx(
     user: U & ServiceUserToken,
     core?: ApiRefreshTokenDto,
-    keep?: boolean,
     dispatch?: boolean
   ) {
     // User login
     const { refreshToken } = user;
-    this.userLogin(user, refreshToken, keep, dispatch);
+    this.userLogin(user, refreshToken, dispatch);
 
     // Core system login
     core ??= {
@@ -163,6 +161,33 @@ export class ServiceApp<
       expiresIn: user.seconds
     };
 
+    // Cache the core system refresh token
+    this.storage.setData(coreTokenKey, core.refreshToken);
+
     this.exchangeTokenAll(core, coreName);
   }
+
+  /**
+   * Try login
+   * @param params Login parameters
+   */
+  override async tryLogin(params?: AppTryLoginParams) {
+    // Check core system token
+    const coreToken = this.storage.getData<string>(coreTokenKey);
+    if (!coreToken) return false;
+
+    params ??= {};
+    const onSuccess = params.onSuccess;
+    params.onSuccess = () => {
+      // Call the core system API refresh token
+      this.apiRefreshTokenData(this.coreApi, coreToken).then((data) => {
+        if (data == null) return;
+
+        this.exchangeTokenAll(data, coreName);
+
+        onSuccess?.();
+      });
+    };
+    return await super.tryLogin(params);
+  }
 }