@etsoo/appscript 1.2.0 → 1.2.4

package/__tests__/app/CoreApp.ts

@@ -102,7 +102,7 @@ class CoreAppTest extends CoreApp<IAppSettings, {}, NotificationCallProps> {
             },
             createClient(),
             container,
-            new WindowStorage([], (_field, data, _index) => data),
+            new WindowStorage(),
             'SmartERP'
         );
     }

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

@@ -293,6 +293,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns Result
      */
     orgList(items?: number, serviceId?: number): Promise<IdLabelDto[] | undefined>;
+    /**
+     * Persist settings to source when application exit
+     */
+    persist(): void;
     /**
      * Switch organization
      * @param id Organization id
@@ -427,6 +431,10 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      */
     protected passphrase: string;
     private cachedRefreshToken?;
+    /**
+     * Get persisted fields
+     */
+    protected get persistedFields(): string[];
     /**
      * Protected constructor
      * @param settings Settings
@@ -436,6 +444,19 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param name Application name
      */
     protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, storage: IStorage, name: string);
+    private getDeviceId;
+    /**
+     * Restore settings from persisted source
+     */
+    protected restore(): boolean;
+    /**
+     * Persist settings to source when application exit
+     */
+    persist(): void;
+    /**
+     * Setup Api
+     * @param api Api
+     */
     protected setApi(api: IApi): void;
     /**
      * Api init call
@@ -723,6 +744,10 @@ export declare namespace CoreApp {
      * Device id field name
      */
     const deviceIdField = "SmartERPDeviceId";
+    /**
+     * Devices field name
+     */
+    const devicesField = "SmartERPDevices";
     /**
      * Device passphrase field name
      */

package/lib/cjs/app/CoreApp.js

