@etsoo/appscript 1.2.2 → 1.2.7

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);
@@ -118,33 +118,67 @@ class CoreApp {
     get persistedFields() {
         return [
             CoreApp.deviceIdField,
+            CoreApp.devicePassphraseField,
             CoreApp.serversideDeviceIdField,
             CoreApp.headerTokenField
         ];
     }
+    getDeviceId() {
+        return this.deviceId.substring(0, 15);
+    }
     /**
      * 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;
+        // 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?
+            const d = this.getDeviceId();
+            if (!devices.includes(d)) {
+                const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
+                if (passphraseEncrypted) {
+                    const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
+                    if (passphraseDecrypted != null) {
+                        this.passphrase = passphraseDecrypted;
+                        devices.push(d);
+                        this.storage.setPersistedData(CoreApp.devicesField, devices);
+                        return false;
+                    }
+                }
+            }
+            else {
+                // Duplicate tab, session data copied
+                // Remove the token, deviceId, and passphrase
+                this.storage.clear([
+                    CoreApp.devicePassphraseField,
+                    CoreApp.headerTokenField,
+                    CoreApp.serversideDeviceIdField
+                ], false);
+                this.passphrase = '';
             }
         }
         // Restore
-        this.storage.copy(this.persistedFields, true);
+        this.storage.copyFrom(this.persistedFields, true);
         return true;
     }
     /**
      * Persist settings to source when application exit
      */
     persist() {
-        this.persistedFields.forEach((field) => {
-            this.storage.setPersistedData(field, this.storage.getData(field));
-        });
+        // 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
@@ -262,6 +296,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));
@@ -917,6 +955,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);
@@ -115,33 +115,67 @@ export class CoreApp {
     get persistedFields() {
         return [
             CoreApp.deviceIdField,
+            CoreApp.devicePassphraseField,
             CoreApp.serversideDeviceIdField,
             CoreApp.headerTokenField
         ];
     }
+    getDeviceId() {
+        return this.deviceId.substring(0, 15);
+    }
     /**
      * 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;
+        // 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?
+            const d = this.getDeviceId();
+            if (!devices.includes(d)) {
+                const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
+                if (passphraseEncrypted) {
+                    const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
+                    if (passphraseDecrypted != null) {
+                        this.passphrase = passphraseDecrypted;
+                        devices.push(d);
+                        this.storage.setPersistedData(CoreApp.devicesField, devices);
+                        return false;
+                    }
+                }
+            }
+            else {
+                // Duplicate tab, session data copied
+                // Remove the token, deviceId, and passphrase
+                this.storage.clear([
+                    CoreApp.devicePassphraseField,
+                    CoreApp.headerTokenField,
+                    CoreApp.serversideDeviceIdField
+                ], false);
+                this.passphrase = '';
             }
         }
         // Restore
-        this.storage.copy(this.persistedFields, true);
+        this.storage.copyFrom(this.persistedFields, true);
         return true;
     }
     /**
      * Persist settings to source when application exit
      */
     persist() {
-        this.persistedFields.forEach((field) => {
-            this.storage.setPersistedData(field, this.storage.getData(field));
-        });
+        // 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
@@ -259,6 +293,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));
@@ -913,6 +951,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.2",
+    "version": "1.2.7",
     "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.93",
+        "@etsoo/shared": "^1.0.94",
         "@types/crypto-js": "^4.0.2",
         "crypto-js": "^4.1.1"
     },

package/src/app/CoreApp.ts

@@ -606,6 +606,7 @@ export abstract class CoreApp<
     protected get persistedFields() {
         return [
             CoreApp.deviceIdField,
+            CoreApp.devicePassphraseField,
             CoreApp.serversideDeviceIdField,
             CoreApp.headerTokenField
         ];
@@ -632,12 +633,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,26 +650,62 @@ export abstract class CoreApp<
         this.setup();
     }
 
+    private getDeviceId() {
+        return this.deviceId.substring(0, 15);
+    }
+
     /**
      * 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;
-                return false;
+
+            // Exists in the list?
+            const d = this.getDeviceId();
+            if (!devices.includes(d)) {
+                const passphraseEncrypted = this.storage.getData<string>(
+                    CoreApp.devicePassphraseField
+                );
+                if (passphraseEncrypted) {
+                    const passphraseDecrypted = this.decrypt(
+                        passphraseEncrypted,
+                        this.name
+                    );
+                    if (passphraseDecrypted != null) {
+                        this.passphrase = passphraseDecrypted;
+
+                        devices.push(d);
+                        this.storage.setPersistedData(
+                            CoreApp.devicesField,
+                            devices
+                        );
+
+                        return false;
+                    }
+                }
+            } else {
+                // Duplicate tab, session data copied
+                // Remove the token, deviceId, and passphrase
+                this.storage.clear(
+                    [
+                        CoreApp.devicePassphraseField,
+                        CoreApp.headerTokenField,
+                        CoreApp.serversideDeviceIdField
+                    ],
+                    false
+                );
+                this.passphrase = '';
             }
         }
 
         // Restore
-        this.storage.copy(this.persistedFields, true);
+        this.storage.copyFrom(this.persistedFields, true);
 
         return true;
     }
@@ -677,9 +714,20 @@ export abstract class CoreApp<
      * Persist settings to source when application exit
      */
     persist() {
-        this.persistedFields.forEach((field) => {
-            this.storage.setPersistedData(field, this.storage.getData(field));
-        });
+        // 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);
     }
 
     /**
@@ -815,6 +863,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(
@@ -1609,6 +1665,11 @@ export namespace CoreApp {
      */
     export const deviceIdField = 'SmartERPDeviceId';
 
+    /**
+     * Devices field name
+     */
+    export const devicesField = 'SmartERPDevices';
+
     /**
      * Device passphrase field name
      */