@etsoo/materialui 1.4.14 → 1.4.16

package/lib/app/IServiceAppSettings.d.ts

@@ -3,9 +3,4 @@ import { IAppSettings } from "@etsoo/appscript";
  * Service app settings interface
  */
 export interface IServiceAppSettings extends IAppSettings {
-    /**
-     * Application id
-     * 程序编号
-     */
-    appId: number;
 }

package/lib/app/ReactApp.js

@@ -203,15 +203,16 @@ export class ReactApp extends CoreApp {
      * @returns Result
      */
     async tryLogin(data) {
+        // Destruct
+        const { onFailure = () => {
+            this.toLoginPage(rest);
+        }, onSuccess, ...rest } = data ?? {};
         // Check status
         const result = await super.tryLogin(data);
         if (!result) {
+            onFailure();
             return false;
         }
-        // Destruct
-        const { onFailure = () => {
-            this.toLoginPage(rest);
-        }, onSuccess, ...rest } = data ?? {};
         // Refresh token
         await this.refreshToken({
             showLoading: data?.showLoading

package/lib/app/ServiceApp.js

@@ -141,9 +141,17 @@ export class ServiceApp extends ReactApp {
             onFailure();
             return false;
         }
+        const coreTokenDecrypted = this.decrypt(coreToken);
+        if (!coreTokenDecrypted) {
+            onFailure();
+            return false;
+        }
         params.onSuccess = () => {
             // Call the core system API refresh token
-            this.apiRefreshTokenData(this.coreApi, coreToken).then((data) => {
+            this.apiRefreshTokenData(this.coreApi, {
+                token: coreTokenDecrypted,
+                appId: this.settings.appId
+            }).then((data) => {
                 if (data == null)
                     return;
                 // Cache the core system refresh token

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@etsoo/materialui",
-  "version": "1.4.14",
+  "version": "1.4.16",
   "description": "TypeScript Material-UI Implementation",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -50,7 +50,7 @@
     "@emotion/css": "^11.13.4",
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
-    "@etsoo/appscript": "^1.5.55",
+    "@etsoo/appscript": "^1.5.58",
     "@etsoo/notificationbase": "^1.1.52",
     "@etsoo/react": "^1.7.89",
     "@etsoo/shared": "^1.2.51",

package/src/app/IServiceAppSettings.ts

@@ -3,10 +3,4 @@ import { IAppSettings } from "@etsoo/appscript";
 /**
  * Service app settings interface
  */
-export interface IServiceAppSettings extends IAppSettings {
-  /**
-   * Application id
-   * 程序编号
-   */
-  appId: number;
-}
+export interface IServiceAppSettings extends IAppSettings {}

package/src/app/ReactApp.ts

@@ -425,12 +425,6 @@ export class ReactApp<
    * @returns Result
    */
   override async tryLogin(data?: AppTryLoginParams) {
-    // Check status
-    const result = await super.tryLogin(data);
-    if (!result) {
-      return false;
-    }
-
     // Destruct
     const {
       onFailure = () => {
@@ -440,6 +434,13 @@ export class ReactApp<
       ...rest
     } = data ?? {};
 
+    // Check status
+    const result = await super.tryLogin(data);
+    if (!result) {
+      onFailure();
+      return false;
+    }
+
     // Refresh token
     await this.refreshToken(
       {

package/src/app/ServiceApp.ts

@@ -199,9 +199,18 @@ export class ServiceApp<
       return false;
     }
 
+    const coreTokenDecrypted = this.decrypt(coreToken);
+    if (!coreTokenDecrypted) {
+      onFailure();
+      return false;
+    }
+
     params.onSuccess = () => {
       // Call the core system API refresh token
-      this.apiRefreshTokenData(this.coreApi, coreToken).then((data) => {
+      this.apiRefreshTokenData(this.coreApi, {
+        token: coreTokenDecrypted,
+        appId: this.settings.appId
+      }).then((data) => {
         if (data == null) return;
 
         // Cache the core system refresh token