@etsoo/appscript 1.2.64 → 1.2.67

package/__tests__/app/CoreApp.ts

@@ -160,6 +160,12 @@ test('Tests for getUnitLabel', () => {
     expect(app.getUnitLabel(12, true)).toBe('每年');
 });
 
+test('Tests for isValidPassword', () => {
+    expect(app.isValidPassword('12345678')).toBeFalsy();
+    expect(app.isValidPassword('abcd3')).toBeFalsy();
+    expect(app.isValidPassword('1234abcd')).toBeTruthy();
+});
+
 test('Tests for getRepeatOptions', () => {
     const options = BusinessUtils.getRepeatOptions(app.labelDelegate, [
         'MONTH',

package/lib/cjs/app/CoreApp.d.ts

@@ -212,6 +212,13 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns Result
      */
     formatNumber(input?: number | bigint, options?: Intl.NumberFormatOptions): string | undefined;
+    /**
+     * Do refresh token result
+     * @param result Result
+     * @param initCallCallback InitCall callback
+     * @param silent Silent without any popups
+     */
+    doRefreshTokenResult(result: RefreshTokenResult, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
     /**
      * Format refresh token result
      * @param result Refresh token result
@@ -303,6 +310,11 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns Result
      */
     initCall(callback?: (result: boolean) => void, resetKeys?: boolean): Promise<void>;
+    /**
+     * Is valid password, override to implement custom check
+     * @param password Input password
+     */
+    isValidPassword(password: string): boolean;
     /**
      * Callback where exit a page
      */
@@ -496,6 +508,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Restore settings from persisted source
      */
     protected restore(): boolean;
+    /**
+     * Is valid password, override to implement custom check
+     * @param password Input password
+     */
+    isValidPassword(password: string): boolean;
     /**
      * Persist settings to source when application exit
      */
@@ -511,6 +528,12 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @returns Result
      */
     protected apiInitCall(data: InitCallDto): Promise<InitCallResult | undefined>;
+    /**
+     * Check the action result is about device invalid
+     * @param result Action result
+     * @returns true means device is invalid
+     */
+    protected checkDeviceResult(result: IActionResult): boolean;
     /**
      * Init call
      * @param callback Callback
@@ -632,6 +655,17 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @returns Error message
      */
     formatError(error: ApiDataError): string;
+    /**
+     * Refresh token failed
+     */
+    protected refreshTokenFailed(): void;
+    /**
+     * Do refresh token result
+     * @param result Result
+     * @param initCallCallback InitCall callback
+     * @param silent Silent without any popups
+     */
+    doRefreshTokenResult(result: RefreshTokenResult, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
     /**
      * Format refresh token result
      * @param result Refresh token result

package/lib/cjs/app/CoreApp.js

@@ -195,6 +195,20 @@ class CoreApp {
         }
         return false;
     }
+    /**
+     * Is valid password, override to implement custom check
+     * @param password Input password
+     */
+    isValidPassword(password) {
+        // Length check
+        if (password.length < 6)
+            return false;
+        // One letter and number required
+        if (/\d+/gi.test(password) && /[a-z]+/gi.test(password)) {
+            return true;
+        }
+        return false;
+    }
     /**
      * Persist settings to source when application exit
      */
@@ -255,6 +269,16 @@ class CoreApp {
     async apiInitCall(data) {
         return await this.api.put(this.initCallApi, data);
     }
+    /**
+     * Check the action result is about device invalid
+     * @param result Action result
+     * @returns true means device is invalid
+     */
+    checkDeviceResult(result) {
+        if (result.type === 'NoValidData' && result.field === 'Device')
+            return true;
+        return false;
+    }
     /**
      * Init call
      * @param callback Callback
@@ -264,8 +288,10 @@ class CoreApp {
     async initCall(callback, resetKeys) {
         var _a;
         // Reset keys
-        if (resetKeys)
+        if (resetKeys) {
+            this._deviceId = '';
             this.resetKeys();
+        }
         // Passphrase exists?
         if (this.passphrase) {
             if (callback)
@@ -685,6 +711,38 @@ class CoreApp {
     formatError(error) {
         return error.toString();
     }
+    /**
+     * Refresh token failed
+     */
+    refreshTokenFailed() {
+        this.userUnauthorized();
+        this.toLoginPage();
+    }
+    /**
+     * Do refresh token result
+     * @param result Result
+     * @param initCallCallback InitCall callback
+     * @param silent Silent without any popups
+     */
+    doRefreshTokenResult(result, initCallCallback, silent = false) {
+        if (result === true)
+            return;
+        if (initCallCallback &&
+            typeof result === 'object' &&
+            !(result instanceof restclient_1.ApiDataError) &&
+            this.checkDeviceResult(result)) {
+            this.initCall(initCallCallback, true);
+            return;
+        }
+        const message = this.formatRefreshTokenResult(result);
+        if (message == null || silent) {
+            this.refreshTokenFailed();
+            return;
+        }
+        this.notifier.alert(message, () => {
+            this.refreshTokenFailed();
+        });
+    }
     /**
      * Format refresh token result
      * @param result Refresh token result

package/lib/mjs/app/CoreApp.d.ts

@@ -212,6 +212,13 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns Result
      */
     formatNumber(input?: number | bigint, options?: Intl.NumberFormatOptions): string | undefined;
+    /**
+     * Do refresh token result
+     * @param result Result
+     * @param initCallCallback InitCall callback
+     * @param silent Silent without any popups
+     */
+    doRefreshTokenResult(result: RefreshTokenResult, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
     /**
      * Format refresh token result
      * @param result Refresh token result
@@ -303,6 +310,11 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns Result
      */
     initCall(callback?: (result: boolean) => void, resetKeys?: boolean): Promise<void>;
+    /**
+     * Is valid password, override to implement custom check
+     * @param password Input password
+     */
+    isValidPassword(password: string): boolean;
     /**
      * Callback where exit a page
      */
@@ -496,6 +508,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Restore settings from persisted source
      */
     protected restore(): boolean;
+    /**
+     * Is valid password, override to implement custom check
+     * @param password Input password
+     */
+    isValidPassword(password: string): boolean;
     /**
      * Persist settings to source when application exit
      */
@@ -511,6 +528,12 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @returns Result
      */
     protected apiInitCall(data: InitCallDto): Promise<InitCallResult | undefined>;
+    /**
+     * Check the action result is about device invalid
+     * @param result Action result
+     * @returns true means device is invalid
+     */
+    protected checkDeviceResult(result: IActionResult): boolean;
     /**
      * Init call
      * @param callback Callback
@@ -632,6 +655,17 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @returns Error message
      */
     formatError(error: ApiDataError): string;
+    /**
+     * Refresh token failed
+     */
+    protected refreshTokenFailed(): void;
+    /**
+     * Do refresh token result
+     * @param result Result
+     * @param initCallCallback InitCall callback
+     * @param silent Silent without any popups
+     */
+    doRefreshTokenResult(result: RefreshTokenResult, initCallCallback?: (result: boolean) => void, silent?: boolean): void;
     /**
      * Format refresh token result
      * @param result Refresh token result

package/lib/mjs/app/CoreApp.js

@@ -192,6 +192,20 @@ export class CoreApp {
         }
         return false;
     }
+    /**
+     * Is valid password, override to implement custom check
+     * @param password Input password
+     */
+    isValidPassword(password) {
+        // Length check
+        if (password.length < 6)
+            return false;
+        // One letter and number required
+        if (/\d+/gi.test(password) && /[a-z]+/gi.test(password)) {
+            return true;
+        }
+        return false;
+    }
     /**
      * Persist settings to source when application exit
      */
@@ -252,6 +266,16 @@ export class CoreApp {
     async apiInitCall(data) {
         return await this.api.put(this.initCallApi, data);
     }
+    /**
+     * Check the action result is about device invalid
+     * @param result Action result
+     * @returns true means device is invalid
+     */
+    checkDeviceResult(result) {
+        if (result.type === 'NoValidData' && result.field === 'Device')
+            return true;
+        return false;
+    }
     /**
      * Init call
      * @param callback Callback
@@ -261,8 +285,10 @@ export class CoreApp {
     async initCall(callback, resetKeys) {
         var _a;
         // Reset keys
-        if (resetKeys)
+        if (resetKeys) {
+            this._deviceId = '';
             this.resetKeys();
+        }
         // Passphrase exists?
         if (this.passphrase) {
             if (callback)
@@ -682,6 +708,38 @@ export class CoreApp {
     formatError(error) {
         return error.toString();
     }
+    /**
+     * Refresh token failed
+     */
+    refreshTokenFailed() {
+        this.userUnauthorized();
+        this.toLoginPage();
+    }
+    /**
+     * Do refresh token result
+     * @param result Result
+     * @param initCallCallback InitCall callback
+     * @param silent Silent without any popups
+     */
+    doRefreshTokenResult(result, initCallCallback, silent = false) {
+        if (result === true)
+            return;
+        if (initCallCallback &&
+            typeof result === 'object' &&
+            !(result instanceof ApiDataError) &&
+            this.checkDeviceResult(result)) {
+            this.initCall(initCallCallback, true);
+            return;
+        }
+        const message = this.formatRefreshTokenResult(result);
+        if (message == null || silent) {
+            this.refreshTokenFailed();
+            return;
+        }
+        this.notifier.alert(message, () => {
+            this.refreshTokenFailed();
+        });
+    }
     /**
      * Format refresh token result
      * @param result Refresh token result

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.64",
+    "version": "1.2.67",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -59,15 +59,15 @@
         "crypto-js": "^4.1.1"
     },
     "devDependencies": {
-        "@babel/cli": "^7.18.9",
-        "@babel/core": "^7.18.9",
-        "@babel/plugin-transform-runtime": "^7.18.9",
-        "@babel/preset-env": "^7.18.9",
+        "@babel/cli": "^7.18.10",
+        "@babel/core": "^7.18.10",
+        "@babel/plugin-transform-runtime": "^7.18.10",
+        "@babel/preset-env": "^7.18.10",
         "@babel/runtime-corejs3": "^7.18.9",
         "@types/jest": "^28.1.6",
-        "@typescript-eslint/eslint-plugin": "^5.31.0",
-        "@typescript-eslint/parser": "^5.31.0",
-        "eslint": "^8.20.0",
+        "@typescript-eslint/eslint-plugin": "^5.32.0",
+        "@typescript-eslint/parser": "^5.32.0",
+        "eslint": "^8.21.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.26.0",
         "jest": "^28.1.3",

package/src/app/CoreApp.ts

@@ -315,6 +315,18 @@ export interface ICoreApp<
         options?: Intl.NumberFormatOptions
     ): string | undefined;
 
+    /**
+     * Do refresh token result
+     * @param result Result
+     * @param initCallCallback InitCall callback
+     * @param silent Silent without any popups
+     */
+    doRefreshTokenResult(
+        result: RefreshTokenResult,
+        initCallCallback?: (result: boolean) => void,
+        silent?: boolean
+    ): void;
+
     /**
      * Format refresh token result
      * @param result Refresh token result
@@ -420,6 +432,12 @@ export interface ICoreApp<
         resetKeys?: boolean
     ): Promise<void>;
 
+    /**
+     * Is valid password, override to implement custom check
+     * @param password Input password
+     */
+    isValidPassword(password: string): boolean;
+
     /**
      * Callback where exit a page
      */
@@ -795,6 +813,22 @@ export abstract class CoreApp<
         return false;
     }
 
+    /**
+     * Is valid password, override to implement custom check
+     * @param password Input password
+     */
+    isValidPassword(password: string) {
+        // Length check
+        if (password.length < 6) return false;
+
+        // One letter and number required
+        if (/\d+/gi.test(password) && /[a-z]+/gi.test(password)) {
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Persist settings to source when application exit
      */
@@ -862,6 +896,17 @@ export abstract class CoreApp<
         return await this.api.put<InitCallResult>(this.initCallApi, data);
     }
 
+    /**
+     * Check the action result is about device invalid
+     * @param result Action result
+     * @returns true means device is invalid
+     */
+    protected checkDeviceResult(result: IActionResult): boolean {
+        if (result.type === 'NoValidData' && result.field === 'Device')
+            return true;
+        return false;
+    }
+
     /**
      * Init call
      * @param callback Callback
@@ -870,7 +915,10 @@ export abstract class CoreApp<
      */
     async initCall(callback?: (result: boolean) => void, resetKeys?: boolean) {
         // Reset keys
-        if (resetKeys) this.resetKeys();
+        if (resetKeys) {
+            this._deviceId = '';
+            this.resetKeys();
+        }
 
         // Passphrase exists?
         if (this.passphrase) {
@@ -1400,6 +1448,48 @@ export abstract class CoreApp<
         return error.toString();
     }
 
+    /**
+     * Refresh token failed
+     */
+    protected refreshTokenFailed() {
+        this.userUnauthorized();
+        this.toLoginPage();
+    }
+
+    /**
+     * Do refresh token result
+     * @param result Result
+     * @param initCallCallback InitCall callback
+     * @param silent Silent without any popups
+     */
+    doRefreshTokenResult(
+        result: RefreshTokenResult,
+        initCallCallback?: (result: boolean) => void,
+        silent: boolean = false
+    ) {
+        if (result === true) return;
+
+        if (
+            initCallCallback &&
+            typeof result === 'object' &&
+            !(result instanceof ApiDataError) &&
+            this.checkDeviceResult(result)
+        ) {
+            this.initCall(initCallCallback, true);
+            return;
+        }
+
+        const message = this.formatRefreshTokenResult(result);
+        if (message == null || silent) {
+            this.refreshTokenFailed();
+            return;
+        }
+
+        this.notifier.alert(message, () => {
+            this.refreshTokenFailed();
+        });
+    }
+
     /**
      * Format refresh token result
      * @param result Refresh token result