@etsoo/appscript 1.1.67 → 1.1.71

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

@@ -3,6 +3,7 @@ import { ApiDataError, IApi, IPData } from '@etsoo/restclient';
 import { DataTypes, DateUtils } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { IActionResult } from '../result/IActionResult';
+import { InitCallResultData } from '../result/InitCallResult';
 import { IUserData } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';
@@ -87,10 +88,6 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * User data
      */
     userData?: IUserData;
-    /**
-     * Passphrase for encryption
-     */
-    passphrase?: string;
     /**
      * Search input element
      */
@@ -123,7 +120,15 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param passphrase Secret passphrase
      * @returns Pure text
      */
-    decrypt(messageEncrypted: string, passphrase: string): string;
+    decrypt(messageEncrypted: string, passphrase?: string): string | undefined;
+    /**
+     * Enhanced decrypt message
+     * @param messageEncrypted Encrypted message
+     * @param passphrase Secret passphrase
+     * @param durationSeconds Duration seconds, <= 12 will be considered as month
+     * @returns Pure text
+     */
+    decryptEnhanced(messageEncrypted: string, passphrase?: string, durationSeconds?: number): string | undefined;
     /**
      * Detect IP data, call only one time
      * @param callback Callback will be called when the IP is ready
@@ -136,7 +141,15 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    encrypt(message: string, passphrase: string, iterations?: number): string;
+    encrypt(message: string, passphrase?: string, iterations?: number): string;
+    /**
+     * Enhanced encrypt message
+     * @param message Message
+     * @param passphrase Secret passphrase
+     * @param iterations Iterations, 1000 times, 1 - 99
+     * @returns Result
+     */
+    encryptEnhanced(message: string, passphrase?: string, iterations?: number): string;
     /**
      * Format date to string
      * @param input Input date
@@ -224,12 +237,25 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param passphrase Secret passphrase
      */
     hash(message: string, passphrase?: string): string;
+    /**
+     * Hash message Hex, SHA3 or HmacSHA512, 512 as Base64
+     * https://cryptojs.gitbook.io/docs/
+     * @param message Message
+     * @param passphrase Secret passphrase
+     */
+    hashHex(message: string, passphrase?: string): string;
     /**
      * Check use has the specific role permission or not
      * @param roles Roles to check
      * @returns Result
      */
     hasPermission(roles: number | UserRole | number[] | UserRole[]): boolean;
+    /**
+     * Init call
+     * @param callback Callback
+     * @returns Result
+     */
+    initCall(callback?: (result: boolean) => void): Promise<void>;
     /**
      * Callback where exit a page
      */
@@ -335,10 +361,6 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * User data
      */
     userData?: IUserData;
-    /**
-     * Passphrase for encryption
-     */
-    passphrase?: string;
     /**
      * Response token header field name
      */
@@ -363,6 +385,18 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * Token refresh count down seed
      */
     protected refreshCountdownSeed: number;
+    /**
+     * Device id field name
+     */
+    protected deviceIdField: string;
+    /**
+     * Device id
+     */
+    protected deviceId: string;
+    /**
+     * Passphrase for encryption
+     */
+    protected passphrase: string;
     /**
      * Protected constructor
      * @param settings Settings
@@ -372,6 +406,23 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      */
     protected constructor(settings: S, api: IApi, notifier: INotifier<N, C>, name: string);
     protected setApi(api: IApi): void;
+    /**
+     * Init call
+     * @param callback Callback
+     * @returns Result
+     */
+    initCall(callback?: (result: boolean) => void): Promise<void>;
+    /**
+     * Init call update
+     * @param data Result data
+     * @param timestamp Timestamp
+     */
+    protected initCallUpdate(data: InitCallResultData, timestamp: number): void;
+    /**
+     * Init call update fields in local storage
+     * @returns Fields
+     */
+    protected initCallUpdateFields(): string[];
     /**
      * Alert action result
      * @param result Action result
@@ -400,7 +451,15 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param passphrase Secret passphrase
      * @returns Pure text
      */
