@etsoo/appscript 1.5.51 → 1.5.53

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

@@ -129,6 +129,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     get cachedUrl(): string | undefined | null;
     set cachedUrl(value: string | undefined | null);
+    /**
+     * Keep login or not
+     */
+    get keepLogin(): boolean;
+    set keepLogin(value: boolean);
     private _embedded;
     /**
      * Is embedded
@@ -154,6 +159,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     protected passphrase: string;
     private apis;
     private tasks;
+    private clearInterval?;
     /**
      * Get persisted fields
      */
@@ -186,6 +192,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Restore settings from persisted source
      */
     protected restore(): Promise<boolean>;
+    /**
+     * Dispose the application
+     */
+    dispose(): void;
     /**
      * Is valid password, override to implement custom check
      * @param password Input password
@@ -193,9 +203,8 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     isValidPassword(password: string): boolean;
     /**
      * Persist settings to source when application exit
-     * @param keepLogin Keep login or not
      */
-    persist(keepLogin?: boolean): void;
+    persist(): void;
     /**
      * Add scheduled task
      * @param task Task, return false to stop

package/lib/cjs/app/CoreApp.js

@@ -96,6 +96,25 @@ class CoreApp {
     set cachedUrl(value) {
         this.storage.setData(this.fields.cachedUrl, value);
     }
+    /**
+     * Keep login or not
+     */
+    get keepLogin() {
+        return this.storage.getData(this.fields.keepLogin) ?? false;
+    }
+    set keepLogin(value) {
+        const field = this.fields.headerToken;
+        if (!value) {
+            // Clear the token
+            this.clearCacheToken();
+            // Remove the token field
+            this.persistedFields.remove(field);
+        }
+        else if (!this.persistedFields.includes(field)) {
+            this.persistedFields.push(field);
+        }
+        this.storage.setData(this.fields.keepLogin, value);
+    }
     /**
      * Is embedded
      */
@@ -119,7 +138,7 @@ class CoreApp {
             this.fields.deviceId,
             this.fields.devicePassphrase,
             this.fields.serversideDeviceId,
-            this.fields.headerToken
+            this.fields.keepLogin
         ];
     }
     /**
@@ -287,6 +306,20 @@ class CoreApp {
         }
         return false;
     }
+    /**
+     * Dispose the application
+     */
+    dispose() {
+        // Avoid duplicated call
+        if (!this._isReady)
+            return;
+        // Persist storage defined fields
+        this.persist();
+        // Clear the interval
+        this.clearInterval?.();
+        // Reset the status to false
+        this.isReady = false;
+    }
     /**
      * Is valid password, override to implement custom check
      * @param password Input password
@@ -303,29 +336,18 @@ class CoreApp {
     }
     /**
      * Persist settings to source when application exit
-     * @param keepLogin Keep login or not
      */
