@etsoo/appscript 1.5.52 → 1.5.54

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

@@ -635,15 +635,15 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     signout(): Promise<void>;
     /**
      * Go to the login page
-     * @params Login parameters
+     * @param data Login parameters
      */
-    toLoginPage(params?: AppLoginParams): void;
+    toLoginPage(data?: AppLoginParams): void;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
-     * @param params Login parameters
+     * @param data Login parameters
      */
-    tryLogin(params?: AppTryLoginParams): Promise<boolean>;
+    tryLogin(data?: AppTryLoginParams): Promise<boolean>;
     /**
      * Update embedded status
      * @param embedded New embedded status

package/lib/cjs/app/CoreApp.js

@@ -103,9 +103,15 @@ class CoreApp {
         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);
     }
@@ -132,7 +138,6 @@ class CoreApp {
             this.fields.deviceId,
             this.fields.devicePassphrase,
             this.fields.serversideDeviceId,
-            this.fields.headerToken,
             this.fields.keepLogin
         ];
     }
@@ -336,19 +341,13 @@ class CoreApp {
         // 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 = this.keepLogin
-            ? this.persistedFields
-            : this.persistedFields.filter((f) => f !== this.fields.headerToken);
-        this.storage.copyTo(fields);
+        this.storage.copyTo(this.persistedFields);
     }
     /**
      * Add scheduled task
@@ -1636,27 +1635,27 @@ class CoreApp {
         // Clear, noTrigger = true, avoid state update
         this.userLogout(true, true);
         // Go to login page
-        this.toLoginPage({ tryLogin: false, removeUrl: true });
+        this.toLoginPage({ params: { tryLogin: false }, removeUrl: true });
     }
     /**
      * Go to the login page
-     * @params Login parameters
+     * @param data Login parameters
      */
