@etsoo/appscript 1.2.43 → 1.2.47

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

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

package/lib/cjs/app/CoreApp.js

@@ -46,7 +46,7 @@ class CoreApp {
         this.storage = storage;
         this.name = name;
         // Device id
-        this._deviceId = storage.getData(CoreApp.deviceIdField, '');
+        this._deviceId = storage.getData(this.addIdentifier(CoreApp.deviceIdField), '');
         // Restore
         this.restore();
         this.setApi(api);
@@ -118,10 +118,10 @@ class CoreApp {
      */
     get persistedFields() {
         return [
-            CoreApp.deviceIdField,
-            CoreApp.devicePassphraseField,
-            CoreApp.serversideDeviceIdField,
-            CoreApp.headerTokenField
+            this.addIdentifier(CoreApp.deviceIdField),
+            this.addIdentifier(CoreApp.devicePassphraseField),
+            this.addIdentifier(CoreApp.serversideDeviceIdField),
+            this.addIdentifier(CoreApp.headerTokenField)
         ];
     }
     getDeviceId() {
@@ -129,9 +129,9 @@ class CoreApp {
     }
     resetKeys() {
         this.storage.clear([
-            CoreApp.devicePassphraseField,
-            CoreApp.headerTokenField,
-            CoreApp.serversideDeviceIdField
+            this.addIdentifier(CoreApp.devicePassphraseField),
+            this.addIdentifier(CoreApp.headerTokenField),
+            this.addIdentifier(CoreApp.serversideDeviceIdField)
         ], false);
         this.passphrase = '';
     }
@@ -145,7 +145,7 @@ class CoreApp {
             // First vist, restore and keep the source
             this.storage.copyFrom(this.persistedFields, false);
             // Reset device id
-            this._deviceId = this.storage.getData(CoreApp.deviceIdField, '');
+            this._deviceId = this.storage.getData(this.addIdentifier(CoreApp.deviceIdField), '');
             // Totally new, no data restored
             if (this._deviceId === '')
                 return false;
@@ -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
@@ -247,7 +256,7 @@ class CoreApp {
             return;
         }
         // Serverside encrypted device id
-        const identifier = this.storage.getData(CoreApp.serversideDeviceIdField);
+        const identifier = this.storage.getData(this.addIdentifier(CoreApp.serversideDeviceIdField));
         // Timestamp
         const timestamp = new Date().getTime();
         // Request data
@@ -283,7 +292,7 @@ class CoreApp {
             if (callback)
                 callback(false);
             // Clear device id
-            this.storage.setData(CoreApp.deviceIdField, undefined);
+            this.storage.setData(this.addIdentifier(CoreApp.deviceIdField), undefined);
             return;
         }
         this.initCallUpdate(result.data, data.timestamp);
@@ -306,14 +315,14 @@ class CoreApp {
             return;
         // Update device id and cache it
         this._deviceId = data.deviceId;
-        this.storage.setData(CoreApp.deviceIdField, this._deviceId);
+        this.storage.setData(this.addIdentifier(CoreApp.deviceIdField), this._deviceId);
         // Devices
         const devices = this.storage.getPersistedData(CoreApp.devicesField, []);
         devices.push(this.getDeviceId());
         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
@@ -951,7 +960,7 @@ class CoreApp {
     userLogin(user, refreshToken, keep) {
         this.userData = user;
         // Cache the encrypted serverside device id
-        this.storage.setData(CoreApp.serversideDeviceIdField, user.deviceId);
+        this.storage.setData(this.addIdentifier(CoreApp.serversideDeviceIdField), user.deviceId);
         if (keep) {
             this.authorize(user.token, refreshToken);
         }

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

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

package/lib/mjs/app/CoreApp.js

@@ -43,7 +43,7 @@ export class CoreApp {
         this.storage = storage;
         this.name = name;
         // Device id
-        this._deviceId = storage.getData(CoreApp.deviceIdField, '');
+        this._deviceId = storage.getData(this.addIdentifier(CoreApp.deviceIdField), '');
         // Restore
         this.restore();
         this.setApi(api);
@@ -115,10 +115,10 @@ export class CoreApp {
      */
     get persistedFields() {
         return [
-            CoreApp.deviceIdField,
-            CoreApp.devicePassphraseField,
-            CoreApp.serversideDeviceIdField,
-            CoreApp.headerTokenField
+            this.addIdentifier(CoreApp.deviceIdField),
+            this.addIdentifier(CoreApp.devicePassphraseField),
+            this.addIdentifier(CoreApp.serversideDeviceIdField),
+            this.addIdentifier(CoreApp.headerTokenField)
         ];
     }
     getDeviceId() {
@@ -126,9 +126,9 @@ export class CoreApp {
     }
     resetKeys() {
         this.storage.clear([
-            CoreApp.devicePassphraseField,
-            CoreApp.headerTokenField,
-            CoreApp.serversideDeviceIdField
+            this.addIdentifier(CoreApp.devicePassphraseField),
+            this.addIdentifier(CoreApp.headerTokenField),
+            this.addIdentifier(CoreApp.serversideDeviceIdField)
         ], false);
         this.passphrase = '';
     }
@@ -142,7 +142,7 @@ export class CoreApp {
             // First vist, restore and keep the source
             this.storage.copyFrom(this.persistedFields, false);
             // Reset device id
-            this._deviceId = this.storage.getData(CoreApp.deviceIdField, '');
+            this._deviceId = this.storage.getData(this.addIdentifier(CoreApp.deviceIdField), '');
             // Totally new, no data restored
             if (this._deviceId === '')
                 return false;
@@ -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
@@ -244,7 +253,7 @@ export class CoreApp {
             return;
         }
         // Serverside encrypted device id
-        const identifier = this.storage.getData(CoreApp.serversideDeviceIdField);
+        const identifier = this.storage.getData(this.addIdentifier(CoreApp.serversideDeviceIdField));
         // Timestamp
         const timestamp = new Date().getTime();
         // Request data
@@ -280,7 +289,7 @@ export class CoreApp {
             if (callback)
                 callback(false);
             // Clear device id
-            this.storage.setData(CoreApp.deviceIdField, undefined);
+            this.storage.setData(this.addIdentifier(CoreApp.deviceIdField), undefined);
             return;
         }
         this.initCallUpdate(result.data, data.timestamp);
@@ -303,14 +312,14 @@ export class CoreApp {
             return;
         // Update device id and cache it
         this._deviceId = data.deviceId;
-        this.storage.setData(CoreApp.deviceIdField, this._deviceId);
+        this.storage.setData(this.addIdentifier(CoreApp.deviceIdField), this._deviceId);
         // Devices
         const devices = this.storage.getPersistedData(CoreApp.devicesField, []);
         devices.push(this.getDeviceId());
         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
@@ -948,7 +957,7 @@ export class CoreApp {
     userLogin(user, refreshToken, keep) {
         this.userData = user;
         // Cache the encrypted serverside device id
-        this.storage.setData(CoreApp.serversideDeviceIdField, user.deviceId);
+        this.storage.setData(this.addIdentifier(CoreApp.serversideDeviceIdField), user.deviceId);
         if (keep) {
             this.authorize(user.token, refreshToken);
         }

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.43",
+    "version": "1.2.47",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/app/CoreApp.ts

@@ -632,10 +632,10 @@ export abstract class CoreApp<
      */
     protected get persistedFields() {
         return [
-            CoreApp.deviceIdField,
-            CoreApp.devicePassphraseField,
-            CoreApp.serversideDeviceIdField,
-            CoreApp.headerTokenField
+            this.addIdentifier(CoreApp.deviceIdField),
+            this.addIdentifier(CoreApp.devicePassphraseField),
+            this.addIdentifier(CoreApp.serversideDeviceIdField),
+            this.addIdentifier(CoreApp.headerTokenField)
         ];
     }
 
@@ -661,7 +661,10 @@ export abstract class CoreApp<
         this.name = name;
 
         // Device id
-        this._deviceId = storage.getData(CoreApp.deviceIdField, '');
+        this._deviceId = storage.getData(
+            this.addIdentifier(CoreApp.deviceIdField),
+            ''
+        );
 
         // Restore
         this.restore();
@@ -684,9 +687,9 @@ export abstract class CoreApp<
     private resetKeys() {
         this.storage.clear(
             [
-                CoreApp.devicePassphraseField,
-                CoreApp.headerTokenField,
-                CoreApp.serversideDeviceIdField
+                this.addIdentifier(CoreApp.devicePassphraseField),
+                this.addIdentifier(CoreApp.headerTokenField),
+                this.addIdentifier(CoreApp.serversideDeviceIdField)
             ],
             false
         );
@@ -708,7 +711,10 @@ export abstract class CoreApp<
             this.storage.copyFrom(this.persistedFields, false);
 
             // Reset device id
-            this._deviceId = this.storage.getData(CoreApp.deviceIdField, '');
+            this._deviceId = this.storage.getData(
+                this.addIdentifier(CoreApp.deviceIdField),
+                ''
+            );
 
             // Totally new, no data restored
             if (this._deviceId === '') return false;
@@ -723,8 +729,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(
@@ -769,6 +776,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
@@ -829,7 +845,7 @@ export abstract class CoreApp<
 
         // Serverside encrypted device id
         const identifier = this.storage.getData<string>(
-            CoreApp.serversideDeviceIdField
+            this.addIdentifier(CoreApp.serversideDeviceIdField)
         );
 
         // Timestamp
@@ -874,7 +890,10 @@ export abstract class CoreApp<
             if (callback) callback(false);
 
             // Clear device id
-            this.storage.setData(CoreApp.deviceIdField, undefined);
+            this.storage.setData(
+                this.addIdentifier(CoreApp.deviceIdField),
+                undefined
+            );
 
             return;
         }
@@ -900,7 +919,10 @@ export abstract class CoreApp<
 
         // Update device id and cache it
         this._deviceId = data.deviceId;
-        this.storage.setData(CoreApp.deviceIdField, this._deviceId);
+        this.storage.setData(
+            this.addIdentifier(CoreApp.deviceIdField),
+            this._deviceId
+        );
 
         // Devices
         const devices = this.storage.getPersistedData<string[]>(
@@ -913,7 +935,7 @@ export abstract class CoreApp<
         // Current passphrase
         this.passphrase = passphrase;
         this.storage.setData(
-            CoreApp.devicePassphraseField,
+            this.addIdentifier(CoreApp.devicePassphraseField),
             this.encrypt(passphrase, this.name)
         );
 
@@ -959,7 +981,7 @@ export abstract class CoreApp<
      * @returns Fields
      */
     protected initCallEncryptedUpdateFields(): string[] {
-        return [CoreApp.headerTokenField];
+        return [this.addIdentifier(CoreApp.headerTokenField)];
     }
 
     /**
@@ -987,7 +1009,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
@@ -1075,7 +1100,10 @@ export abstract class CoreApp<
      */
     clearCacheData() {
         this.clearCacheToken();
-        this.storage.setData(CoreApp.devicePassphraseField, undefined);
+        this.storage.setData(
+            this.addIdentifier(CoreApp.devicePassphraseField),
+            undefined
+        );
     }
 
     /**
@@ -1083,7 +1111,10 @@ export abstract class CoreApp<
      */
     clearCacheToken() {
         this.cachedRefreshToken = undefined;
-        this.storage.setPersistedData(CoreApp.headerTokenField, undefined);
+        this.storage.setPersistedData(
+            this.addIdentifier(CoreApp.headerTokenField),
+            undefined
+        );
     }
 
     /**
@@ -1395,7 +1426,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)
+        );
     }
 
     /**
@@ -1681,7 +1714,10 @@ export abstract class CoreApp<
         this.userData = user;
 
         // Cache the encrypted serverside device id
-        this.storage.setData(CoreApp.serversideDeviceIdField, user.deviceId);
+        this.storage.setData(
+            this.addIdentifier(CoreApp.serversideDeviceIdField),
+            user.deviceId
+        );
 
         if (keep) {
             this.authorize(user.token, refreshToken);

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": "已批准",