@etsoo/materialui 1.2.30 → 1.2.32

package/src/app/CommonApp.ts

@@ -1,224 +1,212 @@
 import {
-    IActionResult,
-    IApiPayload,
-    IAppSettings,
-    IUser,
-    RefreshTokenProps,
-    RefreshTokenResult,
-    RefreshTokenRQ
-} from '@etsoo/appscript';
-import { CoreConstants, IPageData } from '@etsoo/react';
-import { ReactApp } from './ReactApp';
+  IActionResult,
+  IApiPayload,
+  IAppSettings,
+  IUser,
+  RefreshTokenProps,
+  RefreshTokenResult,
+  RefreshTokenRQ
+} from "@etsoo/appscript";
+import { CoreConstants, IPageData } from "@etsoo/react";
+import { ReactApp } from "./ReactApp";
 
 /**
  * Common independent application
  * 通用独立程序
  */
 export abstract class CommonApp<
-    U extends IUser = IUser,
-    P extends IPageData = IPageData,
-    S extends IAppSettings = IAppSettings
+  U extends IUser = IUser,
+  P extends IPageData = IPageData,
+  S extends IAppSettings = IAppSettings
 > extends ReactApp<S, U, P> {
-    /**
-     * Override persistedFields
-     */
-    protected override get persistedFields() {
-        return [...super.persistedFields, CoreConstants.FieldUserIdSaved];
+  /**
+   * Override persistedFields
+   */
+  protected override get persistedFields() {
+    return [...super.persistedFields, CoreConstants.FieldUserIdSaved];
+  }
+
+  /**
+   * Init call update fields in local storage
+   * @returns Fields
+   */
+  protected override initCallEncryptedUpdateFields(): string[] {
+    const fields = super.initCallEncryptedUpdateFields();
+    fields.push(CoreConstants.FieldUserIdSaved);
+    return fields;
+  }
+
+  /**
+   * Do user login
+   * @param data User data
+   * @param refreshToken Refresh token
+   * @param keep Keep login
+   * @returns Success data
+   */
+  protected doUserLogin(
+    data: U,
+    refreshToken: string,
+    keep: boolean
+  ): string | undefined {
+    this.userLogin(data, refreshToken, keep);
+    return undefined;
+  }
+
+  /**
+   * Refresh token
+   * @param props Props
+   */
+  override async refreshToken<D extends object = RefreshTokenRQ>(
+    props?: RefreshTokenProps<D>
+  ) {
+    // Destruct
+    const {
+      callback,
+      data,
+      relogin = false,
+      showLoading = false
+    } = props ?? {};
+
+    // Token
+    const token = this.getCacheToken();
+    if (token == null || token === "") {
+      if (callback) callback(false);
+      return false;
     }
 
-    /**
-     * Init call update fields in local storage
-     * @returns Fields
-     */
-    protected override initCallEncryptedUpdateFields(): string[] {
-        const fields = super.initCallEncryptedUpdateFields();
-        fields.push(CoreConstants.FieldUserIdSaved);
-        return fields;
-    }
-
-    /**
-     * Do user login
-     * @param data User data
-     * @param refreshToken Refresh token
-     * @param keep Keep login
-     * @returns Success data
-     */
-    protected doUserLogin(
-        data: U,
-        refreshToken: string,
-        keep: boolean
-    ): string | undefined {
-        this.userLogin(data, refreshToken, keep);
-        return undefined;
-    }
-
-    /**
-     * Refresh token
-     * @param props Props
-     */
-    override async refreshToken<D extends object = RefreshTokenRQ>(
-        props?: RefreshTokenProps<D>
-    ) {
-        // Destruct
-        const {
-            callback,
-            data,
-            relogin = false,
-            showLoading = false
-        } = props ?? {};
-
-        // Token
-        const token = this.getCacheToken();
-        if (token == null || token === '') {
-            if (callback) callback(false);
-            return false;
-        }
-
-        // Reqest data
-        const rq: RefreshTokenRQ = {
-            deviceId: this.deviceId,
-            timezone: this.getTimeZone(),
-            ...data
-        };
-
-        // 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;
-            }
-        };
-
-        // Success callback
-        const success = (
-            result: LoginResult,
-            failCallback?: (
-                result: RefreshTokenResult,
-                serviceToken?: string
-            ) => void
-        ) => {
-            // Token
-            const refreshToken = this.getResponseToken(payload.response);
-            if (refreshToken == null || result.data == null) {
-                if (failCallback) failCallback(this.get('noData')!);
-                return false;
+    // Reqest data
+    const rq: RefreshTokenRQ = {
+      deviceId: this.deviceId,
+      timezone: this.getTimeZone(),
+      ...data
+    };
+
+    // 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;
+      }
+    };
+
+    // Success callback
+    const success = (
+      result: LoginResult,
+      failCallback?: (result: RefreshTokenResult, serviceToken?: string) => void
+    ) => {
+      // 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
+      var successData = this.doUserLogin(result.data, refreshToken, keep);
+
+      // Callback
+      if (failCallback) failCallback(true, successData);
+
+      return true;
+    };
+
+    // Call API
+    const result = await this.api.put<LoginResult>(
+      "Auth/RefreshToken",
+      rq,
+      payload
+    );
+
+    if (result == null) return false;
+
+    if (!result.ok) {
+      if (result.type === "TokenExpired" && relogin) {
+        // Try login
+        // Dialog to receive password
+        var labels = this.getLabels("reloginTip", "login");
+        this.notifier.prompt(
+          labels.reloginTip,
+          async (pwd) => {
+            if (pwd == null) {
+              this.toLoginPage();
+              return;
             }
 
-            // Keep
-            const keep = this.storage.getData(
-                CoreConstants.FieldLoginKeep,
-                false
-            );
+            // Set password for the action
+            rq.pwd = await this.encrypt(await this.hash(pwd));
 
-            // User login
-            var successData = this.doUserLogin(result.data, refreshToken, keep);
-
-            // Callback
-            if (failCallback) failCallback(true, successData);
+            // Submit again
+            const result = await this.api.put<LoginResult>(
+              "Auth/RefreshToken",
+              rq,
+              payload
+            );
 
-            return true;
-        };
+            if (result == null) return;
 
-        // Call API
-        const result = await this.api.put<LoginResult>(
-            'Auth/RefreshToken',
-            rq,
-            payload
-        );
+            if (result.ok) {
+              success(result, (loginResult: RefreshTokenResult) => {
+                if (loginResult === true) {
+                  if (callback) callback(true);
+                  return;
+                }
 
-        if (result == null) return false;
-
-        if (!result.ok) {
-            if (result.type === 'TokenExpired' && relogin) {
-                // Try login
-                // Dialog to receive password
-                var labels = this.getLabels('reloginTip', 'login');
-                this.notifier.prompt(
-                    labels.reloginTip,
-                    async (pwd) => {
-                        if (pwd == null) {
-                            this.toLoginPage();
-                            return;
-                        }
-
-                        // Set password for the action
-                        rq.pwd = this.encrypt(this.hash(pwd));
-
-                        // Submit again
-                        const result = await this.api.put<LoginResult>(
-                            'Auth/RefreshToken',
-                            rq,
-                            payload
-                        );
-
-                        if (result == null) return;
-
-                        if (result.ok) {
-                            success(
-                                result,
-                                (loginResult: RefreshTokenResult) => {
-                                    if (loginResult === true) {
-                                        if (callback) callback(true);
-                                        return;
-                                    }
-
-                                    const message =
-                                        this.formatRefreshTokenResult(
-                                            loginResult
-                                        );
-                                    if (message) this.notifier.alert(message);
-                                }
-                            );
-                            return;
-                        }
-
-                        // Popup message
-                        this.alertResult(result);
-                        return false;
-                    },
-                    labels.login,
-                    { type: 'password' }
-                );
-
-                // Fake truth to avoid reloading
-                return true;
+                const message = this.formatRefreshTokenResult(loginResult);
+                if (message) this.notifier.alert(message);
+              });
+              return;
             }
 
-            if (callback) callback(result);
+            // Popup message
+            this.alertResult(result);
             return false;
-        }
+          },
+          labels.login,
+          { type: "password" }
+        );
 
-        return success(result, callback);
-    }
+        // Fake truth to avoid reloading
+        return true;
+      }
 
-    /**
-     * Try login
-     * @param data Additional data
-     * @param showLoading Show loading bar or not
-     * @returns Result
-     */
-    override async tryLogin<D extends object = RefreshTokenRQ>(
-        data?: D,
-        showLoading?: boolean
-    ) {
-        // Reset user state
-        const result = await super.tryLogin(data);
-        if (!result) return false;
-
-        // Refresh token
-        return await this.refreshToken({
-            callback: (result) => this.doRefreshTokenResult(result),
-            data,
-            showLoading,
-            relogin: true
-        });
+      if (callback) callback(result);
+      return false;
     }
+
+    return success(result, callback);
+  }
+
+  /**
+   * Try login
+   * @param data Additional data
+   * @param showLoading Show loading bar or not
+   * @returns Result
+   */
+  override async tryLogin<D extends object = RefreshTokenRQ>(
+    data?: D,
+    showLoading?: boolean
+  ) {
+    // Reset user state
+    const result = await super.tryLogin(data);
+    if (!result) return false;
+
+    // Refresh token
+    return await this.refreshToken({
+      callback: (result) => this.doRefreshTokenResult(result),
+      data,
+      showLoading,
+      relogin: true
+    });
+  }
 }

