@etsoo/appscript 1.1.73 → 1.1.77

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
      */
@@ -101,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
@@ -114,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
@@ -295,7 +302,7 @@ 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
+     * @param keep Keep login or not
      */
     userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
     /**
@@ -349,6 +356,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,14 +402,11 @@ 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
      */
     protected passphrase: string;
+    private cachedRefreshToken?;
     /**
      * Protected constructor
      * @param settings Settings
@@ -432,9 +442,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
@@ -445,6 +454,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
@@ -638,7 +651,7 @@ 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
+     * @param keep Keep login or not
      */
     userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
     /**

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
      */
@@ -187,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);
             }
         }
@@ -202,7 +221,7 @@ class CoreApp {
      * @returns Fields
      */
     initCallUpdateFields() {
-        return [];
+        return [this.headerTokenField];
     }
     /**
      * Alert action result
@@ -216,25 +235,27 @@ 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;
         // Token countdown
         if (this.authorized)
             this.refreshCountdown(this.userData.seconds);
-        else
+        else {
+            this.cachedRefreshToken = undefined;
             this.refreshCountdownClear();
+        }
     }
     /**
      * Change country or region
@@ -292,6 +313,13 @@ class CoreApp {
                 region.name = AddressUtils_1.AddressUtils.getRegionLabel(id, this.labelDelegate);
         });
     }
+    /**
+     * Clear cached token
+     */
+    clearCacheToken() {
+        this.cachedRefreshToken = undefined;
+        shared_1.StorageUtils.setLocalData(this.headerTokenField, undefined);
+    }
     /**
      * Decrypt message
      * @param messageEncrypted Encrypted message
@@ -535,12 +563,16 @@ class CoreApp {
      * @returns Cached token
      */
     getCacheToken() {
-        let refreshToken = shared_1.StorageUtils.getLocalData(this.headerTokenField, '');
-        if (refreshToken === '')
-            refreshToken = shared_1.StorageUtils.getSessionData(this.headerTokenField, '');
+        // Temp refresh token
+        if (this.cachedRefreshToken)
+            return this.cachedRefreshToken;
+        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
@@ -738,24 +770,30 @@ class CoreApp {
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
+     * @param keep Keep login or not
      */
-    userLogin(user, refreshToken, keep = false) {
+    userLogin(user, refreshToken, keep) {
         this.userData = user;
-        this.authorize(user.token, refreshToken, keep);
+        if (keep) {
+            this.authorize(user.token, refreshToken);
+        }
+        else {
+            this.cachedRefreshToken = refreshToken;
+            this.authorize(user.token, undefined);
+        }
     }
     /**
      * 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

@@ -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
      */
@@ -101,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
@@ -114,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
@@ -295,7 +302,7 @@ 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
+     * @param keep Keep login or not
      */
     userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
     /**
@@ -349,6 +356,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,14 +402,11 @@ 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
      */
     protected passphrase: string;
+    private cachedRefreshToken?;
     /**
      * Protected constructor
      * @param settings Settings
@@ -432,9 +442,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
@@ -445,6 +454,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
@@ -638,7 +651,7 @@ 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
+     * @param keep Keep login or not
      */
     userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
     /**

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
      */
@@ -184,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);
             }
         }
@@ -199,7 +218,7 @@ export class CoreApp {
      * @returns Fields
      */
     initCallUpdateFields() {
-        return [];
+        return [this.headerTokenField];
     }
     /**
      * Alert action result
@@ -213,25 +232,27 @@ 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;
         // Token countdown
         if (this.authorized)
             this.refreshCountdown(this.userData.seconds);
-        else
+        else {
+            this.cachedRefreshToken = undefined;
             this.refreshCountdownClear();
+        }
     }
     /**
      * Change country or region
@@ -289,6 +310,13 @@ export class CoreApp {
                 region.name = AddressUtils.getRegionLabel(id, this.labelDelegate);
         });
     }
+    /**
+     * Clear cached token
+     */
+    clearCacheToken() {
+        this.cachedRefreshToken = undefined;
+        StorageUtils.setLocalData(this.headerTokenField, undefined);
+    }
     /**
      * Decrypt message
      * @param messageEncrypted Encrypted message
@@ -532,12 +560,16 @@ export class CoreApp {
      * @returns Cached token
      */
     getCacheToken() {
-        let refreshToken = StorageUtils.getLocalData(this.headerTokenField, '');
-        if (refreshToken === '')
-            refreshToken = StorageUtils.getSessionData(this.headerTokenField, '');
+        // Temp refresh token
+        if (this.cachedRefreshToken)
+            return this.cachedRefreshToken;
+        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
@@ -735,24 +767,30 @@ export class CoreApp {
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
+     * @param keep Keep login or not
      */
-    userLogin(user, refreshToken, keep = false) {
+    userLogin(user, refreshToken, keep) {
         this.userData = user;
-        this.authorize(user.token, refreshToken, keep);
+        if (keep) {
+            this.authorize(user.token, refreshToken);
+        }
+        else {
+            this.cachedRefreshToken = refreshToken;
+            this.authorize(user.token, undefined);
+        }
     }
     /**
      * 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.73",
+    "version": "1.1.77",
     "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
      */
@@ -157,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
@@ -173,6 +177,11 @@ export interface ICoreApp<
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
 
+    /**
+     * Clear cached token
+     */
+    clearCacheToken(): void;
+
     /**
      * Decrypt message
      * @param messageEncrypted Encrypted message
@@ -402,7 +411,7 @@ export interface ICoreApp<
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
+     * @param keep Keep login or not
      */
     userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
 
@@ -478,6 +487,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,16 +557,13 @@ export abstract class CoreApp<
      */
     protected deviceIdField: string = 'SmartERPDeviceId';
 
-    /**
-     * Device id
-     */
-    protected deviceId: string;
-
     /**
      * Passphrase for encryption
      */
     protected passphrase: string = '***';
 
+    private cachedRefreshToken?: string;
+
     /**
      * Protected constructor
      * @param settings Settings
@@ -703,17 +720,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);
             }
         }
@@ -724,7 +751,7 @@ export abstract class CoreApp<
      * @returns Fields
      */
     protected initCallUpdateFields(): string[] {
-        return [];
+        return [this.headerTokenField];
     }
 
     /**
@@ -740,9 +767,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;
 
@@ -750,15 +776,9 @@ 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
@@ -766,7 +786,10 @@ export abstract class CoreApp<
 
         // Token countdown
         if (this.authorized) this.refreshCountdown(this.userData!.seconds);
-        else this.refreshCountdownClear();
+        else {
+            this.cachedRefreshToken = undefined;
+            this.refreshCountdownClear();
+        }
     }
 
     /**
@@ -838,6 +861,14 @@ export abstract class CoreApp<
         });
     }
 
+    /**
+     * Clear cached token
+     */
+    clearCacheToken() {
+        this.cachedRefreshToken = undefined;
+        StorageUtils.setLocalData(this.headerTokenField, undefined);
+    }
+
     /**
      * Decrypt message
      * @param messageEncrypted Encrypted message
@@ -1139,19 +1170,19 @@ export abstract class CoreApp<
      * @returns Cached token
      */
     getCacheToken(): string | null {
-        let refreshToken = StorageUtils.getLocalData<string>(
+        // Temp refresh token
+        if (this.cachedRefreshToken) return this.cachedRefreshToken;
+
+        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;
     }
 
     /**
@@ -1371,11 +1402,17 @@ export abstract class CoreApp<
      * User login
      * @param user User data
      * @param refreshToken Refresh token
-     * @param keep Keep in local storage or not
+     * @param keep Keep login or not
      */
-    userLogin(user: IUserData, refreshToken: string, keep: boolean = false) {
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean) {
         this.userData = user;
-        this.authorize(user.token, refreshToken, keep);
+
+        if (keep) {
+            this.authorize(user.token, refreshToken);
+        } else {
+            this.cachedRefreshToken = refreshToken;
+            this.authorize(user.token, undefined);
+        }
     }
 
     /**
@@ -1383,14 +1420,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>;