@etsoo/appscript 1.2.42 → 1.2.46

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

@@ -312,6 +312,11 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Persist settings to source when application exit
      */
     persist(): void;
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url: string): void;
     /**
      * Switch organization
      * @param id Organization id
@@ -470,6 +475,12 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Persist settings to source when application exit
      */
     persist(): void;
+    /**
+     * Add app name as identifier
+     * @param field Field
+     * @returns Result
+     */
+    protected addIdentifier(field: string): string;
     /**
      * Setup Api
      * @param api Api
@@ -684,6 +695,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Callback where exit a page
      */
     pageExit(): void;
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url: string): void;
     /**
      * Refresh countdown
      * @param seconds Seconds

package/lib/cjs/app/CoreApp.js

@@ -119,9 +119,9 @@ class CoreApp {
     get persistedFields() {
         return [
             CoreApp.deviceIdField,
-            CoreApp.devicePassphraseField,
+            this.addIdentifier(CoreApp.devicePassphraseField),
             CoreApp.serversideDeviceIdField,
-            CoreApp.headerTokenField
+            this.addIdentifier(CoreApp.headerTokenField)
         ];
     }
     getDeviceId() {
@@ -129,8 +129,8 @@ class CoreApp {
     }
     resetKeys() {
         this.storage.clear([
-            CoreApp.devicePassphraseField,
-            CoreApp.headerTokenField,
+            this.addIdentifier(CoreApp.devicePassphraseField),
+            this.addIdentifier(CoreApp.headerTokenField),
             CoreApp.serversideDeviceIdField
         ], false);
         this.passphrase = '';
@@ -158,7 +158,8 @@ class CoreApp {
             this.resetKeys();
             return false;
         }
-        const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
+        // this.name to identifier different app's secret
+        const passphraseEncrypted = this.storage.getData(this.addIdentifier(CoreApp.devicePassphraseField));
         if (passphraseEncrypted) {
             const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
             if (passphraseDecrypted != null) {
@@ -191,6 +192,14 @@ class CoreApp {
             return;
         this.storage.copyTo(this.persistedFields);
     }
+    /**
+     * Add app name as identifier
+     * @param field Field
+     * @returns Result
+     */
+    addIdentifier(field) {
+        return field + '-' + this.name;
+    }
     /**
      * Setup Api
      * @param api Api
@@ -313,7 +322,7 @@ class CoreApp {
         this.storage.setPersistedData(CoreApp.devicesField, devices);
         // Current passphrase
         this.passphrase = passphrase;
-        this.storage.setData(CoreApp.devicePassphraseField, this.encrypt(passphrase, this.name));
+        this.storage.setData(this.addIdentifier(CoreApp.devicePassphraseField), this.encrypt(passphrase, this.name));
         // Previous passphrase
         if (data.previousPassphrase) {
             const prev = this.decrypt(data.previousPassphrase, timestamp.toString());
@@ -345,7 +354,7 @@ class CoreApp {
      * @returns Fields
      */
     initCallEncryptedUpdateFields() {
-        return [CoreApp.headerTokenField];
+        return [this.addIdentifier(CoreApp.headerTokenField)];
     }
     /**
      * Alert action result
@@ -370,7 +379,7 @@ class CoreApp {
         if (refreshToken !== '') {
             if (refreshToken != null)
                 refreshToken = this.encrypt(refreshToken);
-            this.storage.setData(CoreApp.headerTokenField, refreshToken);
+            this.storage.setData(this.addIdentifier(CoreApp.headerTokenField), refreshToken);
         }
         // Reset tryLogin state
         this._isTryingLogin = false;
@@ -443,14 +452,14 @@ class CoreApp {
      */
     clearCacheData() {
         this.clearCacheToken();
-        this.storage.setData(CoreApp.devicePassphraseField, undefined);
+        this.storage.setData(this.addIdentifier(CoreApp.devicePassphraseField), undefined);
     }
     /**
      * Clear cached token
      */
     clearCacheToken() {
         this.cachedRefreshToken = undefined;
-        this.storage.setPersistedData(CoreApp.headerTokenField, undefined);
+        this.storage.setPersistedData(this.addIdentifier(CoreApp.headerTokenField), undefined);
     }
     /**
      * Decrypt message
@@ -705,7 +714,7 @@ class CoreApp {
         // Temp refresh token
         if (this.cachedRefreshToken)
             return this.cachedRefreshToken;
-        return this.storage.getData(CoreApp.headerTokenField);
+        return this.storage.getData(this.addIdentifier(CoreApp.headerTokenField));
     }
     /**
      * Get all regions
@@ -802,6 +811,13 @@ class CoreApp {
         var _a;
         (_a = this.lastWarning) === null || _a === void 0 ? void 0 : _a.dismiss();
     }
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url) {
+        window.location.href = url;
+    }
     /**
      * Refresh countdown
      * @param seconds Seconds
@@ -900,7 +916,7 @@ class CoreApp {
      */
     toLoginPage(tryLogin) {
         const url = this.transformUrl('/' + (tryLogin ? '' : '?tryLogin=false'));
-        window.location.replace(this.transformUrl('/'));
+        this.redirectTo(url);
     }
     /**
      * Transform URL

package/lib/cjs/bridges/IBridgeHost.d.ts

@@ -14,6 +14,7 @@ export interface IBridgeHost {
     /**
      * Load application
      * @param name App name
+     * @param startUrl Start Url
      */