package/src/app/IServiceApp.ts

@@ -1,47 +1,47 @@
-import { IApi } from '@etsoo/appscript';
-import { IServiceUser } from './IServiceUser';
-import { ReactAppType } from './ReactApp';
+import { IApi } from "@etsoo/appscript";
+import { IServiceUser } from "./IServiceUser";
+import { ReactAppType } from "./ReactApp";
 
 /**
  * Service application interface
  */
 export interface IServiceApp extends ReactAppType {
-    /**
-     * Service API
-     */
-    readonly serviceApi: IApi;
+  /**
+   * Service API
+   */
+  readonly serviceApi: IApi;
 
-    /**
-     * Service user
-     */
-    readonly serviceUser?: IServiceUser;
+  /**
+   * Service user
+   */
+  readonly serviceUser?: IServiceUser;
 
-    /**
-     * Load SmartERP core
-     */
-    loadSmartERP(): void;
+  /**
+   * Load SmartERP core
+   */
+  loadSmartERP(): void;
 
-    /**
-     * Service decrypt message
-     * @param messageEncrypted Encrypted message
-     * @param passphrase Secret passphrase
-     * @returns Pure text
-     */
-    serviceDecrypt(
-        messageEncrypted: string,
-        passphrase?: string
-    ): string | undefined;
+  /**
+   * Service decrypt message
+   * @param messageEncrypted Encrypted message
+   * @param passphrase Secret passphrase
+   * @returns Pure text
+   */
+  serviceDecrypt(
+    messageEncrypted: string,
+    passphrase?: string
+  ): Promise<string | undefined>;
 
-    /**
-     * Service encrypt message
-     * @param message Message
-     * @param passphrase Secret passphrase
-     * @param iterations Iterations, 1000 times, 1 - 99
-     * @returns Result
-     */
-    serviceEncrypt(
-        message: string,
-        passphrase?: string,
-        iterations?: number
-    ): string | undefined;
+  /**
+   * Service encrypt message
+   * @param message Message
+   * @param passphrase Secret passphrase
+   * @param iterations Iterations, 1000 times, 1 - 99
+   * @returns Result
+   */
+  serviceEncrypt(
+    message: string,
+    passphrase?: string,
+    iterations?: number
+  ): Promise<string | undefined>;
 }

