@etsoo/materialui 1.4.6 → 1.4.7

package/lib/app/CommonApp.d.ts

@@ -1,4 +1,4 @@
-import { AppLoginParams, IAppSettings, IUser } from "@etsoo/appscript";
+import { AppTryLoginParams, IAppSettings, IUser } from "@etsoo/appscript";
 import { IPageData } from "@etsoo/react";
 import { ReactApp } from "./ReactApp";
 /**
@@ -20,5 +20,5 @@ export declare abstract class CommonApp<U extends IUser = IUser, P extends IPage
      * @param showLoading Show loading bar or not
      * @returns Result
      */
-    tryLogin(params?: AppLoginParams): Promise<void>;
+    tryLogin(params?: AppTryLoginParams): Promise<boolean>;
 }

package/lib/app/CommonApp.js

@@ -27,18 +27,25 @@ export class CommonApp extends ReactApp {
      */
     async tryLogin(params) {
         // Check status
-        if (this.isTryingLogin)
-            return;
-        this.isTryingLogin = true;
+        const result = await super.tryLogin(params);
+        if (!result) {
+            return false;
+        }
+        // Destruct
+        const { onFailure = () => {
+            this.toLoginPage(rest);
+        }, onSuccess, ...rest } = params ?? {};
         // Refresh token
         await this.refreshToken({
             showLoading: params?.showLoading
         }, (result) => {
-            if (result) {
+            if (result === true) {
+                onSuccess?.();
             }
             else {
-                this.toLoginPage(params);
+                onFailure();
             }
         });
+        return true;
     }
 }

package/lib/app/ServiceApp.d.ts

@@ -1,4 +1,4 @@
-import { ApiRefreshTokenDto, AppLoginParams, 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";
@@ -54,4 +54,9 @@ export declare class ServiceApp<U extends IServiceUser = IServiceUser, P extends
      * @param dispatch User state dispatch
      */
     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

@@ -113,4 +113,26 @@ export class ServiceApp extends ReactApp {
         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.6",
+  "version": "1.4.7",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -50,9 +50,9 @@
     "@emotion/css": "^11.13.4",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@etsoo/appscript": "^1.5.47",
+    "@etsoo/appscript": "^1.5.49",
     "@etsoo/notificationbase": "^1.1.49",
-    "@etsoo/react": "^1.7.80",
+    "@etsoo/react": "^1.7.82",
     "@etsoo/shared": "^1.2.48",
     "@mui/icons-material": "^6.1.4",
     "@mui/material": "^6.1.4",

package/src/app/CommonApp.ts

@@ -1,4 +1,4 @@
-import { AppLoginParams, IAppSettings, IUser } from "@etsoo/appscript";
+import { AppTryLoginParams, IAppSettings, IUser } from "@etsoo/appscript";
 import { CoreConstants, IPageData } from "@etsoo/react";
 import { ReactApp } from "./ReactApp";
 
@@ -33,10 +33,21 @@ export abstract class CommonApp<
    * @param showLoading Show loading bar or not
    * @returns Result
    */
-  override async tryLogin(params?: AppLoginParams) {
+  override async tryLogin(params?: AppTryLoginParams) {
     // Check status
-    if (this.isTryingLogin) return;
-    this.isTryingLogin = true;
+    const result = await super.tryLogin(params);
+    if (!result) {
+      return false;
+    }
+
+    // Destruct
+    const {
+      onFailure = () => {
+        this.toLoginPage(rest);
+      },
+      onSuccess,
+      ...rest
+    } = params ?? {};
 
     // Refresh token
     await this.refreshToken(
@@ -44,11 +55,14 @@ export abstract class CommonApp<
         showLoading: params?.showLoading
       },
       (result) => {
-        if (result) {
+        if (result === true) {
+          onSuccess?.();
         } else {
-          this.toLoginPage(params);
+          onFailure();
         }
       }
     );
+
+    return true;
   }
 }

package/src/app/ServiceApp.ts

@@ -1,6 +1,7 @@
 import {
   ApiRefreshTokenDto,
   AppLoginParams,
+  AppTryLoginParams,
   AuthApi,
   BridgeUtils,
   ExternalEndpoint,
@@ -165,4 +166,28 @@ export class ServiceApp<
 
     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);
+  }
 }