-    toLoginPage(params) {
+    toLoginPage(data) {
         // Destruct
-        const { removeUrl, showLoading, ...rest } = params ?? {};
+        const { params = {}, removeUrl } = data ?? {};
         // Save the current URL
         this.cachedUrl = removeUrl ? undefined : globalThis.location.href;
         // URL with parameters
-        const url = '/'.addUrlParams(rest);
+        const url = '/'.addUrlParams(params);
         this.navigate(url);
     }
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
-     * @param params Login parameters
+     * @param data Login parameters
      */
-    async tryLogin(params) {
+    async tryLogin(data) {
         // Check status
         if (this._isTryingLogin)
             return false;

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

@@ -43,11 +43,16 @@ export type FormatResultCustomCallback = ((data: FormatResultCustom) => string |
 /**
  * Login parameters
  */
-export type AppLoginParams = DataTypes.SimpleObject & {
+export type AppLoginParams = {
     /**
-     * Try login with cached refresh token
+     * Login parameters to pass
      */
-    tryLogin?: boolean;
+    params: DataTypes.SimpleObject & {
+        /**
+         * Try login with cached refresh token
+         */
+        tryLogin?: boolean;
+    };
     /**
      * Don't cache current URL instead of the default page
      */
@@ -573,15 +578,15 @@ export interface IApp {
     persist(): void;
     /**
      * Go to the login page
-     * @param params Login parameters
+     * @param data Login parameters
      */
-    toLoginPage(params?: AppLoginParams): void;
+    toLoginPage(data?: AppLoginParams): void;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
-     * @param params Login parameters
+     * @param data Login parameters
      */
-    tryLogin(params?: AppLoginParams): Promise<boolean>;
+    tryLogin(data?: AppLoginParams): Promise<boolean>;
     /**
      * Update API token and expires
      * @param name Api name

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

@@ -635,15 +635,15 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
     signout(): Promise<void>;
     /**
      * Go to the login page
-     * @params Login parameters
+     * @param data Login parameters
      */
-    toLoginPage(params?: AppLoginParams): void;
+    toLoginPage(data?: AppLoginParams): void;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
-     * @param params Login parameters
+     * @param data Login parameters
      */
-    tryLogin(params?: AppTryLoginParams): Promise<boolean>;
+    tryLogin(data?: AppTryLoginParams): Promise<boolean>;
     /**
      * Update embedded status
      * @param embedded New embedded status

package/lib/mjs/app/CoreApp.js

@@ -100,9 +100,15 @@ export class CoreApp {
         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);
     }
@@ -129,7 +135,6 @@ export class CoreApp {
             this.fields.deviceId,
             this.fields.devicePassphrase,
             this.fields.serversideDeviceId,
-            this.fields.headerToken,
             this.fields.keepLogin
         ];
     }
@@ -333,19 +338,13 @@ export class CoreApp {
         // 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 = this.keepLogin
-            ? this.persistedFields
-            : this.persistedFields.filter((f) => f !== this.fields.headerToken);
-        this.storage.copyTo(fields);
+        this.storage.copyTo(this.persistedFields);
     }
     /**
      * Add scheduled task
@@ -1633,27 +1632,27 @@ export class CoreApp {
         // Clear, noTrigger = true, avoid state update
         this.userLogout(true, true);
         // Go to login page
-        this.toLoginPage({ tryLogin: false, removeUrl: true });
+        this.toLoginPage({ params: { tryLogin: false }, removeUrl: true });
     }
     /**
      * Go to the login page
-     * @params Login parameters
+     * @param data Login parameters
      */
-    toLoginPage(params) {
+    toLoginPage(data) {
         // Destruct
-        const { removeUrl, showLoading, ...rest } = params ?? {};
+        const { params = {}, removeUrl } = data ?? {};
         // Save the current URL
         this.cachedUrl = removeUrl ? undefined : globalThis.location.href;
         // URL with parameters
-        const url = '/'.addUrlParams(rest);
+        const url = '/'.addUrlParams(params);
         this.navigate(url);
     }
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
-     * @param params Login parameters
+     * @param data Login parameters
      */
-    async tryLogin(params) {
+    async tryLogin(data) {
         // Check status
         if (this._isTryingLogin)
             return false;

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

@@ -43,11 +43,16 @@ export type FormatResultCustomCallback = ((data: FormatResultCustom) => string |
 /**
  * Login parameters
  */
-export type AppLoginParams = DataTypes.SimpleObject & {
+export type AppLoginParams = {
     /**
-     * Try login with cached refresh token
+     * Login parameters to pass
      */
-    tryLogin?: boolean;
+    params: DataTypes.SimpleObject & {
+        /**
+         * Try login with cached refresh token
+         */
+        tryLogin?: boolean;
+    };
     /**
      * Don't cache current URL instead of the default page
      */
@@ -573,15 +578,15 @@ export interface IApp {
     persist(): void;
     /**
      * Go to the login page
-     * @param params Login parameters
+     * @param data Login parameters
      */
-    toLoginPage(params?: AppLoginParams): void;
+    toLoginPage(data?: AppLoginParams): void;
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
-     * @param params Login parameters
+     * @param data Login parameters
      */
-    tryLogin(params?: AppLoginParams): Promise<boolean>;
+    tryLogin(data?: AppLoginParams): Promise<boolean>;
     /**
      * Update API token and expires
      * @param name Api name

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.52",
+    "version": "1.5.54",
     "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

@@ -256,9 +256,15 @@ export abstract class CoreApp<
         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);
     }
@@ -311,7 +317,6 @@ export abstract class CoreApp<
             this.fields.deviceId,
             this.fields.devicePassphrase,
             this.fields.serversideDeviceId,
-            this.fields.headerToken,
             this.fields.keepLogin
         ];
     }
@@ -566,21 +571,14 @@ export abstract class CoreApp<
             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 = this.keepLogin
-            ? this.persistedFields
-            : this.persistedFields.filter((f) => f !== this.fields.headerToken);
-
-        this.storage.copyTo(fields);
+        this.storage.copyTo(this.persistedFields);
     }
 
     /**
@@ -2231,22 +2229,22 @@ export abstract class CoreApp<
         this.userLogout(true, true);
 
         // Go to login page
-        this.toLoginPage({ tryLogin: false, removeUrl: true });
+        this.toLoginPage({ params: { tryLogin: false }, removeUrl: true });
     }
 
     /**
      * Go to the login page
-     * @params Login parameters
+     * @param data Login parameters
      */
-    toLoginPage(params?: AppLoginParams) {
+    toLoginPage(data?: AppLoginParams) {
         // Destruct
-        const { removeUrl, showLoading, ...rest } = params ?? {};
+        const { params = {}, removeUrl } = data ?? {};
 
         // Save the current URL
         this.cachedUrl = removeUrl ? undefined : globalThis.location.href;
 
         // URL with parameters
-        const url = '/'.addUrlParams(rest);
+        const url = '/'.addUrlParams(params);
 
         this.navigate(url);
     }
@@ -2254,9 +2252,9 @@ export abstract class CoreApp<
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
-     * @param params Login parameters
+     * @param data Login parameters
      */
-    async tryLogin(params?: AppTryLoginParams) {
+    async tryLogin(data?: AppTryLoginParams) {
         // Check status
         if (this._isTryingLogin) return false;
         this._isTryingLogin = true;

package/src/app/IApp.ts

@@ -66,11 +66,16 @@ export type FormatResultCustomCallback =
 /**
  * Login parameters
  */
-export type AppLoginParams = DataTypes.SimpleObject & {
+export type AppLoginParams = {
     /**
-     * Try login with cached refresh token
+     * Login parameters to pass
      */
-    tryLogin?: boolean;
+    params: DataTypes.SimpleObject & {
+        /**
+         * Try login with cached refresh token
+         */
+        tryLogin?: boolean;
+    };
 
     /**
      * Don't cache current URL instead of the default page
@@ -774,16 +779,16 @@ export interface IApp {
 
     /**
      * Go to the login page
-     * @param params Login parameters
+     * @param data Login parameters
      */
-    toLoginPage(params?: AppLoginParams): void;
+    toLoginPage(data?: AppLoginParams): void;
 
     /**
      * Try login, returning false means is loading
      * UI get involved while refreshToken not intended
-     * @param params Login parameters
+     * @param data Login parameters
      */
-    tryLogin(params?: AppLoginParams): Promise<boolean>;
+    tryLogin(data?: AppLoginParams): Promise<boolean>;
 
     /**
      * Update API token and expires

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', []);