-    decrypt(messageEncrypted: string, passphrase: string): string;
+    decrypt(messageEncrypted: string, passphrase?: string): string | undefined;
+    /**
+     * Enhanced decrypt message
+     * @param messageEncrypted Encrypted message
+     * @param passphrase Secret passphrase
+     * @param durationSeconds Duration seconds, <= 12 will be considered as month
+     * @returns Pure text
+     */
+    decryptEnhanced(messageEncrypted: string, passphrase?: string, durationSeconds?: number): string | undefined;
     /**
      * Detect IP data, call only one time
      * @param callback Callback will be called when the IP is ready
@@ -414,7 +473,15 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    encrypt(message: string, passphrase: string, iterations?: number): string;
+    encrypt(message: string, passphrase?: string, iterations?: number): string;
+    /**
+     * Enhanced encrypt message
+     * @param message Message
+     * @param passphrase Secret passphrase
+     * @param iterations Iterations, 1000 times, 1 - 99
+     * @returns Result
+     */
+    encryptEnhanced(message: string, passphrase?: string, iterations?: number): string;
     /**
      * Enchance secret passphrase
      * @param passphrase Secret passphrase
@@ -504,6 +571,13 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param passphrase Secret passphrase
      */
     hash(message: string, passphrase?: string): string;
+    /**
+     * Hash message Hex, SHA3 or HmacSHA512, 512 as Base64
+     * https://cryptojs.gitbook.io/docs/
+     * @param message Message
+     * @param passphrase Secret passphrase
+     */
+    hashHex(message: string, passphrase?: string): string;
     /**
      * Check use has the specific role permission or not
      * @param roles Roles to check

package/lib/mjs/app/CoreApp.js

@@ -31,10 +31,19 @@ export class CoreApp {
          * Token refresh count down seed
          */
         this.refreshCountdownSeed = 0;
+        /**
+         * Device id field name
+         */
+        this.deviceIdField = 'SmartERPDeviceId';
+        /**
+         * Passphrase for encryption
+         */
+        this.passphrase = '***';
         this.settings = settings;
         this.api = api;
         this.notifier = notifier;
         this.name = name;
+        this.deviceId = StorageUtils.getLocalData(this.deviceIdField, '');
         this.setApi(api);
         const { currentCulture, currentRegion } = settings;
         this.changeCulture(currentCulture);
@@ -105,6 +114,91 @@ export class CoreApp {
             }
         };
     }