-    loadApp(name: string): void;
+    loadApp(name: string, startUrl?: string): void;
 }

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

@@ -87,7 +87,7 @@
     "settings": "系统设置",
     "showIt": "显示",
     "signout": "退出",
-    "smartERP": "司友云ERP",
+    "smartERP": "司友®云ERP",
     "sortTip": "拖拽项目进行排序",
     "status": "状态",
     "statusApproved": "已批准",

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

@@ -87,7 +87,7 @@
     "settings": "系統設置",
     "showIt": "顯示",
     "signout": "退出",
-    "smartERP": "司友雲ERP",
+    "smartERP": "司友®雲ERP",
     "sortTip": "拖拽項目進行排序",
     "status": "狀態",
     "statusApproved": "已批准",

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

@@ -312,6 +312,11 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Persist settings to source when application exit
      */
     persist(): void;
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url: string): void;
     /**
      * Switch organization
      * @param id Organization id
@@ -470,6 +475,12 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Persist settings to source when application exit
      */
     persist(): void;
+    /**
+     * Add app name as identifier
+     * @param field Field
+     * @returns Result
+     */
+    protected addIdentifier(field: string): string;
     /**
      * Setup Api
      * @param api Api
@@ -684,6 +695,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Callback where exit a page
      */
     pageExit(): void;
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url: string): void;
     /**
      * Refresh countdown
      * @param seconds Seconds

package/lib/mjs/app/CoreApp.js

@@ -116,9 +116,9 @@ export class CoreApp {
     get persistedFields() {
         return [
             CoreApp.deviceIdField,
-            CoreApp.devicePassphraseField,
+            this.addIdentifier(CoreApp.devicePassphraseField),
             CoreApp.serversideDeviceIdField,
-            CoreApp.headerTokenField
+            this.addIdentifier(CoreApp.headerTokenField)
         ];
     }
     getDeviceId() {
@@ -126,8 +126,8 @@ export class CoreApp {
     }
     resetKeys() {
         this.storage.clear([
-            CoreApp.devicePassphraseField,
-            CoreApp.headerTokenField,
+            this.addIdentifier(CoreApp.devicePassphraseField),
+            this.addIdentifier(CoreApp.headerTokenField),
             CoreApp.serversideDeviceIdField
         ], false);
         this.passphrase = '';
@@ -155,7 +155,8 @@ export class CoreApp {
             this.resetKeys();
             return false;
         }
-        const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
+        // this.name to identifier different app's secret
+        const passphraseEncrypted = this.storage.getData(this.addIdentifier(CoreApp.devicePassphraseField));
         if (passphraseEncrypted) {
             const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
             if (passphraseDecrypted != null) {
@@ -188,6 +189,14 @@ export class CoreApp {
             return;
         this.storage.copyTo(this.persistedFields);
     }
+    /**
+     * Add app name as identifier
+     * @param field Field
+     * @returns Result
+     */
+    addIdentifier(field) {
+        return field + '-' + this.name;
+    }
     /**
      * Setup Api
      * @param api Api
@@ -310,7 +319,7 @@ export class CoreApp {
         this.storage.setPersistedData(CoreApp.devicesField, devices);
         // Current passphrase
         this.passphrase = passphrase;
-        this.storage.setData(CoreApp.devicePassphraseField, this.encrypt(passphrase, this.name));
+        this.storage.setData(this.addIdentifier(CoreApp.devicePassphraseField), this.encrypt(passphrase, this.name));
         // Previous passphrase
         if (data.previousPassphrase) {
             const prev = this.decrypt(data.previousPassphrase, timestamp.toString());
@@ -342,7 +351,7 @@ export class CoreApp {
      * @returns Fields
      */
     initCallEncryptedUpdateFields() {
-        return [CoreApp.headerTokenField];
+        return [this.addIdentifier(CoreApp.headerTokenField)];
     }
     /**
      * Alert action result
@@ -367,7 +376,7 @@ export class CoreApp {
         if (refreshToken !== '') {
             if (refreshToken != null)
                 refreshToken = this.encrypt(refreshToken);
-            this.storage.setData(CoreApp.headerTokenField, refreshToken);
+            this.storage.setData(this.addIdentifier(CoreApp.headerTokenField), refreshToken);
         }
         // Reset tryLogin state
         this._isTryingLogin = false;
@@ -440,14 +449,14 @@ export class CoreApp {
      */
     clearCacheData() {
         this.clearCacheToken();
-        this.storage.setData(CoreApp.devicePassphraseField, undefined);
+        this.storage.setData(this.addIdentifier(CoreApp.devicePassphraseField), undefined);
     }
     /**
      * Clear cached token
      */
     clearCacheToken() {
         this.cachedRefreshToken = undefined;
-        this.storage.setPersistedData(CoreApp.headerTokenField, undefined);
+        this.storage.setPersistedData(this.addIdentifier(CoreApp.headerTokenField), undefined);
     }
     /**
      * Decrypt message
@@ -702,7 +711,7 @@ export class CoreApp {
         // Temp refresh token
         if (this.cachedRefreshToken)
             return this.cachedRefreshToken;
-        return this.storage.getData(CoreApp.headerTokenField);
+        return this.storage.getData(this.addIdentifier(CoreApp.headerTokenField));
     }
     /**
      * Get all regions
@@ -799,6 +808,13 @@ export class CoreApp {
         var _a;
         (_a = this.lastWarning) === null || _a === void 0 ? void 0 : _a.dismiss();
     }
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url) {
+        window.location.href = url;
+    }
     /**
      * Refresh countdown
      * @param seconds Seconds
@@ -897,7 +913,7 @@ export class CoreApp {
      */
     toLoginPage(tryLogin) {
         const url = this.transformUrl('/' + (tryLogin ? '' : '?tryLogin=false'));
-        window.location.replace(this.transformUrl('/'));
+        this.redirectTo(url);
     }
     /**
      * Transform URL

package/lib/mjs/bridges/IBridgeHost.d.ts

@@ -14,6 +14,7 @@ export interface IBridgeHost {
     /**
      * Load application
      * @param name App name
+     * @param startUrl Start Url
      */