package/src/app/ReactApp.ts

@@ -312,20 +312,20 @@ export class ReactApp<
    */
   override changeCulture(culture: DataTypes.CultureDefinition) {
     // Super call to update cultrue
-    super.changeCulture(culture);
-
-    // Update component labels
-    Labels.setLabels(culture.resources, {
-      notificationMU: {
-        alertTitle: "warning",
-        alertOK: "ok",
-        confirmTitle: "confirm",
-        confirmYes: "ok",
-        confirmNo: "cancel",
-        promptTitle: "prompt",
-        promptCancel: "cancel",
-        promptOK: "ok"
-      }
+    super.changeCulture(culture, (resources) => {
+      // Update component labels
+      Labels.setLabels(resources, {
+        notificationMU: {
+          alertTitle: "warning",
+          alertOK: "ok",
+          confirmTitle: "confirm",
+          confirmYes: "ok",
+          confirmNo: "cancel",
+          promptTitle: "prompt",
+          promptCancel: "cancel",
+          promptOK: "ok"
+        }
+      });
     });
 
     // Document title

package/src/app/ServiceApp.ts

@@ -226,7 +226,7 @@ export class ServiceApp<
             }
 
             // Set password for the action
-            rq.pwd = this.encrypt(this.hash(pwd));
+            rq.pwd = await this.encrypt(await this.hash(pwd));
 
             // Submit again
             const result = await this.api.put<LoginResult>(
@@ -325,11 +325,10 @@ export class ServiceApp<
    */
   userLoginEx(user: ISmartERPUser, refreshToken: string, serviceUser: U) {
     // Service user login
-    this.servicePassphrase =
-      this.decrypt(
-        serviceUser.servicePassphrase,
-        this.settings.serviceId.toString()
-      ) ?? "";
+    this.decrypt(
+      serviceUser.servicePassphrase,
+      this.settings.serviceId.toString()
+    ).then((result) => (this.servicePassphrase = result ?? ""));
 
     // Service user
     this.serviceUser = serviceUser;