@etsoo/appscript 1.2.3 → 1.2.4

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

@@ -444,6 +444,7 @@ 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
      */
@@ -743,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

@@ -44,10 +44,10 @@ class CoreApp {
         this.notifier = notifier;
         this.storage = storage;
         this.name = name;
-        // Restore
-        this.restore();
         // Device id
         this._deviceId = storage.getData(CoreApp.deviceIdField, '');
+        // Restore
+        this.restore();
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         this.changeCulture(currentCulture);
@@ -122,21 +122,32 @@ class CoreApp {
             CoreApp.headerTokenField
         ];
     }
+    getDeviceId() {
+        return this.deviceId.substring(0, 10);
+    }
     /**
      * 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;
-                // Same device
-                if (this.deviceId ===
-                    this.storage.getPersistedData(CoreApp.deviceIdField)) {
-                    this.storage.clear(this.persistedFields, true);
+        // 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;
+                    }
                 }
-                return false;
+            }
+            else {
+                // Remove passphrase
+                this.storage.setData(CoreApp.devicePassphraseField, undefined);
+                this.passphrase = '';
             }
         }
         // Restore
@@ -147,6 +158,15 @@ class CoreApp {
      * 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);
@@ -267,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));
@@ -922,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

@@ -444,6 +444,7 @@ 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
      */
@@ -743,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

@@ -41,10 +41,10 @@ export class CoreApp {
         this.notifier = notifier;
         this.storage = storage;
         this.name = name;
-        // Restore
-        this.restore();
         // Device id
         this._deviceId = storage.getData(CoreApp.deviceIdField, '');
+        // Restore
+        this.restore();
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         this.changeCulture(currentCulture);
@@ -119,21 +119,32 @@ export class CoreApp {
             CoreApp.headerTokenField
         ];
     }
+    getDeviceId() {
+        return this.deviceId.substring(0, 10);
+    }
     /**
      * 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;
-                // Same device
-                if (this.deviceId ===
-                    this.storage.getPersistedData(CoreApp.deviceIdField)) {
-                    this.storage.clear(this.persistedFields, true);
+        // 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;
+                    }
                 }
-                return false;
+            }
+            else {
+                // Remove passphrase
+                this.storage.setData(CoreApp.devicePassphraseField, undefined);
+                this.passphrase = '';
             }
         }
         // Restore
@@ -144,6 +155,15 @@ export class CoreApp {
      * 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);
@@ -264,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));
@@ -918,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.3",
+    "version": "1.2.4",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/app/CoreApp.ts

@@ -632,12 +632,12 @@ export abstract class CoreApp<
         this.storage = storage;
         this.name = name;
 
-        // Restore
-        this.restore();
-
         // Device id
         this._deviceId = storage.getData(CoreApp.deviceIdField, '');
 
+        // Restore
+        this.restore();
+
         this.setApi(api);
 
         const { currentCulture, currentRegion } = settings;
@@ -649,30 +649,40 @@ export abstract class CoreApp<
         this.setup();
     }
 
+    private getDeviceId() {
+        return this.deviceId.substring(0, 10);
+    }
+
     /**
      * Restore settings from persisted source
      */
     protected restore() {
-        const passphraseEncrypted = this.storage.getData<string>(
-            CoreApp.devicePassphraseField
-        );
-        if (passphraseEncrypted) {
-            const passphraseDecrypted = this.decrypt(
-                passphraseEncrypted,
-                this.name
+        // Current device id, '' means new, or reload (not included) or duplicate (included)
+        if (this.deviceId) {
+            // Devices
+            const devices = this.storage.getPersistedData<string[]>(
+                CoreApp.devicesField
             );
-            if (passphraseDecrypted != null) {
-                this.passphrase = passphraseDecrypted;
-
-                // Same device
-                if (
-                    this.deviceId ===
-                    this.storage.getPersistedData<string>(CoreApp.deviceIdField)
-                ) {
-                    this.storage.clear(this.persistedFields, true);
-                }
 
-                return false;
+            // 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 = '';
             }
         }
 
@@ -686,6 +696,18 @@ export abstract class CoreApp<
      * 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);
     }
@@ -823,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(
@@ -1617,6 +1647,11 @@ export namespace CoreApp {
      */
     export const deviceIdField = 'SmartERPDeviceId';
 
+    /**
+     * Devices field name
+     */
+    export const devicesField = 'SmartERPDevices';
+
     /**
      * Device passphrase field name
      */