@etsoo/appscript 1.1.75 → 1.1.76

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

@@ -105,9 +105,8 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Authorize
      * @param token New token
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      */
-    authorize(token?: string, refreshToken?: string, keep?: boolean): void;
+    authorize(token?: string, refreshToken?: string): void;
     /**
      * Change country or region
      * @param region New country or region
@@ -118,6 +117,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param culture New culture definition
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
+    /**
+     * Clear cached token
+     */
+    clearCacheToken(): void;
     /**
      * Decrypt message
      * @param messageEncrypted Encrypted message
@@ -299,9 +302,8 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not
@@ -438,9 +440,8 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Authorize
      * @param token New token
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      */
-    authorize(token?: string, refreshToken?: string, keep?: boolean): void;
+    authorize(token?: string, refreshToken?: string): void;
     /**
      * Change country or region
      * @param regionId New country or region
@@ -451,6 +452,10 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param culture New culture definition
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
+    /**
+     * Clear cached token
+     */
+    clearCacheToken(): void;
     /**
      * Decrypt message
      * @param messageEncrypted Encrypted message
@@ -644,9 +649,8 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/cjs/app/CoreApp.js

@@ -197,12 +197,21 @@ class CoreApp {
             const fields = this.initCallUpdateFields();
             for (const field of fields) {
                 const currentValue = shared_1.StorageUtils.getLocalData(field, '');
-                if (currentValue === '' || currentValue.indexOf('+') === -1)
+                if (currentValue === '')
                     continue;
-                const newValueSource = this.decryptEnhanced(currentValue, prev, 12);
-                if (newValueSource == null)
+                const enhanced = currentValue.indexOf('!') >= 8;
+                let newValueSource = null;
+                if (enhanced) {
+                    newValueSource = this.decryptEnhanced(currentValue, prev, 12);
+                }
+                else {
+                    newValueSource = this.decrypt(currentValue, prev);
+                }
+                if (newValueSource == null || newValueSource === '')
                     continue;
-                const newValue = this.encryptEnhanced(newValueSource);
+                const newValue = enhanced
+                    ? this.encryptEnhanced(newValueSource)
+                    : this.encrypt(newValueSource);
                 shared_1.StorageUtils.setLocalData(field, newValue);
             }
         }
@@ -212,7 +221,7 @@ class CoreApp {
      * @returns Fields
      */
     initCallUpdateFields() {
-        return [];
+        return [this.headerTokenField];
     }
     /**
      * Alert action result
@@ -226,17 +235,17 @@ class CoreApp {
      * Authorize
      * @param token New token
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      */
-    authorize(token, refreshToken, keep) {
+    authorize(token, refreshToken) {
         // State, when token is null, means logout
         this.authorized = token != null;
         // Token
         this.api.authorize(this.settings.authScheme, token);
         // Cover the current value
-        if (keep != null) {
-            shared_1.StorageUtils.setLocalData(this.headerTokenField, keep ? refreshToken : undefined);
-            shared_1.StorageUtils.setSessionData(this.headerTokenField, keep ? undefined : refreshToken);
+        if (refreshToken !== '') {
+            if (refreshToken != null)
+                refreshToken = this.encrypt(refreshToken);
+            shared_1.StorageUtils.setLocalData(this.headerTokenField, refreshToken);
         }
         // Reset tryLogin state
         this._isTryingLogin = false;
@@ -302,6 +311,12 @@ class CoreApp {
                 region.name = AddressUtils_1.AddressUtils.getRegionLabel(id, this.labelDelegate);
         });
     }
+    /**
+     * Clear cached token
+     */
+    clearCacheToken() {
+        shared_1.StorageUtils.setLocalData(this.headerTokenField, null);
+    }
     /**
      * Decrypt message
      * @param messageEncrypted Encrypted message
@@ -321,14 +336,11 @@ class CoreApp {
             hasher: crypto_js_1.algo.SHA256,
             iterations: 1000 * iterations
         });
-        const bytes = crypto_js_1.AES.decrypt(encrypted, key, {
+        return crypto_js_1.AES.decrypt(encrypted, key, {
             iv,
             padding: crypto_js_1.pad.Pkcs7,
             mode: crypto_js_1.mode.CBC
-        });
-        if (bytes.words.length == 0)
-            return undefined;
-        return bytes.toString(crypto_js_1.enc.Utf8);
+        }).toString(crypto_js_1.enc.Utf8);
     }
     /**
      * Enhanced decrypt message
@@ -548,12 +560,13 @@ class CoreApp {
      * @returns Cached token
      */
     getCacheToken() {
-        let refreshToken = shared_1.StorageUtils.getLocalData(this.headerTokenField, '');
-        if (refreshToken === '')
-            refreshToken = shared_1.StorageUtils.getSessionData(this.headerTokenField, '');
+        const refreshToken = shared_1.StorageUtils.getLocalData(this.headerTokenField, '');
         if (refreshToken === '')
             return null;
-        return refreshToken;
+        const result = this.decrypt(refreshToken);
+        if (result == undefined)
+            return null;
+        return result;
     }
     /**
      * Get all regions
@@ -751,24 +764,23 @@ class CoreApp {
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      */
-    userLogin(user, refreshToken, keep = false) {
+    userLogin(user, refreshToken) {
         this.userData = user;
-        this.authorize(user.token, refreshToken, keep);
+        this.authorize(user.token, refreshToken);
     }
     /**
      * User logout
      * @param clearToken Clear refresh token or not
      */
     userLogout(clearToken = true) {
-        this.authorize(undefined, undefined, clearToken ? false : undefined);
+        this.authorize(undefined, clearToken ? undefined : '');
     }
     /**
      * User unauthorized
      */
     userUnauthorized() {
-        this.authorize(undefined, undefined, undefined);
+        this.authorize(undefined, undefined);
     }
     /**
      * Show warning message

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

@@ -105,9 +105,8 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Authorize
      * @param token New token
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      */
-    authorize(token?: string, refreshToken?: string, keep?: boolean): void;
+    authorize(token?: string, refreshToken?: string): void;
     /**
      * Change country or region
      * @param region New country or region
@@ -118,6 +117,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param culture New culture definition
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
+    /**
+     * Clear cached token
+     */
+    clearCacheToken(): void;
     /**
      * Decrypt message
      * @param messageEncrypted Encrypted message
@@ -299,9 +302,8 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not
@@ -438,9 +440,8 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Authorize
      * @param token New token
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      */
-    authorize(token?: string, refreshToken?: string, keep?: boolean): void;
+    authorize(token?: string, refreshToken?: string): void;
     /**
      * Change country or region
      * @param regionId New country or region
@@ -451,6 +452,10 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param culture New culture definition
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
+    /**
+     * Clear cached token
+     */
+    clearCacheToken(): void;
     /**
      * Decrypt message
      * @param messageEncrypted Encrypted message
@@ -644,9 +649,8 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/mjs/app/CoreApp.js

@@ -194,12 +194,21 @@ export class CoreApp {
             const fields = this.initCallUpdateFields();
             for (const field of fields) {
                 const currentValue = StorageUtils.getLocalData(field, '');
-                if (currentValue === '' || currentValue.indexOf('+') === -1)
+                if (currentValue === '')
                     continue;
-                const newValueSource = this.decryptEnhanced(currentValue, prev, 12);
-                if (newValueSource == null)
+                const enhanced = currentValue.indexOf('!') >= 8;
+                let newValueSource = null;
+                if (enhanced) {
+                    newValueSource = this.decryptEnhanced(currentValue, prev, 12);
+                }
+                else {
+                    newValueSource = this.decrypt(currentValue, prev);
+                }
+                if (newValueSource == null || newValueSource === '')
                     continue;
-                const newValue = this.encryptEnhanced(newValueSource);
+                const newValue = enhanced
+                    ? this.encryptEnhanced(newValueSource)
+                    : this.encrypt(newValueSource);
                 StorageUtils.setLocalData(field, newValue);
             }
         }
@@ -209,7 +218,7 @@ export class CoreApp {
      * @returns Fields
      */
     initCallUpdateFields() {
-        return [];
+        return [this.headerTokenField];
     }
     /**
      * Alert action result
@@ -223,17 +232,17 @@ export class CoreApp {
      * Authorize
      * @param token New token
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      */
-    authorize(token, refreshToken, keep) {
+    authorize(token, refreshToken) {
         // State, when token is null, means logout
         this.authorized = token != null;
         // Token
         this.api.authorize(this.settings.authScheme, token);
         // Cover the current value
-        if (keep != null) {
-            StorageUtils.setLocalData(this.headerTokenField, keep ? refreshToken : undefined);
-            StorageUtils.setSessionData(this.headerTokenField, keep ? undefined : refreshToken);
+        if (refreshToken !== '') {
+            if (refreshToken != null)
+                refreshToken = this.encrypt(refreshToken);
+            StorageUtils.setLocalData(this.headerTokenField, refreshToken);
         }
         // Reset tryLogin state
         this._isTryingLogin = false;
@@ -299,6 +308,12 @@ export class CoreApp {
                 region.name = AddressUtils.getRegionLabel(id, this.labelDelegate);
         });
     }
+    /**
+     * Clear cached token
+     */
+    clearCacheToken() {
+        StorageUtils.setLocalData(this.headerTokenField, null);
+    }
     /**
      * Decrypt message
      * @param messageEncrypted Encrypted message
@@ -318,14 +333,11 @@ export class CoreApp {
             hasher: algo.SHA256,
             iterations: 1000 * iterations
         });
-        const bytes = AES.decrypt(encrypted, key, {
+        return AES.decrypt(encrypted, key, {
             iv,
             padding: pad.Pkcs7,
             mode: mode.CBC
-        });
-        if (bytes.words.length == 0)
-            return undefined;
-        return bytes.toString(enc.Utf8);
+        }).toString(enc.Utf8);
     }
     /**
      * Enhanced decrypt message
@@ -545,12 +557,13 @@ export class CoreApp {
      * @returns Cached token
      */
     getCacheToken() {
-        let refreshToken = StorageUtils.getLocalData(this.headerTokenField, '');
-        if (refreshToken === '')
-            refreshToken = StorageUtils.getSessionData(this.headerTokenField, '');
+        const refreshToken = StorageUtils.getLocalData(this.headerTokenField, '');
         if (refreshToken === '')
             return null;
-        return refreshToken;
+        const result = this.decrypt(refreshToken);
+        if (result == undefined)
+            return null;
+        return result;
     }
     /**
      * Get all regions
@@ -748,24 +761,23 @@ export class CoreApp {
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      */
-    userLogin(user, refreshToken, keep = false) {
+    userLogin(user, refreshToken) {
         this.userData = user;
-        this.authorize(user.token, refreshToken, keep);
+        this.authorize(user.token, refreshToken);
     }
     /**
      * User logout
      * @param clearToken Clear refresh token or not
      */
     userLogout(clearToken = true) {
-        this.authorize(undefined, undefined, clearToken ? false : undefined);
+        this.authorize(undefined, clearToken ? undefined : '');
     }
     /**
      * User unauthorized
      */
     userUnauthorized() {
-        this.authorize(undefined, undefined, undefined);
+        this.authorize(undefined, undefined);
     }
     /**
      * Show warning message

package/package.json

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

package/src/app/CoreApp.ts

@@ -162,9 +162,8 @@ export interface ICoreApp<
      * Authorize
      * @param token New token
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      */
-    authorize(token?: string, refreshToken?: string, keep?: boolean): void;
+    authorize(token?: string, refreshToken?: string): void;
 
     /**
      * Change country or region
@@ -178,6 +177,11 @@ export interface ICoreApp<
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
 
+    /**
+     * Clear cached token
+     */
+    clearCacheToken(): void;
+
     /**
      * Decrypt message
      * @param messageEncrypted Encrypted message
@@ -407,9 +411,8 @@ export interface ICoreApp<
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string): void;
 
     /**
      * User logout
@@ -714,17 +717,27 @@ export abstract class CoreApp<
                     field,
                     ''
                 );
-                if (currentValue === '' || currentValue.indexOf('+') === -1)
-                    continue;
+                if (currentValue === '') continue;
 
-                const newValueSource = this.decryptEnhanced(
-                    currentValue,
-                    prev,
-                    12
-                );
-                if (newValueSource == null) continue;
+                const enhanced = currentValue.indexOf('!') >= 8;
+                let newValueSource = null;
+
+                if (enhanced) {
+                    newValueSource = this.decryptEnhanced(
+                        currentValue,
+                        prev,
+                        12
+                    );
+                } else {
+                    newValueSource = this.decrypt(currentValue, prev);
+                }
+
+                if (newValueSource == null || newValueSource === '') continue;
+
+                const newValue = enhanced
+                    ? this.encryptEnhanced(newValueSource)
+                    : this.encrypt(newValueSource);
 
-                const newValue = this.encryptEnhanced(newValueSource);
                 StorageUtils.setLocalData(field, newValue);
             }
         }
@@ -735,7 +748,7 @@ export abstract class CoreApp<
      * @returns Fields
      */
     protected initCallUpdateFields(): string[] {
-        return [];
+        return [this.headerTokenField];
     }
 
     /**
@@ -751,9 +764,8 @@ export abstract class CoreApp<
      * Authorize
      * @param token New token
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      */
-    authorize(token?: string, refreshToken?: string, keep?: boolean) {
+    authorize(token?: string, refreshToken?: string) {
         // State, when token is null, means logout
         this.authorized = token != null;
 
@@ -761,17 +773,10 @@ export abstract class CoreApp<
         this.api.authorize(this.settings.authScheme, token);
 
         // Cover the current value
-        if (keep != null) {
-            StorageUtils.setLocalData(
-                this.headerTokenField,
-                keep ? refreshToken : undefined
-            );
-            StorageUtils.setSessionData(
-                this.headerTokenField,
-                keep ? undefined : refreshToken
-            );
+        if (refreshToken !== '') {
+            if (refreshToken != null) refreshToken = this.encrypt(refreshToken);
+            StorageUtils.setLocalData(this.headerTokenField, refreshToken);
         }
-
         // Reset tryLogin state
         this._isTryingLogin = false;
 
@@ -849,6 +854,13 @@ export abstract class CoreApp<
         });
     }
 
+    /**
+     * Clear cached token
+     */
+    clearCacheToken() {
+        StorageUtils.setLocalData(this.headerTokenField, null);
+    }
+
     /**
      * Decrypt message
      * @param messageEncrypted Encrypted message
@@ -870,14 +882,11 @@ export abstract class CoreApp<
             iterations: 1000 * iterations
         });
 
-        const bytes = AES.decrypt(encrypted, key, {
+        return AES.decrypt(encrypted, key, {
             iv,
             padding: pad.Pkcs7,
             mode: mode.CBC
-        });
-        if (bytes.words.length == 0) return undefined;
-
-        return bytes.toString(enc.Utf8);
+        }).toString(enc.Utf8);
     }
 
     /**
@@ -1153,19 +1162,16 @@ export abstract class CoreApp<
      * @returns Cached token
      */
     getCacheToken(): string | null {
-        let refreshToken = StorageUtils.getLocalData<string>(
+        const refreshToken = StorageUtils.getLocalData<string>(
             this.headerTokenField,
             ''
         );
-        if (refreshToken === '')
-            refreshToken = StorageUtils.getSessionData(
-                this.headerTokenField,
-                ''
-            );
 
         if (refreshToken === '') return null;
 
-        return refreshToken;
+        const result = this.decrypt(refreshToken);
+        if (result == undefined) return null;
+        return result;
     }
 
     /**
@@ -1385,11 +1391,10 @@ export abstract class CoreApp<
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
      */
-    userLogin(user: IUserData, refreshToken: string, keep: boolean = false) {
+    userLogin(user: IUserData, refreshToken: string) {
         this.userData = user;
-        this.authorize(user.token, refreshToken, keep);
+        this.authorize(user.token, refreshToken);
     }
 
     /**
@@ -1397,14 +1402,14 @@ export abstract class CoreApp<
      * @param clearToken Clear refresh token or not
      */
     userLogout(clearToken: boolean = true) {
-        this.authorize(undefined, undefined, clearToken ? false : undefined);
+        this.authorize(undefined, clearToken ? undefined : '');
     }
 
     /**
      * User unauthorized
      */
     userUnauthorized() {
-        this.authorize(undefined, undefined, undefined);
+        this.authorize(undefined, undefined);
     }
 
     private lastWarning?: INotification<N, C>;