@etsoo/appscript 1.1.67 → 1.1.71

package/src/app/CoreApp.ts

@@ -28,8 +28,10 @@ import {
 } from 'crypto-js';
 import { AddressRegion } from '../address/AddressRegion';
 import { AddressUtils } from '../address/AddressUtils';
+import { InitCallDto } from '../dto/InitCallDto';
 import { ActionResultError } from '../result/ActionResultError';
 import { IActionResult } from '../result/IActionResult';
+import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
 import { IUserData } from '../state/User';
 import { IAppSettings } from './AppSettings';
 import { UserRole } from './UserRole';
@@ -140,11 +142,6 @@ export interface ICoreApp<
      */
     userData?: IUserData;
 
-    /**
-     * Passphrase for encryption
-     */
-    passphrase?: string;
-
     /**
      * Search input element
      */
@@ -182,7 +179,20 @@ export interface ICoreApp<
      * @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
@@ -197,7 +207,20 @@ export interface ICoreApp<
      * @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
@@ -309,6 +332,14 @@ export interface ICoreApp<
      */
     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
@@ -316,6 +347,13 @@ export interface ICoreApp<
      */
     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
      */
@@ -457,11 +495,6 @@ export abstract class CoreApp<
      */
     userData?: IUserData;
 
-    /**
-     * Passphrase for encryption
-     */
-    passphrase?: string;
-
     /**
      * Response token header field name
      */
@@ -499,6 +532,21 @@ export abstract class CoreApp<
      */
     protected refreshCountdownSeed = 0;
 
