@etsoo/appscript 1.1.64 → 1.1.68

package/src/app/CoreApp.ts

@@ -15,11 +15,23 @@ import {
     StorageUtils,
     Utils
 } from '@etsoo/shared';
-import { AES } from 'crypto-js';
+import {
+    AES,
+    algo,
+    enc,
+    HmacSHA512,
+    lib,
+    mode,
+    pad,
+    PBKDF2,
+    SHA3
+} 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';
@@ -130,11 +142,6 @@ export interface ICoreApp<
      */
     userData?: IUserData;
 
-    /**
-     * Passphrase for encryption
-     */
-    passphrase?: string;
-
     /**
      * Search input element
      */
@@ -170,9 +177,14 @@ export interface ICoreApp<
      * Decrypt message
      * @param messageEncrypted Encrypted message
      * @param passphrase Secret passphrase
+     * @param durationSeconds Duration seconds, <= 12 will be considered as month
      * @returns Pure text
      */
-    decrypt(messageEncrypted: string, passphrase: string): string;
+    decrypt(
+        messageEncrypted: string,
+        passphrase?: string,
+        durationSeconds?: number
+    ): string | undefined;
 
     /**
      * Detect IP data, call only one time
@@ -184,9 +196,10 @@ export interface ICoreApp<
      * Encrypt message
      * @param message Message
      * @param passphrase Secret passphrase
+     * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    encrypt(message: string, passphrase: string): string;
+    encrypt(message: string, passphrase?: string, iterations?: number): string;
 
     /**
      * Format date to string
@@ -290,6 +303,22 @@ export interface ICoreApp<
      */
     getTimeZone(): string | undefined;
 
+    /**
+     * Hash message, SHA3 or HmacSHA512, 512 as Base64
+     * https://cryptojs.gitbook.io/docs/
+     * @param message Message
+     * @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
@@ -438,11 +467,6 @@ export abstract class CoreApp<
      */
     userData?: IUserData;
 
-    /**
-     * Passphrase for encryption
-     */
-    passphrase?: string;
-
     /**
      * Response token header field name
      */
@@ -480,6 +504,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
@@ -498,6 +537,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;
@@ -542,6 +586,108 @@ export abstract class CoreApp<
         };
     }
 
+    /**
+     * Init call
+     * @returns Result
+     */
+    protected async initCall() {
+        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) return;
+
+        if (result.data == null) {
+            this.notifier.alert(this.get<string>('noData')!);
+            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);
+            }
+
+            return;
+        }
+
+        this.initCallUpdate(result.data, data.timestamp);
+    }
+
+    /**
+     * 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(),
+            120
+        );
+        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(),
+                120
+            );
+
+            // 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.decrypt(currentValue, prev, 12);
+                if (newValueSource == null) continue;
+
+                const newValue = this.encrypt(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
@@ -657,16 +803,57 @@ export abstract class CoreApp<
      * Decrypt message
      * @param messageEncrypted Encrypted message
      * @param passphrase Secret passphrase
+     * @param durationSeconds Duration seconds, <= 12 will be considered as month
      * @returns Pure text
      */
-    decrypt(messageEncrypted: string, passphrase: string) {
+    decrypt(
+        messageEncrypted: string,
+        passphrase?: string,
+        durationSeconds?: number
+    ) {
+        // Timestamp splitter
         const pos = messageEncrypted.indexOf('+');
-        const miliseconds = messageEncrypted.substring(0, pos);
+        if (pos === -1 || messageEncrypted.length <= 66) return undefined;
+
+        const timestamp = messageEncrypted.substring(0, pos);
         const message = messageEncrypted.substring(pos + 1);
-        return AES.decrypt(
-            message,
-            this.encryptionEnhance(passphrase, miliseconds)
-        ).toString();
+
+        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;
+        }
+
+        // Iterations
+        const iterations = parseInt(message.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 key = PBKDF2(
+            this.encryptionEnhance(passphrase ?? this.passphrase, timestamp),
+            salt,
+            {
+                keySize: 8, // 256 / 32
+                hasher: algo.SHA256,
+                iterations: 1000 * iterations
+            }
+        );
+
+        return AES.decrypt(encrypted, key, {
+            iv,
+            padding: pad.Pkcs7,
+            mode: mode.CBC
+        }).toString(enc.Utf8);
     }
 
     /**
@@ -713,30 +900,53 @@ export abstract class CoreApp<
      * Encrypt message
      * @param message Message
      * @param passphrase Secret passphrase
+     * @param iterations Iterations, 1000 times, 1 - 99
      * @returns Result
      */
-    encrypt(message: string, passphrase: string) {
-        const miliseconds = Utils.numberToChars(new Date().getTime());
+    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 ?? this.passphrase, timestamp),
+            salt,
+            {
+                keySize: 8, // 256 / 32
+                hasher: algo.SHA256,
+                iterations: 1000 * iterations
+            }
+        );
+        const iv = lib.WordArray.random(bits);
+
         return (
-            miliseconds +
+            timestamp +
             '+' +
-            AES.encrypt(
-                message,
-                this.encryptionEnhance(passphrase, miliseconds)
-            ).toString()
+            iterations.toString().padStart(2, '0') +
+            salt.toString(enc.Hex) +
+            iv.toString(enc.Hex) +
+            AES.encrypt(message, key, {
+                iv,
+                padding: pad.Pkcs7,
+                mode: mode.CBC
+            }).toString() // enc.Base64
         );
     }
 
     /**
      * Enchance secret passphrase
      * @param passphrase Secret passphrase
-     * @param miliseconds Miliseconds
+     * @param timestamp Timestamp
      * @returns Enhanced passphrase
      */
