@etsoo/appscript 1.2.3 → 1.2.8

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

@@ -444,6 +444,8 @@ 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;
+    private resetKeys;
     /**
      * Restore settings from persisted source
      */
@@ -743,6 +745,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,35 +118,74 @@ class CoreApp {
     get persistedFields() {
         return [
             CoreApp.deviceIdField,
+            CoreApp.devicePassphraseField,
             CoreApp.serversideDeviceIdField,
             CoreApp.headerTokenField
         ];
     }
+    getDeviceId() {
+        return this.deviceId.substring(0, 15);
+    }
+    resetKeys() {
+        this.storage.clear([
+            CoreApp.devicePassphraseField,
+            CoreApp.headerTokenField,
+            CoreApp.serversideDeviceIdField
+        ], false);
+        this.passphrase = '';
+    }
     /**
      * Restore settings from persisted source
      */
     restore() {
+        // Devices
+        const devices = this.storage.getPersistedData(CoreApp.devicesField, []);
+        // Current device id, '' means new, or reload (not included) or duplicate (included)
+        if (this.deviceId === '') {
+            // First vist, restore
+            this.storage.copyFrom(this.persistedFields, true);
+            // Reset device id
+            this._deviceId = this.storage.getData(CoreApp.deviceIdField, '');
+        }
+        else {
+            const d = this.getDeviceId();
+            if (devices.includes(d)) {
+                // Duplicate tab, session data copied
+                // Remove the token, deviceId, and passphrase
+                this.resetKeys();
+                return false;
+            }
+        }
         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);
+                const d = this.getDeviceId();
+                if (!devices.includes(d)) {
+                    devices.push(d);
+                    this.storage.setPersistedData(CoreApp.devicesField, devices);
                 }
-                return false;
+                return true;
             }
+            // Failed, reset keys
+            this.resetKeys();
         }
-        // Restore
-        this.storage.copyFrom(this.persistedFields, true);
-        return true;
+        return false;
     }
     /**
      * 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 +306,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 +965,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,8 @@ 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;
+    private resetKeys;
     /**
      * Restore settings from persisted source
      */
@@ -743,6 +745,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,35 +115,74 @@ export class CoreApp {
     get persistedFields() {
         return [
             CoreApp.deviceIdField,
+            CoreApp.devicePassphraseField,
             CoreApp.serversideDeviceIdField,
             CoreApp.headerTokenField
         ];
     }
+    getDeviceId() {
+        return this.deviceId.substring(0, 15);
+    }
+    resetKeys() {
+        this.storage.clear([
+            CoreApp.devicePassphraseField,
+            CoreApp.headerTokenField,
+            CoreApp.serversideDeviceIdField
+        ], false);
+        this.passphrase = '';
+    }
     /**
      * Restore settings from persisted source
      */
     restore() {
+        // Devices
+        const devices = this.storage.getPersistedData(CoreApp.devicesField, []);
+        // Current device id, '' means new, or reload (not included) or duplicate (included)
+        if (this.deviceId === '') {
+            // First vist, restore
+            this.storage.copyFrom(this.persistedFields, true);
+            // Reset device id
+            this._deviceId = this.storage.getData(CoreApp.deviceIdField, '');
+        }
+        else {
+            const d = this.getDeviceId();
+            if (devices.includes(d)) {
+                // Duplicate tab, session data copied
+                // Remove the token, deviceId, and passphrase
+                this.resetKeys();
+                return false;
+            }
+        }
         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);
+                const d = this.getDeviceId();
+                if (!devices.includes(d)) {
+                    devices.push(d);
+                    this.storage.setPersistedData(CoreApp.devicesField, devices);
                 }
-                return false;
+                return true;
             }
+            // Failed, reset keys
+            this.resetKeys();
         }
-        // Restore
-        this.storage.copyFrom(this.persistedFields, true);
-        return true;
+        return false;
     }
     /**
      * 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 +303,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 +961,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.8",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

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,10 +650,50 @@ export abstract class CoreApp<
         this.setup();
     }
 
+    private getDeviceId() {
+        return this.deviceId.substring(0, 15);
+    }
+
+    private resetKeys() {
+        this.storage.clear(
+            [
+                CoreApp.devicePassphraseField,
+                CoreApp.headerTokenField,
+                CoreApp.serversideDeviceIdField
+            ],
+            false
+        );
+        this.passphrase = '';
+    }
+
     /**
      * Restore settings from persisted source
      */
     protected restore() {
+        // Devices
+        const devices = this.storage.getPersistedData<string[]>(
+            CoreApp.devicesField,
+            []
+        );
+
+        // Current device id, '' means new, or reload (not included) or duplicate (included)
+        if (this.deviceId === '') {
+            // First vist, restore
+            this.storage.copyFrom(this.persistedFields, true);
+
+            // Reset device id
+            this._deviceId = this.storage.getData(CoreApp.deviceIdField, '');
+        } else {
+            const d = this.getDeviceId();
+
+            if (devices.includes(d)) {
+                // Duplicate tab, session data copied
+                // Remove the token, deviceId, and passphrase
+                this.resetKeys();
+                return false;
+            }
+        }
+
         const passphraseEncrypted = this.storage.getData<string>(
             CoreApp.devicePassphraseField
         );
@@ -664,28 +705,41 @@ export abstract class CoreApp<
             if (passphraseDecrypted != null) {
                 this.passphrase = passphraseDecrypted;
 
-                // Same device
-                if (
-                    this.deviceId ===
-                    this.storage.getPersistedData<string>(CoreApp.deviceIdField)
-                ) {
-                    this.storage.clear(this.persistedFields, true);
+                const d = this.getDeviceId();
+                if (!devices.includes(d)) {
+                    devices.push(d);
+                    this.storage.setPersistedData(
+                        CoreApp.devicesField,
+                        devices
+                    );
                 }
 
-                return false;
+                return true;
             }
-        }
 
-        // Restore
-        this.storage.copyFrom(this.persistedFields, true);
+            // Failed, reset keys
+            this.resetKeys();
+        }
 
-        return true;
+        return false;
     }
 
     /**
      * 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 +877,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 +1679,11 @@ export namespace CoreApp {
      */
     export const deviceIdField = 'SmartERPDeviceId';
 
+    /**
+     * Devices field name
+     */
+    export const devicesField = 'SmartERPDevices';
+
     /**
      * Device passphrase field name
      */