@etsoo/appscript 1.1.85 → 1.1.86

package/__tests__/app/CoreApp.ts

@@ -136,7 +136,6 @@ test('Tests for encryptEnhanced / decryptEnhanced', () => {
 
     // Act
     const encrypted = app.encryptEnhanced(input, passphrase);
-    console.log(encrypted);
     const plain = app.decryptEnhanced(encrypted, passphrase);
     expect(plain).toEqual(input);
 });

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

@@ -222,7 +222,7 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Get cached token
      * @returns Cached token
      */
-    getCacheToken(): string | null;
+    getCacheToken(): string | undefined;
     /**
      * Get all regions
      * @returns Regions
@@ -375,18 +375,26 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Label delegate
      */
     get labelDelegate(): <T = string>(key: string) => T | undefined;
+    private _ipData?;
     /**
      * IP data
      */
-    ipData?: IPData;
+    get ipData(): IPData | undefined;
+    protected set ipData(value: IPData | undefined);
+    private _userData?;
     /**
      * User data
      */
-    userData?: IUserData;
+    get userData(): IUserData | undefined;
+    protected set userData(value: IUserData | undefined);
     /**
      * Response token header field name
      */
-    headerTokenField: string;
+    readonly headerTokenField = "SmartERPRefreshToken";
+    /**
+     * Serverside device id encrypted field name
+     */
+    protected readonly serversideDeviceIdField = "SmartERPServersideDeviceId";
     private ipDetectCallbacks?;
     /**
      * Search input element
@@ -410,7 +418,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     /**
      * Device id field name
      */
-    protected deviceIdField: string;
+    protected readonly deviceIdField: string;
+    /**
+     * Device id update time field name
+     */
+    protected readonly deviceIdUpdateTimeField: string;
     /**
      * Init call Api URL
      */
@@ -435,6 +447,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @returns Result
      */
     protected apiInitCall(data: InitCallDto): Promise<InitCallResult | undefined>;
+    /**
+     * Get device last updte miliseconds
+     * @returns Miliseconds
+     */
+    protected getDeviceUpdateTime(): number;
     /**
      * Init call
      * @param callback Callback
@@ -579,7 +596,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Get cached token
      * @returns Cached token
      */