-    protected encryptionEnhance(passphrase: string, miliseconds: string) {
-        passphrase += miliseconds;
+    protected encryptionEnhance(passphrase: string, timestamp: string) {
+        passphrase += timestamp;
         passphrase += passphrase.length.toString();
-        return passphrase + (this.passphrase ?? '');
+        return passphrase;
     }
 
     /**
@@ -818,7 +1028,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);
         }
@@ -856,7 +1077,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,
@@ -897,6 +1121,30 @@ export abstract class CoreApp<
         return this.settings.timeZone ?? this.ipData?.timezone;
     }
 
+    /**
+     * Hash message, SHA3 or HmacSHA512, 512 as Base64
+     * https://cryptojs.gitbook.io/docs/
+     * @param message Message
+     * @param passphrase Secret passphrase
+     */
+    hash(message: string, passphrase?: string) {
+        if (passphrase == null)
+            return SHA3(message, { outputLength: 512 }).toString(enc.Base64);
+        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

package/src/dto/InitCallDto.ts

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

package/src/i18n/en-US.json

@@ -59,6 +59,7 @@
     "status": "Status",
     "submit": "Submit",
     "success": "Success",
+    "timeDifferenceInvalid": "The time difference between the device and the server is {0}, which exceeds the limit of {1} seconds. Please adjust the device time. If it is abnormal, please inform the administrator",
     "tokenExpiry": "Your session is about to expire. Click the Cancel button to continue",
     "yes": "Yes",
     "unknownError": "Unknown Error",

package/src/i18n/zh-CN.json

@@ -59,6 +59,7 @@
     "status": "状态",
     "submit": "提交",
     "success": "成功",
+    "timeDifferenceInvalid": "设备时间和服务器时间差为{0}，超过{1}秒的限制，请调整设备时间，如果异常请告知管理员",
     "tokenExpiry": "您的会话即将过期。点击 取消 按钮继续使用",
     "yes": "是",
     "unknownError": "未知错误",

package/src/i18n/zh-HK.json

@@ -59,6 +59,7 @@
     "status": "狀態",
     "submit": "提交",
     "success": "成功",
+    "timeDifferenceInvalid": "設備時間和服務器時間差為{0}，超過{1}秒的限制，請調整設備時間，如果異常請告知管理員",
     "tokenExpiry": "您的會話即將過期。點擊 取消 按鈕繼續使用",
     "yes": "是",
     "unknownError": "未知錯誤",

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
@@ -42,6 +43,7 @@ export type { IApi, IApiPayload } from '@etsoo/restclient';
 export * from './result/ActionResult';
 export * from './result/ActionResultError';
 export * from './result/IActionResult';
+export * from './result/InitCallResult';
 
 // state
 export * from './state/Culture';

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

@@ -0,0 +1,36 @@
+import { IActionResult, IResultData } from './IActionResult';
+
+/**
+ * Init call result data
+ */
+export interface InitCallResultData extends IResultData {
+    /**
+     * Device id
+     */
+    deviceId?: string;
+
+    /**
+     * Secret passphrase
+     */
+    passphrase?: string;
+
+    /**
+     * Previous secret passphrase
+     */
+    previousPassphrase?: string;
+
+    /**
+     * Actual seconds gap
+     */
+    seconds?: number;
+
+    /**
+     * Valid seconds gap
+     */
+    validSeconds?: number;
+}
+
+/**
+ * Init call result
+ */
+export type InitCallResult = IActionResult<InitCallResultData>;