-    loadApp(name: string): void;
+    loadApp(name: string, startUrl?: string): void;
 }

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

@@ -87,7 +87,7 @@
     "settings": "系统设置",
     "showIt": "显示",
     "signout": "退出",
-    "smartERP": "司友云ERP",
+    "smartERP": "司友®云ERP",
     "sortTip": "拖拽项目进行排序",
     "status": "状态",
     "statusApproved": "已批准",

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

@@ -87,7 +87,7 @@
     "settings": "系統設置",
     "showIt": "顯示",
     "signout": "退出",
-    "smartERP": "司友雲ERP",
+    "smartERP": "司友®雲ERP",
     "sortTip": "拖拽項目進行排序",
     "status": "狀態",
     "statusApproved": "已批准",

package/package.json

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

package/src/app/CoreApp.ts

@@ -428,6 +428,12 @@ export interface ICoreApp<
      */
     persist(): void;
 
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url: string): void;
+
     /**
      * Switch organization
      * @param id Organization id
@@ -627,9 +633,9 @@ export abstract class CoreApp<
     protected get persistedFields() {
         return [
             CoreApp.deviceIdField,
-            CoreApp.devicePassphraseField,
+            this.addIdentifier(CoreApp.devicePassphraseField),
             CoreApp.serversideDeviceIdField,
-            CoreApp.headerTokenField
+            this.addIdentifier(CoreApp.headerTokenField)
         ];
     }
 
@@ -678,8 +684,8 @@ export abstract class CoreApp<
     private resetKeys() {
         this.storage.clear(
             [
-                CoreApp.devicePassphraseField,
-                CoreApp.headerTokenField,
+                this.addIdentifier(CoreApp.devicePassphraseField),
+                this.addIdentifier(CoreApp.headerTokenField),
                 CoreApp.serversideDeviceIdField
             ],
             false
@@ -717,8 +723,9 @@ export abstract class CoreApp<
             return false;
         }
 
+        // this.name to identifier different app's secret
         const passphraseEncrypted = this.storage.getData<string>(
-            CoreApp.devicePassphraseField
+            this.addIdentifier(CoreApp.devicePassphraseField)
         );
         if (passphraseEncrypted) {
             const passphraseDecrypted = this.decrypt(
@@ -763,6 +770,15 @@ export abstract class CoreApp<
         this.storage.copyTo(this.persistedFields);
     }
 
+    /**
+     * Add app name as identifier
+     * @param field Field
+     * @returns Result
+     */
+    protected addIdentifier(field: string) {
+        return field + '-' + this.name;
+    }
+
     /**
      * Setup Api
      * @param api Api
@@ -907,7 +923,7 @@ export abstract class CoreApp<
         // Current passphrase
         this.passphrase = passphrase;
         this.storage.setData(
-            CoreApp.devicePassphraseField,
+            this.addIdentifier(CoreApp.devicePassphraseField),
             this.encrypt(passphrase, this.name)
         );
 
@@ -953,7 +969,7 @@ export abstract class CoreApp<
      * @returns Fields
      */
     protected initCallEncryptedUpdateFields(): string[] {
-        return [CoreApp.headerTokenField];
+        return [this.addIdentifier(CoreApp.headerTokenField)];
     }
 
     /**
@@ -981,7 +997,10 @@ export abstract class CoreApp<
         // Cover the current value
         if (refreshToken !== '') {
             if (refreshToken != null) refreshToken = this.encrypt(refreshToken);
-            this.storage.setData(CoreApp.headerTokenField, refreshToken);
+            this.storage.setData(
+                this.addIdentifier(CoreApp.headerTokenField),
+                refreshToken
+            );
         }
 
         // Reset tryLogin state
@@ -1069,7 +1088,10 @@ export abstract class CoreApp<
      */
     clearCacheData() {
         this.clearCacheToken();
-        this.storage.setData(CoreApp.devicePassphraseField, undefined);
+        this.storage.setData(
+            this.addIdentifier(CoreApp.devicePassphraseField),
+            undefined
+        );
     }
 
     /**
@@ -1077,7 +1099,10 @@ export abstract class CoreApp<
      */
     clearCacheToken() {
         this.cachedRefreshToken = undefined;
-        this.storage.setPersistedData(CoreApp.headerTokenField, undefined);
+        this.storage.setPersistedData(
+            this.addIdentifier(CoreApp.headerTokenField),
+            undefined
+        );
     }
 
     /**
@@ -1389,7 +1414,9 @@ export abstract class CoreApp<
     getCacheToken(): string | undefined {
         // Temp refresh token
         if (this.cachedRefreshToken) return this.cachedRefreshToken;
-        return this.storage.getData<string>(CoreApp.headerTokenField);
+        return this.storage.getData<string>(
+            this.addIdentifier(CoreApp.headerTokenField)
+        );
     }
 
     /**
@@ -1496,6 +1523,14 @@ export abstract class CoreApp<
         this.lastWarning?.dismiss();
     }
 
+    /**
+     * Redirect to the Url
+     * @param url Url
+     */
+    redirectTo(url: string): void {
+        window.location.href = url;
+    }
+
     /**
      * Refresh countdown
      * @param seconds Seconds
@@ -1618,7 +1653,7 @@ export abstract class CoreApp<
         const url = this.transformUrl(
             '/' + (tryLogin ? '' : '?tryLogin=false')
         );
-        window.location.replace(this.transformUrl('/'));
+        this.redirectTo(url);
     }
 
     /**

package/src/bridges/IBridgeHost.ts

@@ -16,6 +16,7 @@ export interface IBridgeHost {
     /**
      * Load application
      * @param name App name
+     * @param startUrl Start Url
      */
-    loadApp(name: string): void;
+    loadApp(name: string, startUrl?: string): void;
 }

package/src/i18n/zh-CN.json

@@ -87,7 +87,7 @@
     "settings": "系统设置",
     "showIt": "显示",
     "signout": "退出",
-    "smartERP": "司友云ERP",
+    "smartERP": "司友®云ERP",
     "sortTip": "拖拽项目进行排序",
     "status": "状态",
     "statusApproved": "已批准",

package/src/i18n/zh-HK.json

@@ -87,7 +87,7 @@
     "settings": "系統設置",
     "showIt": "顯示",
     "signout": "退出",
-    "smartERP": "司友雲ERP",
+    "smartERP": "司友®雲ERP",
     "sortTip": "拖拽項目進行排序",
     "status": "狀態",
     "statusApproved": "已批准",