-    getCacheToken(): string | null;
+    getCacheToken(): string | undefined;
     /**
      * Get all regions
      * @returns Regions

package/lib/cjs/app/CoreApp.js

@@ -20,11 +20,15 @@ class CoreApp {
      * @param name Application name
      */
     constructor(settings, api, notifier, name) {
-        this._deviceId = '***';
+        this._deviceId = '';
         /**
          * Response token header field name
          */
         this.headerTokenField = 'SmartERPRefreshToken';
+        /**
+         * Serverside device id encrypted field name
+         */
+        this.serversideDeviceIdField = 'SmartERPServersideDeviceId';
         this._authorized = false;
         this._isTryingLogin = false;
         /**
@@ -39,6 +43,10 @@ class CoreApp {
          * Device id field name
          */
         this.deviceIdField = 'SmartERPDeviceId';
+        /**
+         * Device id update time field name
+         */
+        this.deviceIdUpdateTimeField = 'SmartERPDeviceIdUpdateTime';
         /**
          * Init call Api URL
          */
@@ -92,6 +100,24 @@ class CoreApp {
     get labelDelegate() {
         return this.get.bind(this);
     }
+    /**
+     * IP data
+     */
+    get ipData() {
+        return this._ipData;
+    }
+    set ipData(value) {
+        this._ipData = value;
+    }
+    /**
+     * User data
+     */
+    get userData() {
+        return this._userData;
+    }
+    set userData(value) {
+        this._userData = value;
+    }
     /**
      * Is current authorized
      */
@@ -139,6 +165,13 @@ class CoreApp {
     async apiInitCall(data) {
         return await this.api.put(this.initCallApi, data);
     }
+    /**
+     * Get device last updte miliseconds
+     * @returns Miliseconds
+     */
+    getDeviceUpdateTime() {
+        return shared_1.StorageUtils.getLocalData(this.deviceIdUpdateTimeField, 0);
+    }
     /**
      * Init call
      * @param callback Callback
@@ -146,9 +179,24 @@ class CoreApp {
      */
     async initCall(callback) {
         var _a;
+        // Device
+        let hasDeviceId = this.deviceId != null && this.deviceId !== '';
+        const timestamp = new Date().getTime();
+        const lastTimestamp = this.getDeviceUpdateTime();
+        if (hasDeviceId &&
+            lastTimestamp > 0 &&
+            timestamp - lastTimestamp <= 1296000000) {
+            // When deviceId is there and less than 15 days = 1000 * 60 * 60 * 24 * 15
+            if (callback)
+                callback(true);
+            return;
+        }
+        // Serverside encrypted device id
+        const identifier = shared_1.StorageUtils.getLocalData(this.serversideDeviceIdField);
         const data = {
-            timestamp: new Date().getTime(),
-            deviceId: this.deviceId === '' ? undefined : this.deviceId
+            timestamp,
+            identifier,
+            deviceId: hasDeviceId ? this.deviceId : undefined
         };
         const result = await this.apiInitCall(data);
         if (result == null) {
@@ -200,6 +248,7 @@ class CoreApp {
         // Update device id and cache it
         this.deviceId = data.deviceId;
         shared_1.StorageUtils.setLocalData(this.deviceIdField, this.deviceId);
+        shared_1.StorageUtils.setLocalData(this.deviceIdUpdateTimeField, timestamp);
         // Current passphrase
         this.passphrase = passphrase;
         // Previous passphrase
@@ -578,10 +627,7 @@ class CoreApp {
         // Temp refresh token
         if (this.cachedRefreshToken)
             return this.cachedRefreshToken;
-        const refreshToken = shared_1.StorageUtils.getLocalData(this.headerTokenField, '');
-        if (refreshToken === '')
-            return null;
-        return refreshToken;
+        return shared_1.StorageUtils.getLocalData(this.headerTokenField);
     }
     /**
      * Get all regions
@@ -793,6 +839,8 @@ class CoreApp {
      */
     userLogin(user, refreshToken, keep) {
         this.userData = user;
+        // Cache the encrypted serverside device id
+        shared_1.StorageUtils.setLocalData(this.serversideDeviceIdField, user.deviceId);
         if (keep) {
             this.authorize(user.token, refreshToken);
         }

package/lib/cjs/dto/InitCallDto.d.ts

@@ -6,6 +6,10 @@ export declare type InitCallDto = {
      * Device id
      */
     deviceId?: string;
+    /**
+     * Serverside identifier
+     */
+    identifier?: string;
     /**
      * Timestamp
      */

package/lib/cjs/state/User.d.ts

@@ -3,6 +3,10 @@ import { IState } from './State';
  * User data interface
  */
 export interface IUserData {
+    /**
+     * Serverside device id encrypted
+     */
+    readonly deviceId: string;
     /**
      * User name
      */

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

@@ -222,7 +222,7 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * Get cached token
      * @returns Cached token
      */
-    getCacheToken(): string | null;
+    getCacheToken(): string | undefined;
     /**
      * Get all regions
      * @returns Regions
@@ -375,18 +375,26 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Label delegate
      */
     get labelDelegate(): <T = string>(key: string) => T | undefined;
+    private _ipData?;
     /**
      * IP data
      */
-    ipData?: IPData;
+    get ipData(): IPData | undefined;
+    protected set ipData(value: IPData | undefined);
+    private _userData?;
     /**
      * User data
      */
-    userData?: IUserData;
+    get userData(): IUserData | undefined;
+    protected set userData(value: IUserData | undefined);
     /**
      * Response token header field name
      */
-    headerTokenField: string;
+    readonly headerTokenField = "SmartERPRefreshToken";
+    /**
+     * Serverside device id encrypted field name
+     */
+    protected readonly serversideDeviceIdField = "SmartERPServersideDeviceId";
     private ipDetectCallbacks?;
     /**
      * Search input element
@@ -410,7 +418,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     /**
      * Device id field name
      */
-    protected deviceIdField: string;
+    protected readonly deviceIdField: string;
+    /**
+     * Device id update time field name
+     */
+    protected readonly deviceIdUpdateTimeField: string;
     /**
      * Init call Api URL
      */
@@ -435,6 +447,11 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @returns Result
      */
     protected apiInitCall(data: InitCallDto): Promise<InitCallResult | undefined>;
+    /**
+     * Get device last updte miliseconds
+     * @returns Miliseconds
+     */
+    protected getDeviceUpdateTime(): number;
     /**
      * Init call
      * @param callback Callback
@@ -579,7 +596,7 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Get cached token
      * @returns Cached token
      */
-    getCacheToken(): string | null;
+    getCacheToken(): string | undefined;
     /**
      * Get all regions
      * @returns Regions

package/lib/mjs/app/CoreApp.js

@@ -17,11 +17,15 @@ export class CoreApp {
      * @param name Application name
      */
     constructor(settings, api, notifier, name) {
-        this._deviceId = '***';
+        this._deviceId = '';
         /**
          * Response token header field name
          */
         this.headerTokenField = 'SmartERPRefreshToken';
+        /**
+         * Serverside device id encrypted field name
+         */
+        this.serversideDeviceIdField = 'SmartERPServersideDeviceId';
         this._authorized = false;
         this._isTryingLogin = false;
         /**
@@ -36,6 +40,10 @@ export class CoreApp {
          * Device id field name
          */
         this.deviceIdField = 'SmartERPDeviceId';
+        /**
+         * Device id update time field name
+         */
+        this.deviceIdUpdateTimeField = 'SmartERPDeviceIdUpdateTime';
         /**
          * Init call Api URL
          */
@@ -89,6 +97,24 @@ export class CoreApp {
     get labelDelegate() {
         return this.get.bind(this);
     }
+    /**
+     * IP data
+     */
+    get ipData() {
+        return this._ipData;
+    }
+    set ipData(value) {
+        this._ipData = value;
+    }
+    /**
+     * User data
+     */
+    get userData() {
+        return this._userData;
+    }
+    set userData(value) {
+        this._userData = value;
+    }
     /**
      * Is current authorized
      */
@@ -136,6 +162,13 @@ export class CoreApp {
     async apiInitCall(data) {
         return await this.api.put(this.initCallApi, data);
     }
+    /**
+     * Get device last updte miliseconds
+     * @returns Miliseconds
+     */
+    getDeviceUpdateTime() {
+        return StorageUtils.getLocalData(this.deviceIdUpdateTimeField, 0);
+    }
     /**
      * Init call
      * @param callback Callback
@@ -143,9 +176,24 @@ export class CoreApp {
      */
     async initCall(callback) {
         var _a;
+        // Device
+        let hasDeviceId = this.deviceId != null && this.deviceId !== '';
+        const timestamp = new Date().getTime();
+        const lastTimestamp = this.getDeviceUpdateTime();
+        if (hasDeviceId &&
+            lastTimestamp > 0 &&
+            timestamp - lastTimestamp <= 1296000000) {
+            // When deviceId is there and less than 15 days = 1000 * 60 * 60 * 24 * 15
+            if (callback)
+                callback(true);
+            return;
+        }
+        // Serverside encrypted device id
+        const identifier = StorageUtils.getLocalData(this.serversideDeviceIdField);
         const data = {
-            timestamp: new Date().getTime(),
-            deviceId: this.deviceId === '' ? undefined : this.deviceId
+            timestamp,
+            identifier,
+            deviceId: hasDeviceId ? this.deviceId : undefined
         };
         const result = await this.apiInitCall(data);
         if (result == null) {
@@ -197,6 +245,7 @@ export class CoreApp {
         // Update device id and cache it
         this.deviceId = data.deviceId;
         StorageUtils.setLocalData(this.deviceIdField, this.deviceId);
+        StorageUtils.setLocalData(this.deviceIdUpdateTimeField, timestamp);
         // Current passphrase
         this.passphrase = passphrase;
         // Previous passphrase
@@ -575,10 +624,7 @@ export class CoreApp {
         // Temp refresh token
         if (this.cachedRefreshToken)
             return this.cachedRefreshToken;
-        const refreshToken = StorageUtils.getLocalData(this.headerTokenField, '');
-        if (refreshToken === '')
-            return null;
-        return refreshToken;
+        return StorageUtils.getLocalData(this.headerTokenField);
     }
     /**
      * Get all regions
@@ -790,6 +836,8 @@ export class CoreApp {
      */
     userLogin(user, refreshToken, keep) {
         this.userData = user;
+        // Cache the encrypted serverside device id
+        StorageUtils.setLocalData(this.serversideDeviceIdField, user.deviceId);
         if (keep) {
             this.authorize(user.token, refreshToken);
         }

package/lib/mjs/dto/InitCallDto.d.ts

@@ -6,6 +6,10 @@ export declare type InitCallDto = {
      * Device id
      */
     deviceId?: string;
+    /**
+     * Serverside identifier
+     */
+    identifier?: string;
     /**
      * Timestamp
      */

package/lib/mjs/state/User.d.ts

@@ -3,6 +3,10 @@ import { IState } from './State';
  * User data interface
  */
 export interface IUserData {
+    /**
+     * Serverside device id encrypted
+     */
+    readonly deviceId: string;
     /**
      * User name
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.85",
+    "version": "1.1.86",
     "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.0.94",
-        "@etsoo/restclient": "^1.0.62",
-        "@etsoo/shared": "^1.0.78",
+        "@etsoo/notificationbase": "^1.0.95",
+        "@etsoo/restclient": "^1.0.63",
+        "@etsoo/shared": "^1.0.82",
         "@types/crypto-js": "^4.0.2",
         "crypto-js": "^4.1.1"
     },
@@ -65,8 +65,8 @@
         "@babel/preset-env": "^7.16.5",
         "@babel/runtime-corejs3": "^7.16.5",
         "@types/jest": "^27.0.3",
-        "@typescript-eslint/eslint-plugin": "^5.7.0",
-        "@typescript-eslint/parser": "^5.7.0",
+        "@typescript-eslint/eslint-plugin": "^5.8.0",
+        "@typescript-eslint/parser": "^5.8.0",
         "eslint": "^8.5.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.3",

package/src/app/CoreApp.ts

@@ -313,7 +313,7 @@ export interface ICoreApp<
      * Get cached token
      * @returns Cached token
      */
-    getCacheToken(): string | null;
+    getCacheToken(): string | undefined;
 
     /**
      * Get all regions
@@ -499,7 +499,7 @@ export abstract class CoreApp<
         return this._region;
     }
 
-    private _deviceId: string = '***';
+    private _deviceId: string = '';
     /**
      * Country or region, like CN
      */
@@ -517,20 +517,37 @@ export abstract class CoreApp<
         return this.get.bind(this);
     }
 
+    private _ipData?: IPData;
     /**
      * IP data
      */
-    ipData?: IPData;
+    get ipData() {
+        return this._ipData;
+    }
+    protected set ipData(value: IPData | undefined) {
+        this._ipData = value;
+    }
 
+    private _userData?: IUserData;
     /**
      * User data
      */
-    userData?: IUserData;
+    get userData() {
+        return this._userData;
+    }
+    protected set userData(value: IUserData | undefined) {
+        this._userData = value;
+    }
 
     /**
      * Response token header field name
      */
-    headerTokenField = 'SmartERPRefreshToken';
+    readonly headerTokenField = 'SmartERPRefreshToken';
+
+    /**
+     * Serverside device id encrypted field name
+     */
+    protected readonly serversideDeviceIdField = 'SmartERPServersideDeviceId';
 
     // IP detect ready callbacks
     private ipDetectCallbacks?: IDetectIPCallback[];
@@ -567,7 +584,13 @@ export abstract class CoreApp<
     /**
      * Device id field name
      */
-    protected deviceIdField: string = 'SmartERPDeviceId';
+    protected readonly deviceIdField: string = 'SmartERPDeviceId';
+
+    /**
+     * Device id update time field name
+     */
+    protected readonly deviceIdUpdateTimeField: string =
+        'SmartERPDeviceIdUpdateTime';
 
     /**
      * Init call Api URL
@@ -657,15 +680,43 @@ export abstract class CoreApp<
         return await this.api.put<InitCallResult>(this.initCallApi, data);
     }
 
+    /**
+     * Get device last updte miliseconds
+     * @returns Miliseconds
+     */
+    protected getDeviceUpdateTime() {
+        return StorageUtils.getLocalData(this.deviceIdUpdateTimeField, 0);
+    }
+
     /**
      * Init call
      * @param callback Callback
      * @returns Result
      */
     async initCall(callback?: (result: boolean) => void) {
+        // Device
+        let hasDeviceId = this.deviceId != null && this.deviceId !== '';
+        const timestamp = new Date().getTime();
+        const lastTimestamp = this.getDeviceUpdateTime();
+        if (
+            hasDeviceId &&
+            lastTimestamp > 0 &&
+            timestamp - lastTimestamp <= 1296000000
+        ) {
+            // When deviceId is there and less than 15 days = 1000 * 60 * 60 * 24 * 15
+            if (callback) callback(true);
+            return;
+        }
+
+        // Serverside encrypted device id
+        const identifier = StorageUtils.getLocalData<string>(
+            this.serversideDeviceIdField
+        );
+
         const data: InitCallDto = {
-            timestamp: new Date().getTime(),
-            deviceId: this.deviceId === '' ? undefined : this.deviceId
+            timestamp,
+            identifier,
+            deviceId: hasDeviceId ? this.deviceId : undefined
         };
         const result = await this.apiInitCall(data);
         if (result == null) {
@@ -725,6 +776,7 @@ export abstract class CoreApp<
         // Update device id and cache it
         this.deviceId = data.deviceId;
         StorageUtils.setLocalData(this.deviceIdField, this.deviceId);
+        StorageUtils.setLocalData(this.deviceIdUpdateTimeField, timestamp);
 
         // Current passphrase
         this.passphrase = passphrase;
@@ -1192,18 +1244,10 @@ export abstract class CoreApp<
      * Get cached token
      * @returns Cached token
      */
-    getCacheToken(): string | null {
+    getCacheToken(): string | undefined {
         // Temp refresh token
         if (this.cachedRefreshToken) return this.cachedRefreshToken;
-
-        const refreshToken = StorageUtils.getLocalData<string>(
-            this.headerTokenField,
-            ''
-        );
-
-        if (refreshToken === '') return null;
-
-        return refreshToken;
+        return StorageUtils.getLocalData<string>(this.headerTokenField);
     }
 
     /**
@@ -1442,6 +1486,9 @@ export abstract class CoreApp<
     userLogin(user: IUserData, refreshToken: string, keep?: boolean) {
         this.userData = user;
 
+        // Cache the encrypted serverside device id
+        StorageUtils.setLocalData(this.serversideDeviceIdField, user.deviceId);
+
         if (keep) {
             this.authorize(user.token, refreshToken);
         } else {

package/src/dto/InitCallDto.ts

@@ -7,6 +7,11 @@ export type InitCallDto = {
      */
     deviceId?: string;
 
+    /**
+     * Serverside identifier
+     */
+    identifier?: string;
+
     /**
      * Timestamp
      */

package/src/state/User.ts

@@ -4,6 +4,11 @@ import { IState } from './State';
  * User data interface
  */
 export interface IUserData {
+    /**
+     * Serverside device id encrypted
+     */
+    readonly deviceId: string;
+
     /**
      * User name
      */