@etsoo/appscript 1.1.97 → 1.2.1

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
@@ -436,6 +440,18 @@ 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);
+    /**
+     * 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

package/lib/cjs/app/CoreApp.js

@@ -21,7 +21,6 @@ class CoreApp {
      * @param name Application name
      */
     constructor(settings, api, notifier, storage, name) {
-        var _a;
         this._authorized = false;
         this._isTryingLogin = false;
         /**
@@ -39,14 +38,16 @@ class CoreApp {
         /**
          * Passphrase for encryption
          */
-        this.passphrase = '***';
+        this.passphrase = '';
         this.settings = settings;
         this.api = api;
         this.notifier = notifier;
         this.storage = storage;
         this.name = name;
+        // Restore
+        this.restore();
         // Device id
-        this._deviceId = (_a = storage.getData(CoreApp.deviceIdField)) !== null && _a !== void 0 ? _a : '';
+        this._deviceId = storage.getData(CoreApp.deviceIdField, '');
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         this.changeCulture(currentCulture);
@@ -111,6 +112,38 @@ class CoreApp {
     set authorized(value) {
         this._authorized = value;
     }
+    /**
+     * Restore settings from persisted source
+     */
+    restore() {
+        const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
+        if (passphraseEncrypted) {
+            const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
+            if (passphraseDecrypted != null) {
+                this.passphrase = passphraseDecrypted;
+                return false;
+            }
+        }
+        // Restore
+        this.storage.copy([
+            CoreApp.deviceIdField,
+            CoreApp.serversideDeviceIdField,
+            CoreApp.headerTokenField
+        ], true);
+        return true;
+    }
+    /**
+     * Persist settings to source when application exit
+     */
+    persist() {
+        this.storage.setPersistedData(CoreApp.deviceIdField, this.deviceId);
+        this.storage.setPersistedData(CoreApp.serversideDeviceIdField, this.storage.getData(CoreApp.serversideDeviceIdField));
+        this.storage.setPersistedData(CoreApp.headerTokenField, this.storage.getData(CoreApp.headerTokenField));
+    }
+    /**
+     * Setup Api
+     * @param api Api
+     */
     setApi(api) {
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
@@ -157,16 +190,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);
@@ -228,7 +255,7 @@ class CoreApp {
             return;
         // Update device id and cache it
         this._deviceId = data.deviceId;
-        this.storage.setData(CoreApp.deviceIdField, this.deviceId);
+        this.storage.setData(CoreApp.deviceIdField, this._deviceId);
         // Current passphrase
         this.passphrase = passphrase;
         this.storage.setData(CoreApp.devicePassphraseField, this.encrypt(passphrase, this.name));
@@ -322,7 +349,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;
@@ -340,7 +367,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);

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
@@ -436,6 +440,18 @@ 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);
+    /**
+     * 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

package/lib/mjs/app/CoreApp.js

@@ -18,7 +18,6 @@ export class CoreApp {
      * @param name Application name
      */
     constructor(settings, api, notifier, storage, name) {
-        var _a;
         this._authorized = false;
         this._isTryingLogin = false;
         /**
@@ -36,14 +35,16 @@ export class CoreApp {
         /**
          * Passphrase for encryption
          */
-        this.passphrase = '***';
+        this.passphrase = '';
         this.settings = settings;
         this.api = api;
         this.notifier = notifier;
         this.storage = storage;
         this.name = name;
+        // Restore
+        this.restore();
         // Device id
-        this._deviceId = (_a = storage.getData(CoreApp.deviceIdField)) !== null && _a !== void 0 ? _a : '';
+        this._deviceId = storage.getData(CoreApp.deviceIdField, '');
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         this.changeCulture(currentCulture);
@@ -108,6 +109,38 @@ export class CoreApp {
     set authorized(value) {
         this._authorized = value;
     }
+    /**
+     * Restore settings from persisted source
+     */
+    restore() {
+        const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
+        if (passphraseEncrypted) {
+            const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
+            if (passphraseDecrypted != null) {
+                this.passphrase = passphraseDecrypted;
+                return false;
+            }
+        }
+        // Restore
+        this.storage.copy([
+            CoreApp.deviceIdField,
+            CoreApp.serversideDeviceIdField,
+            CoreApp.headerTokenField
+        ], true);
+        return true;
+    }
+    /**
+     * Persist settings to source when application exit
+     */
+    persist() {
+        this.storage.setPersistedData(CoreApp.deviceIdField, this.deviceId);
+        this.storage.setPersistedData(CoreApp.serversideDeviceIdField, this.storage.getData(CoreApp.serversideDeviceIdField));
+        this.storage.setPersistedData(CoreApp.headerTokenField, this.storage.getData(CoreApp.headerTokenField));
+    }
+    /**
+     * Setup Api
+     * @param api Api
+     */
     setApi(api) {
         // onRequest, show loading or not, rewrite the property to override default action
         api.onRequest = (data) => {
@@ -154,16 +187,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);
@@ -225,7 +252,7 @@ export class CoreApp {
             return;
         // Update device id and cache it
         this._deviceId = data.deviceId;
-        this.storage.setData(CoreApp.deviceIdField, this.deviceId);
+        this.storage.setData(CoreApp.deviceIdField, this._deviceId);
         // Current passphrase
         this.passphrase = passphrase;
         this.storage.setData(CoreApp.devicePassphraseField, this.encrypt(passphrase, this.name));
@@ -319,7 +346,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;
@@ -337,7 +364,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);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.97",
+    "version": "1.2.1",
     "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.89",
+        "@etsoo/shared": "^1.0.93",
         "@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,7 +596,7 @@ export abstract class CoreApp<
     /**
      * Passphrase for encryption
      */
-    protected passphrase: string = '***';
+    protected passphrase: string = '';
 
     private cachedRefreshToken?: string;
 
@@ -616,8 +621,11 @@ export abstract class CoreApp<
         this.storage = storage;
         this.name = name;
 
+        // Restore
+        this.restore();
+
         // Device id
-        this._deviceId = storage.getData<string>(CoreApp.deviceIdField) ?? '';
+        this._deviceId = storage.getData(CoreApp.deviceIdField, '');
 
         this.setApi(api);
 
@@ -630,6 +638,58 @@ export abstract class CoreApp<
         this.setup();
     }
 
+    /**
+     * Restore settings from persisted source
+     */
+    protected restore() {
+        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;
+            }
+        }
+
+        // Restore
+        this.storage.copy(
+            [
+                CoreApp.deviceIdField,
+                CoreApp.serversideDeviceIdField,
+                CoreApp.headerTokenField
+            ],
+            true
+        );
+
+        return true;
+    }
+
+    /**
+     * Persist settings to source when application exit
+     */
+    persist() {
+        this.storage.setPersistedData(CoreApp.deviceIdField, this.deviceId);
+
+        this.storage.setPersistedData(
+            CoreApp.serversideDeviceIdField,
+            this.storage.getData<string>(CoreApp.serversideDeviceIdField)
+        );
+
+        this.storage.setPersistedData(
+            CoreApp.headerTokenField,
+            this.storage.getData<string>(CoreApp.headerTokenField)
+        );
+    }
+
+    /**
+     * 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 +739,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
@@ -768,7 +817,7 @@ export abstract class CoreApp<
 
         // Update device id and cache it
         this._deviceId = data.deviceId;
-        this.storage.setData(CoreApp.deviceIdField, this.deviceId);
+        this.storage.setData(CoreApp.deviceIdField, this._deviceId);
 
         // Current passphrase
         this.passphrase = passphrase;
@@ -884,7 +933,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 +955,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