+    /**
+     * Init call
+     * @param callback Callback
+     * @returns Result
+     */
+    async initCall(callback) {
+        var _a;
+        const data = {
+            timestamp: new Date().getTime(),
+            deviceId: this.deviceId === '' ? undefined : this.deviceId
+        };
+        const result = await this.api.put('Auth/WebInitCall', data);
+        if (result == null) {
+            if (callback)
+                callback(false);
+            return;
+        }
+        if (result.data == null) {
+            this.notifier.alert(this.get('noData'));
+            if (callback)
+                callback(false);
+            return;
+        }
+        if (!result.ok) {
+            const seconds = result.data.seconds;
+            const validSeconds = result.data.validSeconds;
+            if (result.title === 'timeDifferenceInvalid' &&
+                seconds != null &&
+                validSeconds != null) {
+                const title = (_a = this.get('timeDifferenceInvalid')) === null || _a === void 0 ? void 0 : _a.format(seconds.toString(), validSeconds.toString());
+                this.notifier.alert(title);
+            }
+            else {
+                this.alertResult(result);
+            }
+            if (callback)
+                callback(false);
+            return;
+        }
+        this.initCallUpdate(result.data, data.timestamp);
+        if (callback)
+            callback(true);
+    }
+    /**
+     * Init call update
+     * @param data Result data
+     * @param timestamp Timestamp
+     */
+    initCallUpdate(data, timestamp) {
+        if (data.deviceId == null || data.passphrase == null)
+            return;
+        // Decrypt
+        // Should be done within 120 seconds after returning from the backend
+        const passphrase = this.decrypt(data.passphrase, timestamp.toString());
+        if (passphrase == null)
+            return;
+        // Update device id and cache it
+        this.deviceId = data.deviceId;
+        StorageUtils.setLocalData(this.deviceIdField, this.deviceId);
+        // Current passphrase
+        this.passphrase = passphrase;
+        // Previous passphrase
+        if (data.previousPassphrase) {
+            const prev = this.decrypt(data.previousPassphrase, timestamp.toString());
+            // Update
+            const fields = this.initCallUpdateFields();
+            for (const field of fields) {
+                const currentValue = StorageUtils.getLocalData(field, '');
+                if (currentValue === '' || currentValue.indexOf('+') === -1)
+                    continue;
+                const newValueSource = this.decryptEnhanced(currentValue, prev, 12);
+                if (newValueSource == null)
+                    continue;
+                const newValue = this.encryptEnhanced(newValueSource);
+                StorageUtils.setLocalData(field, newValue);
+            }
+        }
+    }
+    /**
+     * Init call update fields in local storage
+     * @returns Fields
+     */
+    initCallUpdateFields() {
+        return [];
+    }
     /**
      * Alert action result
      * @param result Action result
@@ -200,16 +294,14 @@ export class CoreApp {
      * @returns Pure text
      */
     decrypt(messageEncrypted, passphrase) {
-        // Timestamp splitter
-        const pos = messageEncrypted.indexOf('+');
-        const timestamp = messageEncrypted.substring(0, pos);
-        const message = messageEncrypted.substring(pos + 1);
         // Iterations
-        const iterations = parseInt(message.substring(0, 2), 10);
-        const salt = enc.Hex.parse(message.substring(2, 34));
-        const iv = enc.Hex.parse(message.substring(34, 66));
-        const encrypted = message.substring(66);
-        const key = PBKDF2(this.encryptionEnhance(passphrase, timestamp), salt, {
+        const iterations = parseInt(messageEncrypted.substring(0, 2), 10);
+        if (isNaN(iterations))
+            return undefined;
+        const salt = enc.Hex.parse(messageEncrypted.substring(2, 34));
+        const iv = enc.Hex.parse(messageEncrypted.substring(34, 66));
+        const encrypted = messageEncrypted.substring(66);
+        const key = PBKDF2(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, salt, {
             keySize: 8,
             hasher: algo.SHA256,
             iterations: 1000 * iterations
@@ -220,6 +312,34 @@ export class CoreApp {
             mode: mode.CBC
         }).toString(enc.Utf8);
     }
+    /**
+     * Enhanced decrypt message
+     * @param messageEncrypted Encrypted message
+     * @param passphrase Secret passphrase
+     * @param durationSeconds Duration seconds, <= 12 will be considered as month
+     * @returns Pure text
+     */
+    decryptEnhanced(messageEncrypted, passphrase, durationSeconds) {
+        // Timestamp splitter
+        const pos = messageEncrypted.indexOf('+');
+        if (pos === -1 || messageEncrypted.length <= 66)
+            return undefined;
+        const timestamp = messageEncrypted.substring(0, pos);
+        if (durationSeconds != null && durationSeconds > 0) {
+            const milseconds = Utils.charsToNumber(timestamp);
+            if (isNaN(milseconds) || milseconds < 1)
+                return undefined;
+            const timespan = new Date().substract(new Date(milseconds));
+            if ((durationSeconds <= 12 &&
+                timespan.totalMonths > durationSeconds) ||
+                (durationSeconds > 12 &&
+                    timespan.totalSeconds > durationSeconds))
+                return undefined;
+        }
+        const message = messageEncrypted.substring(pos + 1);
+        passphrase = this.encryptionEnhance(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, timestamp);
+        return this.decrypt(message, passphrase);
+    }
     /**
      * Detect IP data, call only one time
      * @param callback Callback will be called when the IP is ready
@@ -263,19 +383,15 @@ export class CoreApp {
     encrypt(message, passphrase, iterations) {
         // Default 1 * 1000
         iterations !== null && iterations !== void 0 ? iterations : (iterations = 1);
-        // Timestamp
-        const timestamp = Utils.numberToChars(new Date().getTime());
         const bits = 16; // 128 / 8
         const salt = lib.WordArray.random(bits);
-        const key = PBKDF2(this.encryptionEnhance(passphrase, timestamp), salt, {
+        const key = PBKDF2(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, salt, {
             keySize: 8,
             hasher: algo.SHA256,
             iterations: 1000 * iterations
         });
         const iv = lib.WordArray.random(bits);
-        return (timestamp +
-            '+' +
-            iterations.toString().padStart(2, '0') +
+        return (iterations.toString().padStart(2, '0') +
             salt.toString(enc.Hex) +
             iv.toString(enc.Hex) +
             AES.encrypt(message, key, {
@@ -285,6 +401,19 @@ export class CoreApp {
             }).toString() // enc.Base64
         );
     }
+    /**
+     * Enhanced encrypt message
+     * @param message Message
+     * @param passphrase Secret passphrase
+     * @param iterations Iterations, 1000 times, 1 - 99
+     * @returns Result
+     */
+    encryptEnhanced(message, passphrase, iterations) {
+        // Timestamp
+        const timestamp = Utils.numberToChars(new Date().getTime());
+        passphrase = this.encryptionEnhance(passphrase !== null && passphrase !== void 0 ? passphrase : this.passphrase, timestamp);
+        return timestamp + '+' + this.encrypt(message, passphrase, iterations);
+    }
     /**
      * Enchance secret passphrase
      * @param passphrase Secret passphrase
@@ -292,10 +421,9 @@ export class CoreApp {
      * @returns Enhanced passphrase
      */
     encryptionEnhance(passphrase, timestamp) {
-        var _a;
         passphrase += timestamp;
         passphrase += passphrase.length.toString();
-        return passphrase + ((_a = this.passphrase) !== null && _a !== void 0 ? _a : '');
+        return passphrase;
     }
     /**
      * Format date to string
@@ -357,7 +485,19 @@ export class CoreApp {
      * @param forceToLocal Force to local labels
      */
     formatResult(result, forceToLocal) {
-        if ((result.title == null || forceToLocal) && result.type != null) {
+        const title = result.title;
+        if (title && /^\w+$/.test(title)) {
+            const key = title.formatInitial(false);
+            const localTitle = this.get(key);
+            if (localTitle) {
+                result.title = localTitle;
+                // Hold the original title in type when type is null
+                if (result.type == null)
+                    result.type = title;
+            }
+        }
+        else if ((title == null || forceToLocal) && result.type != null) {
+            // Get label from type
             const key = result.type.formatInitial(false);
             result.title = this.get(key);
         }
@@ -435,6 +575,18 @@ export class CoreApp {
         else
             return HmacSHA512(message, passphrase).toString(enc.Base64);
     }
+    /**
+     * Hash message Hex, SHA3 or HmacSHA512, 512 as Base64
+     * https://cryptojs.gitbook.io/docs/
+     * @param message Message
+     * @param passphrase Secret passphrase
+     */
+    hashHex(message, passphrase) {
+        if (passphrase == null)
+            return SHA3(message, { outputLength: 512 }).toString(enc.Hex);
+        else
+            return HmacSHA512(message, passphrase).toString(enc.Hex);
+    }
     /**
      * Check use has the specific role permission or not
      * @param roles Roles to check
@@ -584,7 +736,6 @@ export class CoreApp {
      */
     userLogin(user, refreshToken, keep = false) {
         this.userData = user;
-        this.passphrase = user.passphrase;
         this.authorize(user.token, refreshToken, keep);
     }
     /**

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

@@ -0,0 +1,13 @@
+/**
+ * Init call dto
+ */
+export declare type InitCallDto = {
+    /**
+     * Device id
+     */
+    deviceId?: string;
+    /**
+     * Timestamp
+     */
+    timestamp: number;
+};

package/lib/mjs/dto/InitCallDto.js

@@ -0,0 +1 @@
+export {};

package/lib/mjs/index.d.ts

@@ -16,6 +16,7 @@ export * from './def/ListItem';
 export * from './dto/IdDto';
 export * from './dto/IdLabelDto';
 export * from './dto/IdLabelPrimaryDto';
+export * from './dto/InitCallDto';
 export * from './dto/UpdateDto';
 export * from './i18n/enUS';
 export * from './i18n/zhCN';

package/lib/mjs/index.js

@@ -22,6 +22,7 @@ export * from './def/ListItem';
 export * from './dto/IdDto';
 export * from './dto/IdLabelDto';
 export * from './dto/IdLabelPrimaryDto';
+export * from './dto/InitCallDto';
 export * from './dto/UpdateDto';
 // i18n
 export * from './i18n/enUS';

package/lib/mjs/result/IActionResult.d.ts

@@ -48,11 +48,11 @@ export interface IActionResult<D extends IResultData = IResultData> {
     /**
      * Trace id
      */
-    readonly traceId?: string;
+    traceId?: string;
     /**
      * Type
      */
-    readonly type: string;
+    type: string;
     /**
      * Success or not
      */

package/lib/mjs/result/InitCallResult.d.ts

@@ -1,20 +1,28 @@
 import { IActionResult, IResultData } from './IActionResult';
 /**
- * Result data with id, follow this style to extend for specific model
+ * Init call result data
  */
 export interface InitCallResultData extends IResultData {
+    /**
+     * Device id
+     */
+    deviceId?: string;
     /**
      * Secret passphrase
      */
-    passphrase: string;
+    passphrase?: string;
+    /**
+     * Previous secret passphrase
+     */
+    previousPassphrase?: string;
     /**
      * Actual seconds gap
      */
-    seconds: number;
+    seconds?: number;
     /**
      * Valid seconds gap
      */
-    validSeconds: number;
+    validSeconds?: number;
 }
 /**
  * Init call result

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

@@ -27,10 +27,6 @@ export interface IUserData {
      * Access token
      */
     readonly token: string;
-    /**
-     * Secret passphrase
-     */
-    readonly passphrase: string;
 }
 /**
  * User interface

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.67",
+    "version": "1.1.71",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -70,8 +70,8 @@
         "eslint": "^8.4.1",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.3",
-        "jest": "^27.4.3",
-        "ts-jest": "^27.1.0",
-        "typescript": "^4.5.2"
+        "jest": "^27.4.4",
+        "ts-jest": "^27.1.1",
+        "typescript": "^4.5.3"
     }
 }