@etsoo/appscript 1.2.7 → 1.2.8

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

@@ -445,6 +445,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      */
     protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, storage: IStorage, name: string);
     private getDeviceId;
+    private resetKeys;
     /**
      * Restore settings from persisted source
      */

package/lib/cjs/app/CoreApp.js

@@ -126,42 +126,52 @@ class CoreApp {
     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) {
-            // Devices
-            const devices = this.storage.getPersistedData(CoreApp.devicesField, []);
-            // Exists in the list?
+        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)) {
-                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 {
+            if (devices.includes(d)) {
                 // Duplicate tab, session data copied
                 // Remove the token, deviceId, and passphrase
-                this.storage.clear([
-                    CoreApp.devicePassphraseField,
-                    CoreApp.headerTokenField,
-                    CoreApp.serversideDeviceIdField
-                ], false);
-                this.passphrase = '';
+                this.resetKeys();
+                return false;
             }
         }
-        // Restore
-        this.storage.copyFrom(this.persistedFields, true);
-        return true;
+        const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
+        if (passphraseEncrypted) {
+            const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
+            if (passphraseDecrypted != null) {
+                this.passphrase = passphraseDecrypted;
+                const d = this.getDeviceId();
+                if (!devices.includes(d)) {
+                    devices.push(d);
+                    this.storage.setPersistedData(CoreApp.devicesField, devices);
+                }
+                return true;
+            }
+            // Failed, reset keys
+            this.resetKeys();
+        }
+        return false;
     }
     /**
      * Persist settings to source when application exit

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

@@ -445,6 +445,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      */
     protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, storage: IStorage, name: string);
     private getDeviceId;
+    private resetKeys;
     /**
      * Restore settings from persisted source
      */

package/lib/mjs/app/CoreApp.js

@@ -123,42 +123,52 @@ export class CoreApp {
     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) {
-            // Devices
-            const devices = this.storage.getPersistedData(CoreApp.devicesField, []);
-            // Exists in the list?
+        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)) {
-                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 {
+            if (devices.includes(d)) {
                 // Duplicate tab, session data copied
                 // Remove the token, deviceId, and passphrase
-                this.storage.clear([
-                    CoreApp.devicePassphraseField,
-                    CoreApp.headerTokenField,
-                    CoreApp.serversideDeviceIdField
-                ], false);
-                this.passphrase = '';
+                this.resetKeys();
+                return false;
             }
         }
-        // Restore
-        this.storage.copyFrom(this.persistedFields, true);
-        return true;
+        const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
+        if (passphraseEncrypted) {
+            const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
+            if (passphraseDecrypted != null) {
+                this.passphrase = passphraseDecrypted;
+                const d = this.getDeviceId();
+                if (!devices.includes(d)) {
+                    devices.push(d);
+                    this.storage.setPersistedData(CoreApp.devicesField, devices);
+                }
+                return true;
+            }
+            // Failed, reset keys
+            this.resetKeys();
+        }
+        return false;
     }
     /**
      * Persist settings to source when application exit

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.7",
+    "version": "1.2.8",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/app/CoreApp.ts

@@ -654,60 +654,74 @@ export abstract class CoreApp<
         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) {
-            // Devices
-            const devices = this.storage.getPersistedData<string[]>(
-                CoreApp.devicesField,
-                []
-            );
+        if (this.deviceId === '') {
+            // First vist, restore
+            this.storage.copyFrom(this.persistedFields, true);
 
-            // Exists in the list?
+            // Reset device id
+            this._deviceId = this.storage.getData(CoreApp.deviceIdField, '');
+        } else {
             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 {
+            if (devices.includes(d)) {
                 // Duplicate tab, session data copied
                 // Remove the token, deviceId, and passphrase
-                this.storage.clear(
-                    [
-                        CoreApp.devicePassphraseField,
-                        CoreApp.headerTokenField,
-                        CoreApp.serversideDeviceIdField
-                    ],
-                    false
-                );
-                this.passphrase = '';
+                this.resetKeys();
+                return false;
             }
         }
 
-        // Restore
-        this.storage.copyFrom(this.persistedFields, true);
+        const passphraseEncrypted = this.storage.getData<string>(
+            CoreApp.devicePassphraseField
+        );
+        if (passphraseEncrypted) {
+            const passphraseDecrypted = this.decrypt(
+                passphraseEncrypted,
+                this.name
+            );
+            if (passphraseDecrypted != null) {
+                this.passphrase = passphraseDecrypted;
+
+                const d = this.getDeviceId();
+                if (!devices.includes(d)) {
+                    devices.push(d);
+                    this.storage.setPersistedData(
+                        CoreApp.devicesField,
+                        devices
+                    );
+                }
 
-        return true;
+                return true;
+            }
+
+            // Failed, reset keys
+            this.resetKeys();
+        }
+
+        return false;
     }
 
     /**