@etsoo/appscript 1.2.66 → 1.2.69

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
@@ -648,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

@@ -275,7 +275,7 @@ class CoreApp {
      * @returns true means device is invalid
      */
     checkDeviceResult(result) {
-        if (result.type == 'NoValidData' && result.field == 'Device')
+        if (result.type === 'NoValidData' && result.field === 'Device')
             return true;
         return false;
     }
@@ -711,6 +711,46 @@ 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 (typeof result === 'object' &&
+            !(result instanceof restclient_1.ApiDataError) &&
+            this.checkDeviceResult(result)) {
+            initCallCallback !== null && initCallCallback !== void 0 ? initCallCallback : (initCallCallback = (result) => {
+                var _a;
+                if (!result)
+                    return;
+                this.notifier.alert((_a = this.get('environmentChanged')) !== null && _a !== void 0 ? _a : 'Environment changed', () => {
+                    // Reload the page
+                    history.go(0);
+                });
+            });
+            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/cjs/i18n/en-US.json

@@ -41,6 +41,7 @@
     "emailAddresses": "Email addresses",
     "enabled": "Enabled",
     "entityStatus": "Status",
+    "environmentChanged": "The operating environment has changed, please log in again",
     "etsoo": "ETSOO",
     "expiry": "Expiry",
     "failed": "Operation failed",

package/lib/cjs/i18n/zh-CN.json

@@ -41,6 +41,7 @@
     "emailAddresses": "电子邮箱",
     "enabled": "已启用",
     "entityStatus": "状态",
+    "environmentChanged": "运行环境已改变，请重新登录",
     "etsoo": "亿速思维",
     "expiry": "到期时间",
     "failed": "操作失败",

package/lib/cjs/i18n/zh-HK.json

@@ -41,6 +41,7 @@
     "emailAddresses": "電子郵箱",
     "enabled": "已啟用",
     "entityStatus": "狀態",
+    "environmentChanged": "運行環境已改變，請重新登錄",
     "etsoo": "億速思維",
     "expiry": "到期時間",
     "failed": "操作失敗",

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
@@ -648,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

@@ -272,7 +272,7 @@ export class CoreApp {
      * @returns true means device is invalid
      */
     checkDeviceResult(result) {
-        if (result.type == 'NoValidData' && result.field == 'Device')
+        if (result.type === 'NoValidData' && result.field === 'Device')
             return true;
         return false;
     }
@@ -708,6 +708,46 @@ 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 (typeof result === 'object' &&
+            !(result instanceof ApiDataError) &&
+            this.checkDeviceResult(result)) {
+            initCallCallback !== null && initCallCallback !== void 0 ? initCallCallback : (initCallCallback = (result) => {
+                var _a;
+                if (!result)
+                    return;
+                this.notifier.alert((_a = this.get('environmentChanged')) !== null && _a !== void 0 ? _a : 'Environment changed', () => {
+                    // Reload the page
+                    history.go(0);
+                });
+            });
+            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/i18n/en-US.json

@@ -41,6 +41,7 @@
     "emailAddresses": "Email addresses",
     "enabled": "Enabled",
     "entityStatus": "Status",
+    "environmentChanged": "The operating environment has changed, please log in again",
     "etsoo": "ETSOO",
     "expiry": "Expiry",
     "failed": "Operation failed",

package/lib/mjs/i18n/zh-CN.json

@@ -41,6 +41,7 @@
     "emailAddresses": "电子邮箱",
     "enabled": "已启用",
     "entityStatus": "状态",
+    "environmentChanged": "运行环境已改变，请重新登录",
     "etsoo": "亿速思维",
     "expiry": "到期时间",
     "failed": "操作失败",

package/lib/mjs/i18n/zh-HK.json

@@ -41,6 +41,7 @@
     "emailAddresses": "電子郵箱",
     "enabled": "已啟用",
     "entityStatus": "狀態",
+    "environmentChanged": "運行環境已改變，請重新登錄",
     "etsoo": "億速思維",
     "expiry": "到期時間",
     "failed": "操作失敗",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.66",
+    "version": "1.2.69",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

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
@@ -890,7 +902,7 @@ export abstract class CoreApp<
      * @returns true means device is invalid
      */
     protected checkDeviceResult(result: IActionResult): boolean {
-        if (result.type == 'NoValidData' && result.field == 'Device')
+        if (result.type === 'NoValidData' && result.field === 'Device')
             return true;
         return false;
     }
@@ -1436,6 +1448,59 @@ 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 (
+            typeof result === 'object' &&
+            !(result instanceof ApiDataError) &&
+            this.checkDeviceResult(result)
+        ) {
+            initCallCallback ??= (result) => {
+                if (!result) return;
+                this.notifier.alert(
+                    this.get<string>('environmentChanged') ??
+                        'Environment changed',
+                    () => {
+                        // Reload the page
+                        history.go(0);
+                    }
+                );
+            };
+
+            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/src/i18n/en-US.json

@@ -41,6 +41,7 @@
     "emailAddresses": "Email addresses",
     "enabled": "Enabled",
     "entityStatus": "Status",
+    "environmentChanged": "The operating environment has changed, please log in again",
     "etsoo": "ETSOO",
     "expiry": "Expiry",
     "failed": "Operation failed",

package/src/i18n/zh-CN.json

@@ -41,6 +41,7 @@
     "emailAddresses": "电子邮箱",
     "enabled": "已启用",
     "entityStatus": "状态",
+    "environmentChanged": "运行环境已改变，请重新登录",
     "etsoo": "亿速思维",
     "expiry": "到期时间",
     "failed": "操作失败",

package/src/i18n/zh-HK.json

@@ -41,6 +41,7 @@
     "emailAddresses": "電子郵箱",
     "enabled": "已啟用",
     "entityStatus": "狀態",
+    "environmentChanged": "運行環境已改變，請重新登錄",
     "etsoo": "億速思維",
     "expiry": "到期時間",
     "failed": "操作失敗",