+    /**
+     * Device id field name
+     */
+    protected deviceIdField: string = 'SmartERPDeviceId';
+
+    /**
+     * Device id
+     */
+    protected deviceId: string;
+
+    /**
+     * Passphrase for encryption
+     */
+    protected passphrase: string = '***';
+
     /**
      * Protected constructor
      * @param settings Settings
@@ -517,6 +565,11 @@ export abstract class CoreApp<
         this.notifier = notifier;
         this.name = name;
 
+        this.deviceId = StorageUtils.getLocalData<string>(
+            this.deviceIdField,
+            ''
+        );
+
         this.setApi(api);
 
         const { currentCulture, currentRegion } = settings;
@@ -561,6 +614,116 @@ export abstract class CoreApp<
         };
     }
 
+    /**
+     * Init call
+     * @param callback Callback
+     * @returns Result
+     */
+    async initCall(callback?: (result: boolean) => void) {
+        const data: InitCallDto = {
+            timestamp: new Date().getTime(),
+            deviceId: this.deviceId === '' ? undefined : this.deviceId
+        };
+        const result = await this.api.put<InitCallResult>(
+            'Auth/WebInitCall',
+            data
+        );
+        if (result == null) {
+            if (callback) callback(false);
+            return;
+        }
+
+        if (result.data == null) {
+            this.notifier.alert(this.get<string>('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 = this.get('timeDifferenceInvalid')?.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
+     */
+    protected initCallUpdate(data: InitCallResultData, timestamp: number) {
+        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<string>(
+                    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
+     */
+    protected initCallUpdateFields(): string[] {
+        return [];
+    }
+
     /**
      * Alert action result
      * @param result Action result
@@ -678,28 +841,20 @@ export abstract class CoreApp<
      * @param passphrase Secret passphrase
      * @returns Pure text
      */
-    decrypt(messageEncrypted: string, passphrase: string) {
-        // Timestamp splitter
-        const pos = messageEncrypted.indexOf('+');
-        const timestamp = messageEncrypted.substring(0, pos);
-        const message = messageEncrypted.substring(pos + 1);
-
+    decrypt(messageEncrypted: string, passphrase?: string) {
         // Iterations
-        const iterations = parseInt(message.substring(0, 2), 10);
+        const iterations = parseInt(messageEncrypted.substring(0, 2), 10);
+        if (isNaN(iterations)) return undefined;
 
-        const salt = enc.Hex.parse(message.substring(2, 34));
-        const iv = enc.Hex.parse(message.substring(34, 66));
-        const encrypted = message.substring(66);
+        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(
-            this.encryptionEnhance(passphrase, timestamp),
-            salt,
-            {
-                keySize: 8, // 256 / 32
-                hasher: algo.SHA256,
-                iterations: 1000 * iterations
-            }
-        );
+        const key = PBKDF2(passphrase ?? this.passphrase, salt, {
+            keySize: 8, // 256 / 32
+            hasher: algo.SHA256,
+            iterations: 1000 * iterations
+        });
 
         return AES.decrypt(encrypted, key, {
             iv,
@@ -708,6 +863,46 @@ export abstract class CoreApp<
         }).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: string,
+        passphrase?: string,
+        durationSeconds?: number
+    ) {
+        // 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 ?? 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
@@ -755,29 +950,20 @@ export abstract class CoreApp<
      * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    encrypt(message: string, passphrase: string, iterations?: number) {
+    encrypt(message: string, passphrase?: string, iterations?: number) {
         // Default 1 * 1000
         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,
-            {
-                keySize: 8, // 256 / 32
-                hasher: algo.SHA256,
-                iterations: 1000 * iterations
-            }
-        );
+        const key = PBKDF2(passphrase ?? this.passphrase, salt, {
+            keySize: 8, // 256 / 32
+            hasher: algo.SHA256,
+            iterations: 1000 * iterations
+        });
         const iv = lib.WordArray.random(bits);
 
         return (
-            timestamp +
-            '+' +
             iterations.toString().padStart(2, '0') +
             salt.toString(enc.Hex) +
             iv.toString(enc.Hex) +
@@ -789,6 +975,25 @@ export abstract class CoreApp<
         );
     }
 
+    /**
+     * 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) {
+        // Timestamp
+        const timestamp = Utils.numberToChars(new Date().getTime());
+
+        passphrase = this.encryptionEnhance(
+            passphrase ?? this.passphrase,
+            timestamp
+        );
+
+        return timestamp + '+' + this.encrypt(message, passphrase, iterations);
+    }
+
     /**
      * Enchance secret passphrase
      * @param passphrase Secret passphrase
@@ -798,7 +1003,7 @@ export abstract class CoreApp<
     protected encryptionEnhance(passphrase: string, timestamp: string) {
         passphrase += timestamp;
         passphrase += passphrase.length.toString();
-        return passphrase + (this.passphrase ?? '');
+        return passphrase;
     }
 
     /**
@@ -880,7 +1085,18 @@ export abstract class CoreApp<
      * @param forceToLocal Force to local labels
      */
     formatResult(result: IActionResult, forceToLocal?: boolean) {
-        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);
         }
@@ -918,7 +1134,10 @@ export abstract class CoreApp<
      * @returns Cached token
      */
     getCacheToken(): string | null {
-        let refreshToken = StorageUtils.getLocalData(this.headerTokenField, '');
+        let refreshToken = StorageUtils.getLocalData<string>(
+            this.headerTokenField,
+            ''
+        );
         if (refreshToken === '')
             refreshToken = StorageUtils.getSessionData(
                 this.headerTokenField,
@@ -971,6 +1190,18 @@ export abstract 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: string, passphrase?: string) {
+        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
@@ -1139,7 +1370,6 @@ export abstract class CoreApp<
      */
     userLogin(user: IUserData, refreshToken: string, keep: boolean = false) {
         this.userData = user;
-        this.passphrase = user.passphrase;
         this.authorize(user.token, refreshToken, keep);
     }
 

package/src/dto/InitCallDto.ts

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

package/src/index.ts

@@ -27,6 +27,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

package/src/result/IActionResult.ts

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

package/src/result/InitCallResult.ts

@@ -1,23 +1,33 @@
 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;
 }
 
 /**

package/src/state/User.ts

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