@etsoo/appscript 1.1.71 → 1.1.75

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

@@ -68,6 +68,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Currency, like USD for US dollar
      */
     readonly currency: string;
+    /**
+     * Device id
+     */
+    readonly deviceId: string;
     /**
      * Country or region, like CN
      */
@@ -349,6 +353,12 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Country or region, like CN
      */
     get region(): string;
+    private _deviceId;
+    /**
+     * Country or region, like CN
+     */
+    get deviceId(): string;
+    protected set deviceId(value: string);
     /**
      * Label delegate
      */
@@ -389,10 +399,6 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Device id field name
      */
     protected deviceIdField: string;
-    /**
-     * Device id
-     */
-    protected deviceId: string;
     /**
      * Passphrase for encryption
      */

package/lib/cjs/app/CoreApp.js

@@ -20,6 +20,7 @@ class CoreApp {
      * @param name Application name
      */
     constructor(settings, api, notifier, name) {
+        this._deviceId = '***';
         /**
          * Response token header field name
          */
@@ -72,6 +73,15 @@ class CoreApp {
     get region() {
         return this._region;
     }
+    /**
+     * Country or region, like CN
+     */
+    get deviceId() {
+        return this._deviceId;
+    }
+    set deviceId(value) {
+        this._deviceId = value;
+    }
     /**
      * Label delegate
      */
@@ -154,6 +164,8 @@ class CoreApp {
             }
             if (callback)
                 callback(false);
+            // Clear device id
+            shared_1.StorageUtils.setLocalData(this.deviceIdField, null);
             return;
         }
         this.initCallUpdate(result.data, data.timestamp);
@@ -309,11 +321,14 @@ class CoreApp {
             hasher: crypto_js_1.algo.SHA256,
             iterations: 1000 * iterations
         });
-        return crypto_js_1.AES.decrypt(encrypted, key, {
+        const bytes = crypto_js_1.AES.decrypt(encrypted, key, {
             iv,
             padding: crypto_js_1.pad.Pkcs7,
             mode: crypto_js_1.mode.CBC
-        }).toString(crypto_js_1.enc.Utf8);
+        });
+        if (bytes.words.length == 0)
+            return undefined;
+        return bytes.toString(crypto_js_1.enc.Utf8);
     }
     /**
      * Enhanced decrypt message
@@ -324,8 +339,9 @@ class CoreApp {
      */
     decryptEnhanced(messageEncrypted, passphrase, durationSeconds) {
         // Timestamp splitter
-        const pos = messageEncrypted.indexOf('+');
-        if (pos === -1 || messageEncrypted.length <= 66)
+        const pos = messageEncrypted.indexOf('!');
+        // Miliseconds chars are longer than 8
+        if (pos < 8 || messageEncrypted.length <= 66)
             return undefined;
         const timestamp = messageEncrypted.substring(0, pos);
         if (durationSeconds != null && durationSeconds > 0) {
@@ -415,7 +431,7 @@ class CoreApp {
         // Timestamp
         const timestamp = shared_1.Utils.numberToChars(new Date().getTime());
         passphrase = this.encryptionEnhance(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, timestamp);
-        return timestamp + '+' + this.encrypt(message, passphrase, iterations);
+        return timestamp + '!' + this.encrypt(message, passphrase, iterations);
     }
     /**
      * Enchance secret passphrase

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

@@ -68,6 +68,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Currency, like USD for US dollar
      */
     readonly currency: string;
+    /**
+     * Device id
+     */
+    readonly deviceId: string;
     /**
      * Country or region, like CN
      */
@@ -349,6 +353,12 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Country or region, like CN
      */
     get region(): string;
+    private _deviceId;
+    /**
+     * Country or region, like CN
+     */
+    get deviceId(): string;
+    protected set deviceId(value: string);
     /**
      * Label delegate
      */
@@ -389,10 +399,6 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Device id field name
      */
     protected deviceIdField: string;
-    /**
-     * Device id
-     */
-    protected deviceId: string;
     /**
      * Passphrase for encryption
      */

package/lib/mjs/app/CoreApp.js

@@ -17,6 +17,7 @@ export class CoreApp {
      * @param name Application name
      */
     constructor(settings, api, notifier, name) {
+        this._deviceId = '***';
         /**
          * Response token header field name
          */
@@ -69,6 +70,15 @@ export class CoreApp {
     get region() {
         return this._region;
     }
+    /**
+     * Country or region, like CN
+     */
+    get deviceId() {
+        return this._deviceId;
+    }
+    set deviceId(value) {
+        this._deviceId = value;
+    }
     /**
      * Label delegate
      */
@@ -151,6 +161,8 @@ export class CoreApp {
             }
             if (callback)
                 callback(false);
+            // Clear device id
+            StorageUtils.setLocalData(this.deviceIdField, null);
             return;
         }
         this.initCallUpdate(result.data, data.timestamp);
@@ -306,11 +318,14 @@ export class CoreApp {
             hasher: algo.SHA256,
             iterations: 1000 * iterations
         });
-        return AES.decrypt(encrypted, key, {
+        const bytes = AES.decrypt(encrypted, key, {
             iv,
             padding: pad.Pkcs7,
             mode: mode.CBC
-        }).toString(enc.Utf8);
+        });
+        if (bytes.words.length == 0)
+            return undefined;
+        return bytes.toString(enc.Utf8);
     }
     /**
      * Enhanced decrypt message
@@ -321,8 +336,9 @@ export class CoreApp {
      */
     decryptEnhanced(messageEncrypted, passphrase, durationSeconds) {
         // Timestamp splitter
-        const pos = messageEncrypted.indexOf('+');
-        if (pos === -1 || messageEncrypted.length <= 66)
+        const pos = messageEncrypted.indexOf('!');
+        // Miliseconds chars are longer than 8
+        if (pos < 8 || messageEncrypted.length <= 66)
             return undefined;
         const timestamp = messageEncrypted.substring(0, pos);
         if (durationSeconds != null && durationSeconds > 0) {
@@ -412,7 +428,7 @@ export class CoreApp {
         // Timestamp
         const timestamp = Utils.numberToChars(new Date().getTime());
         passphrase = this.encryptionEnhance(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, timestamp);
-        return timestamp + '+' + this.encrypt(message, passphrase, iterations);
+        return timestamp + '!' + this.encrypt(message, passphrase, iterations);
     }
     /**
      * Enchance secret passphrase

package/package.json

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

package/src/app/CoreApp.ts

@@ -117,6 +117,11 @@ export interface ICoreApp<
      */
     readonly currency: string;
 
+    /**
+     * Device id
+     */
+    readonly deviceId: string;
+
     /**
      * Country or region, like CN
      */
@@ -478,6 +483,17 @@ export abstract class CoreApp<
         return this._region;
     }
 
+    private _deviceId: string = '***';
+    /**
+     * Country or region, like CN
+     */
+    get deviceId() {
+        return this._deviceId;
+    }
+    protected set deviceId(value: string) {
+        this._deviceId = value;
+    }
+
     /**
      * Label delegate
      */
@@ -537,11 +553,6 @@ export abstract class CoreApp<
      */
     protected deviceIdField: string = 'SmartERPDeviceId';
 
-    /**
-     * Device id
-     */
-    protected deviceId: string;
-
     /**
      * Passphrase for encryption
      */
@@ -658,6 +669,9 @@ export abstract class CoreApp<
 
             if (callback) callback(false);
 
+            // Clear device id
+            StorageUtils.setLocalData(this.deviceIdField, null);
+
             return;
         }
 
@@ -856,11 +870,14 @@ export abstract class CoreApp<
             iterations: 1000 * iterations
         });
 
-        return AES.decrypt(encrypted, key, {
+        const bytes = AES.decrypt(encrypted, key, {
             iv,
             padding: pad.Pkcs7,
             mode: mode.CBC
-        }).toString(enc.Utf8);
+        });
+        if (bytes.words.length == 0) return undefined;
+
+        return bytes.toString(enc.Utf8);
     }
 
     /**
@@ -876,8 +893,10 @@ export abstract class CoreApp<
         durationSeconds?: number
     ) {
         // Timestamp splitter
-        const pos = messageEncrypted.indexOf('+');
-        if (pos === -1 || messageEncrypted.length <= 66) return undefined;
+        const pos = messageEncrypted.indexOf('!');
+
+        // Miliseconds chars are longer than 8
+        if (pos < 8 || messageEncrypted.length <= 66) return undefined;
 
         const timestamp = messageEncrypted.substring(0, pos);
 
@@ -991,7 +1010,7 @@ export abstract class CoreApp<
             timestamp
         );
 
-        return timestamp + '+' + this.encrypt(message, passphrase, iterations);
+        return timestamp + '!' + this.encrypt(message, passphrase, iterations);
     }
 
     /**