@etsoo/appscript 1.5.21 → 1.5.23

package/__tests__/app/CoreApp.ts

@@ -135,6 +135,8 @@ class CoreAppTest extends CoreApp<
             new WindowStorage(),
             'SmartERP'
         );
+
+        this.deviceId = 'abcd1234';
     }
 
     freshCountdownUI(callback?: () => PromiseLike<unknown>): void {

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

@@ -90,6 +90,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Device id, randome string from ServiceBase.InitCallAsync
      */
     get deviceId(): string;
+    protected set deviceId(value: string);
     /**
      * Label delegate
      */
@@ -123,6 +124,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     get isReady(): boolean;
     private set isReady(value);
+    /**
+     * Current cached URL
+     */
+    get cachedUrl(): string | undefined | null;
+    set cachedUrl(value: string | undefined | null);
     private _isTryingLogin;
     /**
      * Last called with token refresh
@@ -246,6 +252,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Result
      */
     initCall(callback?: (result: boolean) => void, resetKeys?: boolean): Promise<void>;
+    /**
+     * Update passphrase
+     * @param passphrase Secret passphrase
+     */
+    protected updatePassphrase(passphrase: string): void;
     /**
      * Init call update
      * @param data Result data

package/lib/cjs/app/CoreApp.js

@@ -39,8 +39,14 @@ class CoreApp {
      * Device id, randome string from ServiceBase.InitCallAsync
      */
     get deviceId() {
+        if (this._deviceId === '') {
+            throw new Error('Device id is empty');
+        }
         return this._deviceId;
     }
+    set deviceId(value) {
+        this._deviceId = value;
+    }
     /**
      * Label delegate
      */
@@ -83,6 +89,15 @@ class CoreApp {
     set isReady(value) {
         this._isReady = value;
     }
+    /**
+     * Current cached URL
+     */
+    get cachedUrl() {
+        return this.storage.getData(this.fields.cachedUrl);
+    }
+    set cachedUrl(value) {
+        this.storage.setData(this.fields.cachedUrl, value);
+    }
     /**
      * Get persisted fields
      */
@@ -520,33 +535,16 @@ class CoreApp {
             callback(updateResult);
     }
     /**
-     * Init call update
-     * @param data Result data
-     * @param timestamp Timestamp
+     * Update passphrase
+     * @param passphrase Secret passphrase
      */
-    async initCallUpdate(data, timestamp) {
-        // Data check
-        if (data.deviceId == null || data.passphrase == null)
-            return false;
-        // Decrypt
-        // Should be done within 120 seconds after returning from the backend
-        const passphrase = this.decrypt(data.passphrase, timestamp.toString());
-        if (passphrase == null)
-            return false;
-        // Update device id and cache it
-        this._deviceId = data.deviceId;
-        this.storage.setData(this.fields.deviceId, this._deviceId);
-        // Devices
-        const devices = this.storage.getPersistedData(this.fields.devices, []);
-        devices.push(this.getDeviceId());
-        this.storage.setPersistedData(this.fields.devices, devices);
-        // Current passphrase
+    updatePassphrase(passphrase) {
+        // Previous passphrase
+        const prev = this.passphrase;
+        // Update
         this.passphrase = passphrase;
         this.storage.setData(this.fields.devicePassphrase, this.encrypt(passphrase, this.name));
-        // Previous passphrase
-        if (data.previousPassphrase) {
-            const prev = this.decrypt(data.previousPassphrase, timestamp.toString());
-            // Update
+        if (prev) {
             const fields = this.initCallEncryptedUpdateFields();
             for (const field of fields) {
                 const currentValue = this.storage.getData(field);
@@ -576,6 +574,35 @@ class CoreApp {
                 this.storage.setData(field, newValue);
             }
         }
+    }
+    /**
+     * Init call update
+     * @param data Result data
+     * @param timestamp Timestamp
+     */
+    async initCallUpdate(data, timestamp) {
+        // Data check
+        if (data.deviceId == null || data.passphrase == null)
+            return false;
+        // Decrypt
+        // Should be done within 120 seconds after returning from the backend
+        const passphrase = this.decrypt(data.passphrase, timestamp.toString());
+        if (passphrase == null)
+            return false;
+        // Update device id and cache it
+        this._deviceId = data.deviceId;
+        this.storage.setData(this.fields.deviceId, this._deviceId);
+        // Devices
+        const devices = this.storage.getPersistedData(this.fields.devices, []);
+        devices.push(this.getDeviceId());
+        this.storage.setPersistedData(this.fields.devices, devices);
+        // Previous passphrase
+        if (data.previousPassphrase) {
+            const prev = this.decrypt(data.previousPassphrase, timestamp.toString());
+            this.passphrase = prev ?? '';
+        }
+        // Update passphrase
+        this.updatePassphrase(passphrase);
         return true;
     }
     /**
@@ -1525,8 +1552,9 @@ class CoreApp {
      * @param removeUrl Remove current URL for reuse
      */
     toLoginPage(tryLogin, removeUrl) {
-        const url = `/?tryLogin=${tryLogin ?? false}` +
-            (removeUrl ? '' : '&url=' + encodeURIComponent(location.href));
+        // Save the current URL
+        this.cachedUrl = removeUrl ? undefined : globalThis.location.href;
+        const url = `/?tryLogin=${tryLogin ?? false}`;
         this.navigate(url);
     }
     /**

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

@@ -55,7 +55,7 @@ export interface RefreshTokenProps {
 /**
  * App fields
  */
-export declare const appFields: readonly ["headerToken", "serversideDeviceId", "deviceId", "devices", "devicePassphrase"];
+export declare const appFields: readonly ["headerToken", "serversideDeviceId", "deviceId", "devices", "devicePassphrase", "cachedUrl"];
 /**
  * Basic type template
  */
@@ -130,6 +130,10 @@ export interface IApp {
      * Is debug mode
      */
     readonly debug: boolean;
+    /**
+     * Cached URL
+     */
+    cachedUrl: string | undefined | null;
     /**
      * IP data
      */

package/lib/cjs/app/IApp.js

@@ -9,5 +9,6 @@ exports.appFields = [
     'serversideDeviceId',
     'deviceId',
     'devices',
-    'devicePassphrase'
+    'devicePassphrase',
+    'cachedUrl'
 ];

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

@@ -90,6 +90,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Device id, randome string from ServiceBase.InitCallAsync
      */
     get deviceId(): string;
+    protected set deviceId(value: string);
     /**
      * Label delegate
      */
@@ -123,6 +124,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     get isReady(): boolean;
     private set isReady(value);
+    /**
+     * Current cached URL
+     */
+    get cachedUrl(): string | undefined | null;
+    set cachedUrl(value: string | undefined | null);
     private _isTryingLogin;
     /**
      * Last called with token refresh
@@ -246,6 +252,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * @returns Result
      */
     initCall(callback?: (result: boolean) => void, resetKeys?: boolean): Promise<void>;
+    /**
+     * Update passphrase
+     * @param passphrase Secret passphrase
+     */
+    protected updatePassphrase(passphrase: string): void;
     /**
      * Init call update
      * @param data Result data

package/lib/mjs/app/CoreApp.js

@@ -36,8 +36,14 @@ export class CoreApp {
      * Device id, randome string from ServiceBase.InitCallAsync
      */
     get deviceId() {
+        if (this._deviceId === '') {
+            throw new Error('Device id is empty');
+        }
         return this._deviceId;
     }
+    set deviceId(value) {
+        this._deviceId = value;
+    }
     /**
      * Label delegate
      */
@@ -80,6 +86,15 @@ export class CoreApp {
     set isReady(value) {
         this._isReady = value;
     }
+    /**
+     * Current cached URL
+     */
+    get cachedUrl() {
+        return this.storage.getData(this.fields.cachedUrl);
+    }
+    set cachedUrl(value) {
+        this.storage.setData(this.fields.cachedUrl, value);
+    }
     /**
      * Get persisted fields
      */
@@ -517,33 +532,16 @@ export class CoreApp {
             callback(updateResult);
     }
     /**
-     * Init call update
-     * @param data Result data
-     * @param timestamp Timestamp
+     * Update passphrase
+     * @param passphrase Secret passphrase
      */
-    async initCallUpdate(data, timestamp) {
-        // Data check
-        if (data.deviceId == null || data.passphrase == null)
-            return false;
-        // Decrypt
-        // Should be done within 120 seconds after returning from the backend
-        const passphrase = this.decrypt(data.passphrase, timestamp.toString());
-        if (passphrase == null)
-            return false;
-        // Update device id and cache it
-        this._deviceId = data.deviceId;
-        this.storage.setData(this.fields.deviceId, this._deviceId);
-        // Devices
-        const devices = this.storage.getPersistedData(this.fields.devices, []);
-        devices.push(this.getDeviceId());
-        this.storage.setPersistedData(this.fields.devices, devices);
-        // Current passphrase
+    updatePassphrase(passphrase) {
+        // Previous passphrase
+        const prev = this.passphrase;
+        // Update
         this.passphrase = passphrase;
         this.storage.setData(this.fields.devicePassphrase, this.encrypt(passphrase, this.name));
-        // Previous passphrase
-        if (data.previousPassphrase) {
-            const prev = this.decrypt(data.previousPassphrase, timestamp.toString());
-            // Update
+        if (prev) {
             const fields = this.initCallEncryptedUpdateFields();
             for (const field of fields) {
                 const currentValue = this.storage.getData(field);
@@ -573,6 +571,35 @@ export class CoreApp {
                 this.storage.setData(field, newValue);
             }
         }
+    }
+    /**
+     * Init call update
+     * @param data Result data
+     * @param timestamp Timestamp
+     */
+    async initCallUpdate(data, timestamp) {
+        // Data check
+        if (data.deviceId == null || data.passphrase == null)
+            return false;
+        // Decrypt
+        // Should be done within 120 seconds after returning from the backend
+        const passphrase = this.decrypt(data.passphrase, timestamp.toString());
+        if (passphrase == null)
+            return false;
+        // Update device id and cache it
+        this._deviceId = data.deviceId;
+        this.storage.setData(this.fields.deviceId, this._deviceId);
+        // Devices
+        const devices = this.storage.getPersistedData(this.fields.devices, []);
+        devices.push(this.getDeviceId());
+        this.storage.setPersistedData(this.fields.devices, devices);
+        // Previous passphrase
+        if (data.previousPassphrase) {
+            const prev = this.decrypt(data.previousPassphrase, timestamp.toString());
+            this.passphrase = prev ?? '';
+        }
+        // Update passphrase
+        this.updatePassphrase(passphrase);
         return true;
     }
     /**
@@ -1522,8 +1549,9 @@ export class CoreApp {
      * @param removeUrl Remove current URL for reuse
      */
     toLoginPage(tryLogin, removeUrl) {
-        const url = `/?tryLogin=${tryLogin ?? false}` +
-            (removeUrl ? '' : '&url=' + encodeURIComponent(location.href));
+        // Save the current URL
+        this.cachedUrl = removeUrl ? undefined : globalThis.location.href;
+        const url = `/?tryLogin=${tryLogin ?? false}`;
         this.navigate(url);
     }
     /**

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

@@ -55,7 +55,7 @@ export interface RefreshTokenProps {
 /**
  * App fields
  */
-export declare const appFields: readonly ["headerToken", "serversideDeviceId", "deviceId", "devices", "devicePassphrase"];
+export declare const appFields: readonly ["headerToken", "serversideDeviceId", "deviceId", "devices", "devicePassphrase", "cachedUrl"];
 /**
  * Basic type template
  */
@@ -130,6 +130,10 @@ export interface IApp {
      * Is debug mode
      */
     readonly debug: boolean;
+    /**
+     * Cached URL
+     */
+    cachedUrl: string | undefined | null;
     /**
      * IP data
      */

package/lib/mjs/app/IApp.js

@@ -6,5 +6,6 @@ export const appFields = [
     'serversideDeviceId',
     'deviceId',
     'devices',
-    'devicePassphrase'
+    'devicePassphrase',
+    'cachedUrl'
 ];

package/package.json

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

package/src/app/CoreApp.ts

@@ -170,8 +170,14 @@ export abstract class CoreApp<
      * Device id, randome string from ServiceBase.InitCallAsync
      */
     get deviceId() {
+        if (this._deviceId === '') {
+            throw new Error('Device id is empty');
+        }
         return this._deviceId;
     }
+    protected set deviceId(value: string) {
+        this._deviceId = value;
+    }
 
     /**
      * Label delegate
@@ -234,6 +240,16 @@ export abstract class CoreApp<
         this._isReady = value;
     }
 
+    /**
+     * Current cached URL
+     */
+    get cachedUrl() {
+        return this.storage.getData(this.fields.cachedUrl);
+    }
+    set cachedUrl(value: string | undefined | null) {
+        this.storage.setData(this.fields.cachedUrl, value);
+    }
+
     private _isTryingLogin = false;
 
     /**
@@ -827,49 +843,21 @@ export abstract class CoreApp<
     }
 
     /**
-     * Init call update
-     * @param data Result data
-     * @param timestamp Timestamp
+     * Update passphrase
+     * @param passphrase Secret passphrase
      */
-    protected async initCallUpdate(
-        data: InitCallResultData,
-        timestamp: number
-    ): Promise<boolean> {
-        // Data check
-        if (data.deviceId == null || data.passphrase == null) return false;
-
-        // Decrypt
-        // Should be done within 120 seconds after returning from the backend
-        const passphrase = this.decrypt(data.passphrase, timestamp.toString());
-        if (passphrase == null) return false;
-
-        // Update device id and cache it
-        this._deviceId = data.deviceId;
-        this.storage.setData(this.fields.deviceId, this._deviceId);
-
-        // Devices
-        const devices = this.storage.getPersistedData<string[]>(
-            this.fields.devices,
-            []
-        );
-        devices.push(this.getDeviceId());
-        this.storage.setPersistedData(this.fields.devices, devices);
+    protected updatePassphrase(passphrase: string) {
+        // Previous passphrase
+        const prev = this.passphrase;
 
-        // Current passphrase
+        // Update
         this.passphrase = passphrase;
         this.storage.setData(
             this.fields.devicePassphrase,
             this.encrypt(passphrase, this.name)
         );
 
-        // Previous passphrase
-        if (data.previousPassphrase) {
-            const prev = this.decrypt(
-                data.previousPassphrase,
-                timestamp.toString()
-            );
-
-            // Update
+        if (prev) {
             const fields = this.initCallEncryptedUpdateFields();
             for (const field of fields) {
                 const currentValue = this.storage.getData<string>(field);
@@ -907,6 +895,48 @@ export abstract class CoreApp<
                 this.storage.setData(field, newValue);
             }
         }
+    }
+
+    /**
+     * Init call update
+     * @param data Result data
+     * @param timestamp Timestamp
+     */
+    protected async initCallUpdate(
+        data: InitCallResultData,
+        timestamp: number
+    ): Promise<boolean> {
+        // Data check
+        if (data.deviceId == null || data.passphrase == null) return false;
+
+        // Decrypt
+        // Should be done within 120 seconds after returning from the backend
+        const passphrase = this.decrypt(data.passphrase, timestamp.toString());
+        if (passphrase == null) return false;
+
+        // Update device id and cache it
+        this._deviceId = data.deviceId;
+        this.storage.setData(this.fields.deviceId, this._deviceId);
+
+        // Devices
+        const devices = this.storage.getPersistedData<string[]>(
+            this.fields.devices,
+            []
+        );
+        devices.push(this.getDeviceId());
+        this.storage.setPersistedData(this.fields.devices, devices);
+
+        // Previous passphrase
+        if (data.previousPassphrase) {
+            const prev = this.decrypt(
+                data.previousPassphrase,
+                timestamp.toString()
+            );
+            this.passphrase = prev ?? '';
+        }
+
+        // Update passphrase
+        this.updatePassphrase(passphrase);
 
         return true;
     }
@@ -2102,9 +2132,10 @@ export abstract class CoreApp<
      * @param removeUrl Remove current URL for reuse
      */
     toLoginPage(tryLogin?: boolean, removeUrl?: boolean) {
-        const url =
-            `/?tryLogin=${tryLogin ?? false}` +
-            (removeUrl ? '' : '&url=' + encodeURIComponent(location.href));
+        // Save the current URL
+        this.cachedUrl = removeUrl ? undefined : globalThis.location.href;
+
+        const url = `/?tryLogin=${tryLogin ?? false}`;
 
         this.navigate(url);
     }

package/src/app/IApp.ts

@@ -89,7 +89,8 @@ export const appFields = [
     'serversideDeviceId',
     'deviceId',
     'devices',
-    'devicePassphrase'
+    'devicePassphrase',
+    'cachedUrl'
 ] as const;
 
 /**
@@ -181,6 +182,11 @@ export interface IApp {
      */
     readonly debug: boolean;
 
+    /**
+     * Cached URL
+     */
+    cachedUrl: string | undefined | null;
+
     /**
      * IP data
      */