@@ -38,7 +38,7 @@ class CoreApp {
         /**
          * Passphrase for encryption
          */
-        this.passphrase = '***';
+        this.passphrase = '';
         this.settings = settings;
         this.api = api;
         this.notifier = notifier;
@@ -46,6 +46,8 @@ class CoreApp {
         this.name = name;
         // Device id
         this._deviceId = storage.getData(CoreApp.deviceIdField, '');
+        // Restore
+        this.restore();
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         this.changeCulture(currentCulture);
@@ -110,6 +112,69 @@ class CoreApp {
     set authorized(value) {
         this._authorized = value;
     }
+    /**
+     * Get persisted fields
+     */
+    get persistedFields() {
+        return [
+            CoreApp.deviceIdField,
+            CoreApp.serversideDeviceIdField,
+            CoreApp.headerTokenField
+        ];
+    }
+    getDeviceId() {
+        return this.deviceId.substring(0, 10);
+    }
+    /**
+     * Restore settings from persisted source
+     */
+    restore() {
+        // Current device id, '' means new, or reload (not included) or duplicate (included)
+        if (this.deviceId) {
+            // Devices
+            const devices = this.storage.getPersistedData(CoreApp.devicesField);
+            // Exists in the list?
+            if (!(devices === null || devices === void 0 ? void 0 : devices.includes(this.getDeviceId()))) {
+                const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
+                if (passphraseEncrypted) {
+                    const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
+                    if (passphraseDecrypted != null) {
+                        this.passphrase = passphraseDecrypted;
+                        return false;
+                    }
+                }
+            }
+            else {
+                // Remove passphrase
+                this.storage.setData(CoreApp.devicePassphraseField, undefined);
+                this.passphrase = '';
+            }
+        }
+        // Restore
+        this.storage.copyFrom(this.persistedFields, true);
+        return true;
+    }
+    /**
+     * Persist settings to source when application exit
+     */
+    persist() {
+        // Devices
+        const devices = this.storage.getPersistedData(CoreApp.devicesField);
+        if (devices != null) {
+            const index = devices.indexOf(this.getDeviceId());
+            if (index !== -1) {
+                devices.splice(index, 1);
+                this.storage.setPersistedData(CoreApp.devicesField, devices);
+            }
+        }
+        if (!this.authorized)
+            return;
+        this.storage.copyTo(this.persistedFields);
+    }
+    /**
+     * Setup Api
+     * @param api Api
+     */
     setApi(api) {
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
@@ -156,16 +221,10 @@ class CoreApp {
     async initCall(callback) {
         var _a;
         // Passphrase exists?
-        // Same session should avoid multiple init calls
-        const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
-        if (passphraseEncrypted) {
-            const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
-            if (passphraseDecrypted != null) {
-                this.passphrase = passphraseDecrypted;
-                if (callback)
-                    callback(true);
-                return;
-            }
+        if (this.passphrase) {
+            if (callback)
+                callback(true);
+            return;
         }
         // Serverside encrypted device id
         const identifier = this.storage.getData(CoreApp.serversideDeviceIdField);
@@ -175,7 +234,7 @@ class CoreApp {
         const data = {
             timestamp,
             identifier,
-            deviceId: this.deviceId.length > 0 ? this.deviceId : undefined
+            deviceId: this.deviceId ? this.deviceId : undefined
         };
         const result = await this.apiInitCall(data);
         if (result == null) {
@@ -228,6 +287,10 @@ class CoreApp {
         // Update device id and cache it
         this._deviceId = data.deviceId;
         this.storage.setData(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));
@@ -321,7 +384,7 @@ class CoreApp {
         if (regionItem == null || !this.settings.regions.includes(regionId))
             return;
         // Save the id to local storage
-        this.storage.setData(shared_1.DomUtils.CountryField, regionId);
+        this.storage.setPersistedData(shared_1.DomUtils.CountryField, regionId);
         // Set the currency and culture
         this._currency = regionItem.currency;
         this._region = regionId;
@@ -339,7 +402,7 @@ class CoreApp {
         if (this._culture === name)
             return;
         // Save the cultrue to local storage
-        this.storage.setData(shared_1.DomUtils.CultureField, name);
+        this.storage.setPersistedData(shared_1.DomUtils.CultureField, name);
         // Change the API's Content-Language header
         // .net 5 API, UseRequestLocalization, RequestCultureProviders, ContentLanguageHeaderRequestCultureProvider
         this.api.setContentLanguage(name);
@@ -358,17 +421,15 @@ class CoreApp {
      * Clear cache data
      */
     clearCacheData() {
-        this.storage.setData(CoreApp.serversideDeviceIdField, undefined);
-        this.storage.setData(CoreApp.deviceIdField, undefined);
+        this.clearCacheToken();
         this.storage.setData(CoreApp.devicePassphraseField, undefined);
-        this.storage.setData(CoreApp.headerTokenField, undefined);
     }
     /**
      * Clear cached token
      */
     clearCacheToken() {
         this.cachedRefreshToken = undefined;
-        this.storage.setData(CoreApp.headerTokenField, undefined);
+        this.storage.setPersistedData(CoreApp.headerTokenField, undefined);
     }
     /**
      * Decrypt message
@@ -885,6 +946,10 @@ exports.CoreApp = CoreApp;
      * Device id field name
      */
     CoreApp.deviceIdField = 'SmartERPDeviceId';
+    /**
+     * Devices field name
+     */
+    CoreApp.devicesField = 'SmartERPDevices';
     /**
      * Device passphrase field name
      */

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

@@ -293,6 +293,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns Result
      */
     orgList(items?: number, serviceId?: number): Promise<IdLabelDto[] | undefined>;
+    /**
+     * Persist settings to source when application exit
+     */
+    persist(): void;
     /**
      * Switch organization
      * @param id Organization id
@@ -427,6 +431,10 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      */
     protected passphrase: string;
     private cachedRefreshToken?;
+    /**
+     * Get persisted fields
+     */
+    protected get persistedFields(): string[];
     /**
      * Protected constructor
      * @param settings Settings
@@ -436,6 +444,19 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param name Application name
      */
     protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, storage: IStorage, name: string);
+    private getDeviceId;
+    /**
+     * Restore settings from persisted source
+     */
+    protected restore(): boolean;
+    /**
+     * Persist settings to source when application exit
+     */
+    persist(): void;
+    /**
+     * Setup Api
+     * @param api Api
+     */
     protected setApi(api: IApi): void;
     /**
      * Api init call
@@ -723,6 +744,10 @@ export declare namespace CoreApp {
      * Device id field name
      */
     const deviceIdField = "SmartERPDeviceId";
+    /**
+     * Devices field name
+     */
+    const devicesField = "SmartERPDevices";
     /**
      * Device passphrase field name
      */

package/lib/mjs/app/CoreApp.js

@@ -35,7 +35,7 @@ export class CoreApp {
         /**
          * Passphrase for encryption
          */
-        this.passphrase = '***';
+        this.passphrase = '';
         this.settings = settings;
         this.api = api;
         this.notifier = notifier;
@@ -43,6 +43,8 @@ export class CoreApp {
         this.name = name;
         // Device id
         this._deviceId = storage.getData(CoreApp.deviceIdField, '');
+        // Restore
+        this.restore();
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         this.changeCulture(currentCulture);
@@ -107,6 +109,69 @@ export class CoreApp {
     set authorized(value) {
         this._authorized = value;
     }
+    /**
+     * Get persisted fields
+     */
+    get persistedFields() {
+        return [
+            CoreApp.deviceIdField,
+            CoreApp.serversideDeviceIdField,
+            CoreApp.headerTokenField
+        ];
+    }
+    getDeviceId() {
+        return this.deviceId.substring(0, 10);
+    }
+    /**
+     * Restore settings from persisted source
+     */
+    restore() {
+        // Current device id, '' means new, or reload (not included) or duplicate (included)
+        if (this.deviceId) {
+            // Devices
+            const devices = this.storage.getPersistedData(CoreApp.devicesField);
+            // Exists in the list?
+            if (!(devices === null || devices === void 0 ? void 0 : devices.includes(this.getDeviceId()))) {
+                const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
+                if (passphraseEncrypted) {
+                    const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
+                    if (passphraseDecrypted != null) {
+                        this.passphrase = passphraseDecrypted;
+                        return false;
+                    }
+                }
+            }
+            else {
+                // Remove passphrase
+                this.storage.setData(CoreApp.devicePassphraseField, undefined);
+                this.passphrase = '';
+            }
+        }
+        // Restore
+        this.storage.copyFrom(this.persistedFields, true);
+        return true;
+    }
+    /**
+     * Persist settings to source when application exit
+     */
+    persist() {
+        // Devices
+        const devices = this.storage.getPersistedData(CoreApp.devicesField);
+        if (devices != null) {
+            const index = devices.indexOf(this.getDeviceId());
+            if (index !== -1) {
+                devices.splice(index, 1);
+                this.storage.setPersistedData(CoreApp.devicesField, devices);
+            }
+        }
+        if (!this.authorized)
+            return;
+        this.storage.copyTo(this.persistedFields);
+    }
+    /**
+     * Setup Api
+     * @param api Api
+     */
     setApi(api) {
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
@@ -153,16 +218,10 @@ export class CoreApp {
     async initCall(callback) {
         var _a;
         // Passphrase exists?
-        // Same session should avoid multiple init calls
-        const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
-        if (passphraseEncrypted) {
-            const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
-            if (passphraseDecrypted != null) {
-                this.passphrase = passphraseDecrypted;
-                if (callback)
-                    callback(true);
-                return;
-            }
+        if (this.passphrase) {
+            if (callback)
+                callback(true);
+            return;
         }
         // Serverside encrypted device id
         const identifier = this.storage.getData(CoreApp.serversideDeviceIdField);
@@ -172,7 +231,7 @@ export class CoreApp {
         const data = {
             timestamp,
             identifier,
-            deviceId: this.deviceId.length > 0 ? this.deviceId : undefined
+            deviceId: this.deviceId ? this.deviceId : undefined
         };
         const result = await this.apiInitCall(data);
         if (result == null) {
@@ -225,6 +284,10 @@ export class CoreApp {
         // Update device id and cache it
         this._deviceId = data.deviceId;
         this.storage.setData(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));
@@ -318,7 +381,7 @@ export class CoreApp {
         if (regionItem == null || !this.settings.regions.includes(regionId))
             return;
         // Save the id to local storage
-        this.storage.setData(DomUtils.CountryField, regionId);
+        this.storage.setPersistedData(DomUtils.CountryField, regionId);
         // Set the currency and culture
         this._currency = regionItem.currency;
         this._region = regionId;
@@ -336,7 +399,7 @@ export class CoreApp {
         if (this._culture === name)
             return;
         // Save the cultrue to local storage
-        this.storage.setData(DomUtils.CultureField, name);
+        this.storage.setPersistedData(DomUtils.CultureField, name);
         // Change the API's Content-Language header
         // .net 5 API, UseRequestLocalization, RequestCultureProviders, ContentLanguageHeaderRequestCultureProvider
         this.api.setContentLanguage(name);
@@ -355,17 +418,15 @@ export class CoreApp {
      * Clear cache data
      */
     clearCacheData() {
-        this.storage.setData(CoreApp.serversideDeviceIdField, undefined);
-        this.storage.setData(CoreApp.deviceIdField, undefined);
+        this.clearCacheToken();
         this.storage.setData(CoreApp.devicePassphraseField, undefined);
-        this.storage.setData(CoreApp.headerTokenField, undefined);
     }
     /**
      * Clear cached token
      */
     clearCacheToken() {
         this.cachedRefreshToken = undefined;
-        this.storage.setData(CoreApp.headerTokenField, undefined);
+        this.storage.setPersistedData(CoreApp.headerTokenField, undefined);
     }
     /**
      * Decrypt message
@@ -881,6 +942,10 @@ export class CoreApp {
      * Device id field name
      */
     CoreApp.deviceIdField = 'SmartERPDeviceId';
+    /**
+     * Devices field name
+     */
+    CoreApp.devicesField = 'SmartERPDevices';
     /**
      * Device passphrase field name
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.0",
+    "version": "1.2.4",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.0.95",
         "@etsoo/restclient": "^1.0.63",
-        "@etsoo/shared": "^1.0.91",
+        "@etsoo/shared": "^1.0.94",
         "@types/crypto-js": "^4.0.2",
         "crypto-js": "^4.1.1"
     },

package/src/app/CoreApp.ts

@@ -403,6 +403,11 @@ export interface ICoreApp<
         serviceId?: number
     ): Promise<IdLabelDto[] | undefined>;
 
+    /**
+     * Persist settings to source when application exit
+     */
+    persist(): void;
+
     /**
      * Switch organization
      * @param id Organization id
@@ -591,10 +596,21 @@ export abstract class CoreApp<
     /**
      * Passphrase for encryption
      */
-    protected passphrase: string = '***';
+    protected passphrase: string = '';
 
     private cachedRefreshToken?: string;
 
+    /**
+     * Get persisted fields
+     */
+    protected get persistedFields() {
+        return [
+            CoreApp.deviceIdField,
+            CoreApp.serversideDeviceIdField,
+            CoreApp.headerTokenField
+        ];
+    }
+
     /**
      * Protected constructor
      * @param settings Settings
@@ -619,6 +635,9 @@ export abstract class CoreApp<
         // Device id
         this._deviceId = storage.getData(CoreApp.deviceIdField, '');
 
+        // Restore
+        this.restore();
+
         this.setApi(api);
 
         const { currentCulture, currentRegion } = settings;
@@ -630,6 +649,73 @@ export abstract class CoreApp<
         this.setup();
     }
 
+    private getDeviceId() {
+        return this.deviceId.substring(0, 10);
+    }
+
+    /**
+     * Restore settings from persisted source
+     */
+    protected restore() {
+        // Current device id, '' means new, or reload (not included) or duplicate (included)
+        if (this.deviceId) {
+            // Devices
+            const devices = this.storage.getPersistedData<string[]>(
+                CoreApp.devicesField
+            );
+
+            // Exists in the list?
+            if (!devices?.includes(this.getDeviceId())) {
+                const passphraseEncrypted = this.storage.getData<string>(
+                    CoreApp.devicePassphraseField
+                );
+                if (passphraseEncrypted) {
+                    const passphraseDecrypted = this.decrypt(
+                        passphraseEncrypted,
+                        this.name
+                    );
+                    if (passphraseDecrypted != null) {
+                        this.passphrase = passphraseDecrypted;
+                        return false;
+                    }
+                }
+            } else {
+                // Remove passphrase
+                this.storage.setData(CoreApp.devicePassphraseField, undefined);
+                this.passphrase = '';
+            }
+        }
+
+        // Restore
+        this.storage.copyFrom(this.persistedFields, true);
+
+        return true;
+    }
+
+    /**
+     * Persist settings to source when application exit
+     */
+    persist() {
+        // Devices
+        const devices = this.storage.getPersistedData<string[]>(
+            CoreApp.devicesField
+        );
+        if (devices != null) {
+            const index = devices.indexOf(this.getDeviceId());
+            if (index !== -1) {
+                devices.splice(index, 1);
+                this.storage.setPersistedData(CoreApp.devicesField, devices);
+            }
+        }
+
+        if (!this.authorized) return;
+        this.storage.copyTo(this.persistedFields);
+    }
+
+    /**
+     * Setup Api
+     * @param api Api
+     */
     protected setApi(api: IApi) {
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
@@ -679,20 +765,9 @@ export abstract class CoreApp<
      */
     async initCall(callback?: (result: boolean) => void) {
         // Passphrase exists?
-        // Same session should avoid multiple init calls
-        const passphraseEncrypted = this.storage.getData<string>(
-            CoreApp.devicePassphraseField
-        );
-        if (passphraseEncrypted) {
-            const passphraseDecrypted = this.decrypt(
-                passphraseEncrypted,
-                this.name
-            );
-            if (passphraseDecrypted != null) {
-                this.passphrase = passphraseDecrypted;
-                if (callback) callback(true);
-                return;
-            }
+        if (this.passphrase) {
+            if (callback) callback(true);
+            return;
         }
 
         // Serverside encrypted device id
@@ -707,7 +782,7 @@ export abstract class CoreApp<
         const data: InitCallDto = {
             timestamp,
             identifier,
-            deviceId: this.deviceId.length > 0 ? this.deviceId : undefined
+            deviceId: this.deviceId ? this.deviceId : undefined
         };
 
         const result = await this.apiInitCall(data);
@@ -770,6 +845,14 @@ export abstract class CoreApp<
         this._deviceId = data.deviceId;
         this.storage.setData(CoreApp.deviceIdField, this._deviceId);
 
+        // Devices
+        const devices = this.storage.getPersistedData<string[]>(
+            CoreApp.devicesField,
+            []
+        );
+        devices.push(this.getDeviceId());
+        this.storage.setPersistedData(CoreApp.devicesField, devices);
+
         // Current passphrase
         this.passphrase = passphrase;
         this.storage.setData(
@@ -884,7 +967,7 @@ export abstract class CoreApp<
             return;
 
         // Save the id to local storage
-        this.storage.setData(DomUtils.CountryField, regionId);
+        this.storage.setPersistedData(DomUtils.CountryField, regionId);
 
         // Set the currency and culture
         this._currency = regionItem.currency;
@@ -906,7 +989,7 @@ export abstract class CoreApp<
         if (this._culture === name) return;
 
         // Save the cultrue to local storage
-        this.storage.setData(DomUtils.CultureField, name);
+        this.storage.setPersistedData(DomUtils.CultureField, name);
 
         // Change the API's Content-Language header
         // .net 5 API, UseRequestLocalization, RequestCultureProviders, ContentLanguageHeaderRequestCultureProvider
@@ -933,12 +1016,8 @@ export abstract class CoreApp<
      * Clear cache data
      */
     clearCacheData() {
-        this.storage.setData(CoreApp.serversideDeviceIdField, undefined);
-
-        this.storage.setData(CoreApp.deviceIdField, undefined);
+        this.clearCacheToken();
         this.storage.setData(CoreApp.devicePassphraseField, undefined);
-
-        this.storage.setData(CoreApp.headerTokenField, undefined);
     }
 
     /**
@@ -946,7 +1025,7 @@ export abstract class CoreApp<
      */
     clearCacheToken() {
         this.cachedRefreshToken = undefined;
-        this.storage.setData(CoreApp.headerTokenField, undefined);
+        this.storage.setPersistedData(CoreApp.headerTokenField, undefined);
     }
 
     /**
@@ -1568,6 +1647,11 @@ export namespace CoreApp {
      */
     export const deviceIdField = 'SmartERPDeviceId';
 
+    /**
+     * Devices field name
+     */
+    export const devicesField = 'SmartERPDevices';
+
     /**
      * Device passphrase field name
      */