npm - @etsoo/appscript - Versions diffs - 1.2.4 → 1.2.6 - Mend

@etsoo/appscript 1.2.4 → 1.2.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

package/lib/cjs/app/CoreApp.js CHANGED Viewed

@@ -118,12 +118,13 @@ class CoreApp {
     get persistedFields() {
         return [
             CoreApp.deviceIdField,
+            CoreApp.devicePassphraseField,
             CoreApp.serversideDeviceIdField,
             CoreApp.headerTokenField
         ];
     }
     getDeviceId() {
-        return this.deviceId.substring(0, 10);
+        return this.deviceId.substring(0, 15);
     }
     /**
      * Restore settings from persisted source
@@ -132,14 +133,17 @@ class CoreApp {
         // Current device id, '' means new, or reload (not included) or duplicate (included)
         if (this.deviceId) {
             // Devices
-            const devices = this.storage.getPersistedData(CoreApp.devicesField);
+            const devices = this.storage.getPersistedData(CoreApp.devicesField, []);
             // Exists in the list?
-            if (!(devices === null || devices === void 0 ? void 0 : devices.includes(this.getDeviceId()))) {
+            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;
                     }
                 }

package/lib/mjs/app/CoreApp.js CHANGED Viewed

@@ -115,12 +115,13 @@ export class CoreApp {
     get persistedFields() {
         return [
             CoreApp.deviceIdField,
+            CoreApp.devicePassphraseField,
             CoreApp.serversideDeviceIdField,
             CoreApp.headerTokenField
         ];
     }
     getDeviceId() {
-        return this.deviceId.substring(0, 10);
+        return this.deviceId.substring(0, 15);
     }
     /**
      * Restore settings from persisted source
@@ -129,14 +130,17 @@ export class CoreApp {
         // Current device id, '' means new, or reload (not included) or duplicate (included)
         if (this.deviceId) {
             // Devices
-            const devices = this.storage.getPersistedData(CoreApp.devicesField);
+            const devices = this.storage.getPersistedData(CoreApp.devicesField, []);
             // Exists in the list?
-            if (!(devices === null || devices === void 0 ? void 0 : devices.includes(this.getDeviceId()))) {
+            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;
                     }
                 }

package/package.json CHANGED Viewed

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

package/src/app/CoreApp.ts CHANGED Viewed

@@ -606,6 +606,7 @@ export abstract class CoreApp<
     protected get persistedFields() {
         return [
             CoreApp.deviceIdField,
+            CoreApp.devicePassphraseField,
             CoreApp.serversideDeviceIdField,
             CoreApp.headerTokenField
         ];
@@ -650,7 +651,7 @@ export abstract class CoreApp<
     }
     private getDeviceId() {
-        return this.deviceId.substring(0, 10);
+        return this.deviceId.substring(0, 15);
     }
     /**
@@ -661,11 +662,13 @@ export abstract class CoreApp<
         if (this.deviceId) {
             // Devices
             const devices = this.storage.getPersistedData<string[]>(
-                CoreApp.devicesField
+                CoreApp.devicesField,
+                []
             );
             // Exists in the list?
-            if (!devices?.includes(this.getDeviceId())) {
+            const d = this.getDeviceId();
+            if (!devices.includes(d)) {
                 const passphraseEncrypted = this.storage.getData<string>(
                     CoreApp.devicePassphraseField
                 );
@@ -676,6 +679,13 @@ export abstract class CoreApp<
                     );
                     if (passphraseDecrypted != null) {
                         this.passphrase = passphraseDecrypted;
+                        devices.push(d);
+                        this.storage.setPersistedData(
+                            CoreApp.devicesField,
+                            devices
+                        );
                         return false;
                     }
                 }