-    persist(keepLogin) {
-        if (!keepLogin) {
-            // Unconditional clear the cache for security
-            this.clearCacheToken();
-        }
+    persist() {
         // Devices
         const devices = this.storage.getPersistedData(this.fields.devices);
         if (devices != null) {
-            const index = devices.indexOf(this.getDeviceId());
-            if (index !== -1) {
-                // Remove current device from the list
-                devices.splice(index, 1);
+            if (devices.remove(this.getDeviceId()).length > 0) {
                 this.storage.setPersistedData(this.fields.devices, devices);
             }
         }
         if (!this.authorized)
             return;
-        const fields = keepLogin
-            ? this.persistedFields
-            : this.persistedFields.filter((f) => f !== this.fields.headerToken);
-        this.storage.copyTo(fields);
+        this.storage.copyTo(this.persistedFields);
     }
     /**
      * Add scheduled task
@@ -683,6 +705,8 @@ class CoreApp {
         this.onAuthorized(authorized);
         // Everything is ready, update the state
         this.authorized = authorized;
+        // Persist
+        this.persist();
     }
     /**
      * On authorized or not callback
@@ -1532,7 +1556,7 @@ class CoreApp {
      * Setup tasks
      */
     setupTasks() {
-        shared_1.ExtendUtils.intervalFor(() => {
+        this.clearInterval = shared_1.ExtendUtils.intervalFor(() => {
             // Exit when not authorized
             if (!this.authorized)
                 return;
@@ -1590,6 +1614,8 @@ class CoreApp {
      * @param apiUrl Signout API URL
      */
     async signout() {
+        // Clear the keep login status
+        this.keepLogin = false;
         const token = this.getCacheToken();
         if (token) {
             const result = await new AuthApi_1.AuthApi(this).signout({

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

@@ -94,7 +94,7 @@ export interface RefreshTokenProps {
 /**
  * App fields
  */
-export declare const appFields: readonly ["headerToken", "serversideDeviceId", "deviceId", "devices", "devicePassphrase", "cachedUrl", "embedded"];
+export declare const appFields: readonly ["headerToken", "serversideDeviceId", "deviceId", "devices", "devicePassphrase", "cachedUrl", "embedded", "keepLogin"];
 /**
  * Basic type template
  */
@@ -181,6 +181,10 @@ export interface IApp {
      * Cached URL
      */
     cachedUrl: string | undefined | null;
+    /**
+     * Keep login or not
+     */
+    keepLogin: boolean;
     /**
      * IP data
      */
@@ -294,6 +298,10 @@ export interface IApp {
      * @param callback Callback will be called when the IP is ready
      */
     detectIP(callback?: IDetectIPCallback): void;
+    /**
+     * Dispose the application
+     */
+    dispose(): void;
     /**
      * Download file
      * @param stream File stream
@@ -561,9 +569,8 @@ export interface IApp {
     signout(): Promise<void>;
     /**
      * Persist settings to source when application exit
-     * @param keepLogin Keep login or not
      */
-    persist(keepLogin?: boolean): void;
+    persist(): void;
     /**
      * Go to the login page
      * @param params Login parameters

package/lib/cjs/app/IApp.js

@@ -11,5 +11,6 @@ exports.appFields = [
     'devices',
     'devicePassphrase',
     'cachedUrl',
-    'embedded'
+    'embedded',
+    'keepLogin'
 ];

package/lib/cjs/business/BusinessUtils.js

@@ -52,9 +52,7 @@ var BusinessUtils;
             }
         });
         // Remove the default culture
-        const index = allCultures.findIndex((a) => a.id === cultures[0].id);
-        if (index !== -1)
-            allCultures.splice(index, 1);
+        allCultures.remove((a) => a.id === cultures[0].id);
         // Sort
         allCultures.sortByProperty('id', cultures.map((c) => c.id));
         // Set back

package/lib/cjs/business/ShoppingCart.js

@@ -247,12 +247,7 @@ class ShoppingCart {
         }
         else {
             ShoppingCart.clear(this.identifier, this.storage);
-            const keys = this.keys;
-            const index = keys.indexOf(this.identifier);
-            if (index !== -1) {
-                keys.splice(index, 1);
-                this.keys = keys;
-            }
+            this.keys.remove(this.identifier);
         }
         this.doChange('clear', []);
     }

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

@@ -129,6 +129,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     get cachedUrl(): string | undefined | null;
     set cachedUrl(value: string | undefined | null);
+    /**
+     * Keep login or not
+     */
+    get keepLogin(): boolean;
+    set keepLogin(value: boolean);
     private _embedded;
     /**
      * Is embedded
@@ -154,6 +159,7 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     protected passphrase: string;
     private apis;
     private tasks;
+    private clearInterval?;
     /**
      * Get persisted fields
      */
@@ -186,6 +192,10 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      * Restore settings from persisted source
      */
     protected restore(): Promise<boolean>;
+    /**
+     * Dispose the application
+     */
+    dispose(): void;
     /**
      * Is valid password, override to implement custom check
      * @param password Input password
@@ -193,9 +203,8 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     isValidPassword(password: string): boolean;
     /**
      * Persist settings to source when application exit
-     * @param keepLogin Keep login or not
      */
-    persist(keepLogin?: boolean): void;
+    persist(): void;
     /**
      * Add scheduled task
      * @param task Task, return false to stop

package/lib/mjs/app/CoreApp.js

@@ -93,6 +93,25 @@ export class CoreApp {
     set cachedUrl(value) {
         this.storage.setData(this.fields.cachedUrl, value);
     }
+    /**
+     * Keep login or not
+     */
+    get keepLogin() {
+        return this.storage.getData(this.fields.keepLogin) ?? false;
+    }
+    set keepLogin(value) {
+        const field = this.fields.headerToken;
+        if (!value) {
+            // Clear the token
+            this.clearCacheToken();
+            // Remove the token field
+            this.persistedFields.remove(field);
+        }
+        else if (!this.persistedFields.includes(field)) {
+            this.persistedFields.push(field);
+        }
+        this.storage.setData(this.fields.keepLogin, value);
+    }
     /**
      * Is embedded
      */
@@ -116,7 +135,7 @@ export class CoreApp {
             this.fields.deviceId,
             this.fields.devicePassphrase,
             this.fields.serversideDeviceId,
-            this.fields.headerToken
+            this.fields.keepLogin
         ];
     }
     /**
@@ -284,6 +303,20 @@ export class CoreApp {
         }
         return false;
     }
+    /**
+     * Dispose the application
+     */
+    dispose() {
+        // Avoid duplicated call
+        if (!this._isReady)
+            return;
+        // Persist storage defined fields
+        this.persist();
+        // Clear the interval
+        this.clearInterval?.();
+        // Reset the status to false
+        this.isReady = false;
+    }
     /**
      * Is valid password, override to implement custom check
      * @param password Input password
@@ -300,29 +333,18 @@ export class CoreApp {
     }
     /**
      * Persist settings to source when application exit
-     * @param keepLogin Keep login or not
      */
-    persist(keepLogin) {
-        if (!keepLogin) {
-            // Unconditional clear the cache for security
-            this.clearCacheToken();
-        }
+    persist() {
         // Devices
         const devices = this.storage.getPersistedData(this.fields.devices);
         if (devices != null) {
-            const index = devices.indexOf(this.getDeviceId());
-            if (index !== -1) {
-                // Remove current device from the list
-                devices.splice(index, 1);
+            if (devices.remove(this.getDeviceId()).length > 0) {
                 this.storage.setPersistedData(this.fields.devices, devices);
             }
         }
         if (!this.authorized)
             return;
-        const fields = keepLogin
-            ? this.persistedFields
-            : this.persistedFields.filter((f) => f !== this.fields.headerToken);
-        this.storage.copyTo(fields);
+        this.storage.copyTo(this.persistedFields);
     }
     /**
      * Add scheduled task
@@ -680,6 +702,8 @@ export class CoreApp {
         this.onAuthorized(authorized);
         // Everything is ready, update the state
         this.authorized = authorized;
+        // Persist
+        this.persist();
     }
     /**
      * On authorized or not callback
@@ -1529,7 +1553,7 @@ export class CoreApp {
      * Setup tasks
      */
     setupTasks() {
-        ExtendUtils.intervalFor(() => {
+        this.clearInterval = ExtendUtils.intervalFor(() => {
             // Exit when not authorized
             if (!this.authorized)
                 return;
@@ -1587,6 +1611,8 @@ export class CoreApp {
      * @param apiUrl Signout API URL
      */
     async signout() {
+        // Clear the keep login status
+        this.keepLogin = false;
         const token = this.getCacheToken();
         if (token) {
             const result = await new AuthApi(this).signout({

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

@@ -94,7 +94,7 @@ export interface RefreshTokenProps {
 /**
  * App fields
  */
-export declare const appFields: readonly ["headerToken", "serversideDeviceId", "deviceId", "devices", "devicePassphrase", "cachedUrl", "embedded"];
+export declare const appFields: readonly ["headerToken", "serversideDeviceId", "deviceId", "devices", "devicePassphrase", "cachedUrl", "embedded", "keepLogin"];
 /**
  * Basic type template
  */
@@ -181,6 +181,10 @@ export interface IApp {
      * Cached URL
      */
     cachedUrl: string | undefined | null;
+    /**
+     * Keep login or not
+     */
+    keepLogin: boolean;
     /**
      * IP data
      */
@@ -294,6 +298,10 @@ export interface IApp {
      * @param callback Callback will be called when the IP is ready
      */
     detectIP(callback?: IDetectIPCallback): void;
+    /**
+     * Dispose the application
+     */
+    dispose(): void;
     /**
      * Download file
      * @param stream File stream
@@ -561,9 +569,8 @@ export interface IApp {
     signout(): Promise<void>;
     /**
      * Persist settings to source when application exit
-     * @param keepLogin Keep login or not
      */
-    persist(keepLogin?: boolean): void;
+    persist(): void;
     /**
      * Go to the login page
      * @param params Login parameters

package/lib/mjs/app/IApp.js

@@ -8,5 +8,6 @@ export const appFields = [
     'devices',
     'devicePassphrase',
     'cachedUrl',
-    'embedded'
+    'embedded',
+    'keepLogin'
 ];

package/lib/mjs/business/BusinessUtils.js

@@ -49,9 +49,7 @@ export var BusinessUtils;
             }
         });
         // Remove the default culture
-        const index = allCultures.findIndex((a) => a.id === cultures[0].id);
-        if (index !== -1)
-            allCultures.splice(index, 1);
+        allCultures.remove((a) => a.id === cultures[0].id);
         // Sort
         allCultures.sortByProperty('id', cultures.map((c) => c.id));
         // Set back

package/lib/mjs/business/ShoppingCart.js

@@ -244,12 +244,7 @@ export class ShoppingCart {
         }
         else {
             ShoppingCart.clear(this.identifier, this.storage);
-            const keys = this.keys;
-            const index = keys.indexOf(this.identifier);
-            if (index !== -1) {
-                keys.splice(index, 1);
-                this.keys = keys;
-            }
+            this.keys.remove(this.identifier);
         }
         this.doChange('clear', []);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.5.51",
+    "version": "1.5.53",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -52,9 +52,9 @@
     },
     "homepage": "https://github.com/ETSOO/AppScript#readme",
     "dependencies": {
-        "@etsoo/notificationbase": "^1.1.50",
-        "@etsoo/restclient": "^1.1.12",
-        "@etsoo/shared": "^1.2.49",
+        "@etsoo/notificationbase": "^1.1.52",
+        "@etsoo/restclient": "^1.1.14",
+        "@etsoo/shared": "^1.2.51",
         "crypto-js": "^4.2.0"
     },
     "devDependencies": {

package/src/app/CoreApp.ts

@@ -249,6 +249,26 @@ export abstract class CoreApp<
         this.storage.setData(this.fields.cachedUrl, value);
     }
 
+    /**
+     * Keep login or not
+     */
+    get keepLogin() {
+        return this.storage.getData<boolean>(this.fields.keepLogin) ?? false;
+    }
+    set keepLogin(value: boolean) {
+        const field = this.fields.headerToken;
+        if (!value) {
+            // Clear the token
+            this.clearCacheToken();
+
+            // Remove the token field
+            this.persistedFields.remove(field);
+        } else if (!this.persistedFields.includes(field)) {
+            this.persistedFields.push(field);
+        }
+        this.storage.setData(this.fields.keepLogin, value);
+    }
+
     private _embedded: boolean;
     /**
      * Is embedded
@@ -287,6 +307,8 @@ export abstract class CoreApp<
 
     private tasks: [() => PromiseLike<void | false>, number, number][] = [];
 
+    private clearInterval?: () => void;
+
     /**
      * Get persisted fields
      */
@@ -295,7 +317,7 @@ export abstract class CoreApp<
             this.fields.deviceId,
             this.fields.devicePassphrase,
             this.fields.serversideDeviceId,
-            this.fields.headerToken
+            this.fields.keepLogin
         ];
     }
 
@@ -507,6 +529,23 @@ export abstract class CoreApp<
         return false;
     }
 
+    /**
+     * Dispose the application
+     */
+    dispose() {
+        // Avoid duplicated call
+        if (!this._isReady) return;
+
+        // Persist storage defined fields
+        this.persist();
+
+        // Clear the interval
+        this.clearInterval?.();
+
+        // Reset the status to false
+        this.isReady = false;
+    }
+
     /**
      * Is valid password, override to implement custom check
      * @param password Input password
@@ -525,34 +564,21 @@ export abstract class CoreApp<
 
     /**
      * Persist settings to source when application exit
-     * @param keepLogin Keep login or not
      */
-    persist(keepLogin?: boolean) {
-        if (!keepLogin) {
-            // Unconditional clear the cache for security
-            this.clearCacheToken();
-        }
-
+    persist() {
         // Devices
         const devices = this.storage.getPersistedData<string[]>(
             this.fields.devices
         );
         if (devices != null) {
-            const index = devices.indexOf(this.getDeviceId());
-            if (index !== -1) {
-                // Remove current device from the list
-                devices.splice(index, 1);
+            if (devices.remove(this.getDeviceId()).length > 0) {
                 this.storage.setPersistedData(this.fields.devices, devices);
             }
         }
 
         if (!this.authorized) return;
 
-        const fields = keepLogin
-            ? this.persistedFields
-            : this.persistedFields.filter((f) => f !== this.fields.headerToken);
-
-        this.storage.copyTo(fields);
+        this.storage.copyTo(this.persistedFields);
     }
 
     /**
@@ -1064,6 +1090,9 @@ export abstract class CoreApp<
 
         // Everything is ready, update the state
         this.authorized = authorized;
+
+        // Persist
+        this.persist();
     }
 
     /**
@@ -2106,7 +2135,7 @@ export abstract class CoreApp<
      * Setup tasks
      */
     protected setupTasks() {
-        ExtendUtils.intervalFor(() => {
+        this.clearInterval = ExtendUtils.intervalFor(() => {
             // Exit when not authorized
             if (!this.authorized) return;
 
@@ -2169,6 +2198,9 @@ export abstract class CoreApp<
      * @param apiUrl Signout API URL
      */
     async signout() {
+        // Clear the keep login status
+        this.keepLogin = false;
+
         const token = this.getCacheToken();
         if (token) {
             const result = await new AuthApi(this).signout(

package/src/app/IApp.ts

@@ -133,7 +133,8 @@ export const appFields = [
     'devices',
     'devicePassphrase',
     'cachedUrl',
-    'embedded'
+    'embedded',
+    'keepLogin'
 ] as const;
 
 /**
@@ -240,6 +241,11 @@ export interface IApp {
      */
     cachedUrl: string | undefined | null;
 
+    /**
+     * Keep login or not
+     */
+    keepLogin: boolean;
+
     /**
      * IP data
      */
@@ -391,6 +397,11 @@ export interface IApp {
      */
     detectIP(callback?: IDetectIPCallback): void;
 
+    /**
+     * Dispose the application
+     */
+    dispose(): void;
+
     /**
      * Download file
      * @param stream File stream
@@ -758,9 +769,8 @@ export interface IApp {
 
     /**
      * Persist settings to source when application exit
-     * @param keepLogin Keep login or not
      */
-    persist(keepLogin?: boolean): void;
+    persist(): void;
 
     /**
      * Go to the login page

package/src/business/BusinessUtils.ts

@@ -62,9 +62,7 @@ export namespace BusinessUtils {
         });
 
         // Remove the default culture
-        const index = allCultures.findIndex((a) => a.id === cultures[0].id);
-        if (index !== -1) allCultures.splice(index, 1);
-
+        allCultures.remove((a) => a.id === cultures[0].id);
         // Sort
         allCultures.sortByProperty(
             'id',

package/src/business/ShoppingCart.ts

@@ -475,13 +475,7 @@ export class ShoppingCart<T extends ShoppingCartItem> {
             this.save();
         } else {
             ShoppingCart.clear(this.identifier, this.storage);
-
-            const keys = this.keys;
-            const index = keys.indexOf(this.identifier);
-            if (index !== -1) {
-                keys.splice(index, 1);
-                this.keys = keys;
-            }
+            this.keys.remove(this.identifier);
         }
 
         this.doChange('clear', []);