@etsoo/appscript 1.2.44 → 1.2.45

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

@@ -475,6 +475,12 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Persist settings to source when application exit
      */
     persist(): void;
+    /**
+     * Add app name as identifier
+     * @param field Field
+     * @returns Result
+     */
+    protected addIdentifier(field: string): string;
     /**
      * Setup Api
      * @param api Api

package/lib/cjs/app/CoreApp.js

@@ -119,7 +119,7 @@ class CoreApp {
     get persistedFields() {
         return [
             CoreApp.deviceIdField,
-            CoreApp.devicePassphraseField,
+            this.addIdentifier(CoreApp.devicePassphraseField),
             CoreApp.serversideDeviceIdField,
             CoreApp.headerTokenField
         ];
@@ -129,7 +129,7 @@ class CoreApp {
     }
     resetKeys() {
         this.storage.clear([
-            CoreApp.devicePassphraseField,
+            this.addIdentifier(CoreApp.devicePassphraseField),
             CoreApp.headerTokenField,
             CoreApp.serversideDeviceIdField
         ], false);
@@ -158,7 +158,8 @@ class CoreApp {
             this.resetKeys();
             return false;
         }
-        const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
+        // this.name to identifier different app's secret
+        const passphraseEncrypted = this.storage.getData(this.addIdentifier(CoreApp.devicePassphraseField));
         if (passphraseEncrypted) {
             const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
             if (passphraseDecrypted != null) {
@@ -191,6 +192,14 @@ class CoreApp {
             return;
         this.storage.copyTo(this.persistedFields);
     }
+    /**
+     * Add app name as identifier
+     * @param field Field
+     * @returns Result
+     */
+    addIdentifier(field) {
+        return field + '-' + this.name;
+    }
     /**
      * Setup Api
      * @param api Api
@@ -313,7 +322,7 @@ class CoreApp {
         this.storage.setPersistedData(CoreApp.devicesField, devices);
         // Current passphrase
         this.passphrase = passphrase;
-        this.storage.setData(CoreApp.devicePassphraseField, this.encrypt(passphrase, this.name));
+        this.storage.setData(this.addIdentifier(CoreApp.devicePassphraseField), this.encrypt(passphrase, this.name));
         // Previous passphrase
         if (data.previousPassphrase) {
             const prev = this.decrypt(data.previousPassphrase, timestamp.toString());
@@ -443,7 +452,7 @@ class CoreApp {
      */
     clearCacheData() {
         this.clearCacheToken();
-        this.storage.setData(CoreApp.devicePassphraseField, undefined);
+        this.storage.setData(this.addIdentifier(CoreApp.devicePassphraseField), undefined);
     }
     /**
      * Clear cached token

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

@@ -475,6 +475,12 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Persist settings to source when application exit
      */
     persist(): void;
+    /**
+     * Add app name as identifier
+     * @param field Field
+     * @returns Result
+     */
+    protected addIdentifier(field: string): string;
     /**
      * Setup Api
      * @param api Api

package/lib/mjs/app/CoreApp.js

@@ -116,7 +116,7 @@ export class CoreApp {
     get persistedFields() {
         return [
             CoreApp.deviceIdField,
-            CoreApp.devicePassphraseField,
+            this.addIdentifier(CoreApp.devicePassphraseField),
             CoreApp.serversideDeviceIdField,
             CoreApp.headerTokenField
         ];
@@ -126,7 +126,7 @@ export class CoreApp {
     }
     resetKeys() {
         this.storage.clear([
-            CoreApp.devicePassphraseField,
+            this.addIdentifier(CoreApp.devicePassphraseField),
             CoreApp.headerTokenField,
             CoreApp.serversideDeviceIdField
         ], false);
@@ -155,7 +155,8 @@ export class CoreApp {
             this.resetKeys();
             return false;
         }
-        const passphraseEncrypted = this.storage.getData(CoreApp.devicePassphraseField);
+        // this.name to identifier different app's secret
+        const passphraseEncrypted = this.storage.getData(this.addIdentifier(CoreApp.devicePassphraseField));
         if (passphraseEncrypted) {
             const passphraseDecrypted = this.decrypt(passphraseEncrypted, this.name);
             if (passphraseDecrypted != null) {
@@ -188,6 +189,14 @@ export class CoreApp {
             return;
         this.storage.copyTo(this.persistedFields);
     }
+    /**
+     * Add app name as identifier
+     * @param field Field
+     * @returns Result
+     */
+    addIdentifier(field) {
+        return field + '-' + this.name;
+    }
     /**
      * Setup Api
      * @param api Api
@@ -310,7 +319,7 @@ export class CoreApp {
         this.storage.setPersistedData(CoreApp.devicesField, devices);
         // Current passphrase
         this.passphrase = passphrase;
-        this.storage.setData(CoreApp.devicePassphraseField, this.encrypt(passphrase, this.name));
+        this.storage.setData(this.addIdentifier(CoreApp.devicePassphraseField), this.encrypt(passphrase, this.name));
         // Previous passphrase
         if (data.previousPassphrase) {
             const prev = this.decrypt(data.previousPassphrase, timestamp.toString());
@@ -440,7 +449,7 @@ export class CoreApp {
      */
     clearCacheData() {
         this.clearCacheToken();
-        this.storage.setData(CoreApp.devicePassphraseField, undefined);
+        this.storage.setData(this.addIdentifier(CoreApp.devicePassphraseField), undefined);
     }
     /**
      * Clear cached token

package/package.json

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

package/src/app/CoreApp.ts

@@ -633,7 +633,7 @@ export abstract class CoreApp<
     protected get persistedFields() {
         return [
             CoreApp.deviceIdField,
-            CoreApp.devicePassphraseField,
+            this.addIdentifier(CoreApp.devicePassphraseField),
             CoreApp.serversideDeviceIdField,
             CoreApp.headerTokenField
         ];
@@ -684,7 +684,7 @@ export abstract class CoreApp<
     private resetKeys() {
         this.storage.clear(
             [
-                CoreApp.devicePassphraseField,
+                this.addIdentifier(CoreApp.devicePassphraseField),
                 CoreApp.headerTokenField,
                 CoreApp.serversideDeviceIdField
             ],
@@ -723,8 +723,9 @@ export abstract class CoreApp<
             return false;
         }
 
+        // this.name to identifier different app's secret
         const passphraseEncrypted = this.storage.getData<string>(
-            CoreApp.devicePassphraseField
+            this.addIdentifier(CoreApp.devicePassphraseField)
         );
         if (passphraseEncrypted) {
             const passphraseDecrypted = this.decrypt(
@@ -769,6 +770,15 @@ export abstract class CoreApp<
         this.storage.copyTo(this.persistedFields);
     }
 
+    /**
+     * Add app name as identifier
+     * @param field Field
+     * @returns Result
+     */
+    protected addIdentifier(field: string) {
+        return field + '-' + this.name;
+    }
+
     /**
      * Setup Api
      * @param api Api
@@ -913,7 +923,7 @@ export abstract class CoreApp<
         // Current passphrase
         this.passphrase = passphrase;
         this.storage.setData(
-            CoreApp.devicePassphraseField,
+            this.addIdentifier(CoreApp.devicePassphraseField),
             this.encrypt(passphrase, this.name)
         );
 
@@ -1075,7 +1085,10 @@ export abstract class CoreApp<
      */
     clearCacheData() {
         this.clearCacheToken();
-        this.storage.setData(CoreApp.devicePassphraseField, undefined);
+        this.storage.setData(
+            this.addIdentifier(CoreApp.devicePassphraseField),
+            undefined
+        );
     }
 
     /**