@etsoo/appscript 1.1.62 → 1.1.66

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

@@ -87,6 +87,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * User data
      */
     userData?: IUserData;
+    /**
+     * Passphrase for encryption
+     */
+    passphrase?: string;
     /**
      * Search input element
      */
@@ -323,6 +327,10 @@ 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
      */
@@ -401,9 +409,10 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     /**
      * Enchance secret passphrase
      * @param passphrase Secret passphrase
+     * @param timestamp Timestamp
      * @returns Enhanced passphrase
      */
-    protected encryptionEnhance(passphrase: string): string;
+    protected encryptionEnhance(passphrase: string, timestamp: string): string;
     /**
      * Format date to string
      * @param input Input date

package/lib/cjs/app/CoreApp.js

@@ -203,7 +203,10 @@ class CoreApp {
      * @returns Pure text
      */
     decrypt(messageEncrypted, passphrase) {
-        return crypto_js_1.AES.decrypt(messageEncrypted, this.encryptionEnhance(passphrase)).toString();
+        const pos = messageEncrypted.indexOf('+');
+        const timestamp = messageEncrypted.substring(0, pos);
+        const message = messageEncrypted.substring(pos + 1);
+        return crypto_js_1.AES.decrypt(message, this.encryptionEnhance(passphrase, timestamp)).toString();
     }
     /**
      * Detect IP data, call only one time
@@ -245,19 +248,22 @@ class CoreApp {
      * @returns Result
      */
     encrypt(message, passphrase) {
-        return crypto_js_1.AES.encrypt(message, this.encryptionEnhance(passphrase)).toString();
+        const timestamp = shared_1.Utils.numberToChars(new Date().getTime());
+        return (timestamp +
+            '+' +
+            crypto_js_1.AES.encrypt(message, this.encryptionEnhance(passphrase, timestamp)).toString());
     }
     /**
      * Enchance secret passphrase
      * @param passphrase Secret passphrase
+     * @param timestamp Timestamp
      * @returns Enhanced passphrase
      */
-    encryptionEnhance(passphrase) {
-        var _a, _b;
-        passphrase += passphrase.length;
-        if (this.authorized)
-            return passphrase + ((_b = (_a = this.userData) === null || _a === void 0 ? void 0 : _a.passphrase) !== null && _b !== void 0 ? _b : '');
-        return passphrase;
+    encryptionEnhance(passphrase, timestamp) {
+        var _a;
+        passphrase += timestamp;
+        passphrase += passphrase.length.toString();
+        return passphrase + ((_a = this.passphrase) !== null && _a !== void 0 ? _a : '');
     }
     /**
      * Format date to string
@@ -534,6 +540,7 @@ class CoreApp {
      */
     userLogin(user, refreshToken, keep = false) {
         this.userData = user;
+        this.passphrase = user.passphrase;
         this.authorize(user.token, refreshToken, keep);
     }
     /**

package/lib/cjs/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/lib/cjs/i18n/zh-CN.json

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

package/lib/cjs/i18n/zh-HK.json

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

package/lib/cjs/index.d.ts

@@ -25,6 +25,7 @@ export type { IApi, IApiPayload } from '@etsoo/restclient';
 export * from './result/ActionResult';
 export * from './result/ActionResultError';
 export * from './result/IActionResult';
+export * from './result/InitCallResult';
 export * from './state/Culture';
 export * from './state/State';
 export * from './state/User';

package/lib/cjs/index.js

@@ -48,6 +48,7 @@ Object.defineProperty(exports, "createClient", { enumerable: true, get: function
 __exportStar(require("./result/ActionResult"), exports);
 __exportStar(require("./result/ActionResultError"), exports);
 __exportStar(require("./result/IActionResult"), exports);
+__exportStar(require("./result/InitCallResult"), exports);
 // state
 __exportStar(require("./state/Culture"), exports);
 __exportStar(require("./state/State"), exports);

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

@@ -0,0 +1,22 @@
+import { IActionResult, IResultData } from './IActionResult';
+/**
+ * Result data with id, follow this style to extend for specific model
+ */
+export interface InitCallResultData extends IResultData {
+    /**
+     * Secret passphrase
+     */
+    passphrase: string;
+    /**
+     * Actual seconds gap
+     */
+    seconds: number;
+    /**
+     * Valid seconds gap
+     */
+    validSeconds: number;
+}
+/**
+ * Init call result
+ */
+export declare type InitCallResult = IActionResult<InitCallResultData>;

package/lib/cjs/result/InitCallResult.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -28,7 +28,7 @@ export interface IUserData {
      */
     readonly token: string;
     /**
-     * Passphrase for encryption
+     * Secret passphrase
      */
     readonly passphrase: string;
 }

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

@@ -87,6 +87,10 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * User data
      */
     userData?: IUserData;
+    /**
+     * Passphrase for encryption
+     */
+    passphrase?: string;
     /**
      * Search input element
      */
@@ -323,6 +327,10 @@ 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
      */
@@ -401,9 +409,10 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
     /**
      * Enchance secret passphrase
      * @param passphrase Secret passphrase
+     * @param timestamp Timestamp
      * @returns Enhanced passphrase
      */
-    protected encryptionEnhance(passphrase: string): string;
+    protected encryptionEnhance(passphrase: string, timestamp: string): string;
     /**
      * Format date to string
      * @param input Input date

package/lib/mjs/app/CoreApp.js

@@ -1,6 +1,6 @@
 import { NotificationAlign, NotificationMessageType } from '@etsoo/notificationbase';
 import { ApiDataError } from '@etsoo/restclient';
-import { DateUtils, DomUtils, NumberUtils, StorageUtils } from '@etsoo/shared';
+import { DateUtils, DomUtils, NumberUtils, StorageUtils, Utils } from '@etsoo/shared';
 import { AES } from 'crypto-js';
 import { AddressRegion } from '../address/AddressRegion';
 import { AddressUtils } from '../address/AddressUtils';
@@ -200,7 +200,10 @@ export class CoreApp {
      * @returns Pure text
      */
     decrypt(messageEncrypted, passphrase) {
-        return AES.decrypt(messageEncrypted, this.encryptionEnhance(passphrase)).toString();
+        const pos = messageEncrypted.indexOf('+');
+        const timestamp = messageEncrypted.substring(0, pos);
+        const message = messageEncrypted.substring(pos + 1);
+        return AES.decrypt(message, this.encryptionEnhance(passphrase, timestamp)).toString();
     }
     /**
      * Detect IP data, call only one time
@@ -242,19 +245,22 @@ export class CoreApp {
      * @returns Result
      */
     encrypt(message, passphrase) {
-        return AES.encrypt(message, this.encryptionEnhance(passphrase)).toString();
+        const timestamp = Utils.numberToChars(new Date().getTime());
+        return (timestamp +
+            '+' +
+            AES.encrypt(message, this.encryptionEnhance(passphrase, timestamp)).toString());
     }
     /**
      * Enchance secret passphrase
      * @param passphrase Secret passphrase
+     * @param timestamp Timestamp
      * @returns Enhanced passphrase
      */
-    encryptionEnhance(passphrase) {
-        var _a, _b;
-        passphrase += passphrase.length;
-        if (this.authorized)
-            return passphrase + ((_b = (_a = this.userData) === null || _a === void 0 ? void 0 : _a.passphrase) !== null && _b !== void 0 ? _b : '');
-        return passphrase;
+    encryptionEnhance(passphrase, timestamp) {
+        var _a;
+        passphrase += timestamp;
+        passphrase += passphrase.length.toString();
+        return passphrase + ((_a = this.passphrase) !== null && _a !== void 0 ? _a : '');
     }
     /**
      * Format date to string
@@ -531,6 +537,7 @@ export class CoreApp {
      */
     userLogin(user, refreshToken, keep = false) {
         this.userData = user;
+        this.passphrase = user.passphrase;
         this.authorize(user.token, refreshToken, keep);
     }
     /**

package/lib/mjs/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/lib/mjs/i18n/zh-CN.json

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

package/lib/mjs/i18n/zh-HK.json

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

package/lib/mjs/index.d.ts

@@ -25,6 +25,7 @@ export type { IApi, IApiPayload } from '@etsoo/restclient';
 export * from './result/ActionResult';
 export * from './result/ActionResultError';
 export * from './result/IActionResult';
+export * from './result/InitCallResult';
 export * from './state/Culture';
 export * from './state/State';
 export * from './state/User';

package/lib/mjs/index.js

@@ -33,6 +33,7 @@ export { ApiAuthorizationScheme, createClient } from '@etsoo/restclient';
 export * from './result/ActionResult';
 export * from './result/ActionResultError';
 export * from './result/IActionResult';
+export * from './result/InitCallResult';
 // state
 export * from './state/Culture';
 export * from './state/State';

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

@@ -0,0 +1,22 @@
+import { IActionResult, IResultData } from './IActionResult';
+/**
+ * Result data with id, follow this style to extend for specific model
+ */
+export interface InitCallResultData extends IResultData {
+    /**
+     * Secret passphrase
+     */
+    passphrase: string;
+    /**
+     * Actual seconds gap
+     */
+    seconds: number;
+    /**
+     * Valid seconds gap
+     */
+    validSeconds: number;
+}
+/**
+ * Init call result
+ */
+export declare type InitCallResult = IActionResult<InitCallResultData>;

package/lib/mjs/result/InitCallResult.js

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

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

@@ -28,7 +28,7 @@ export interface IUserData {
      */
     readonly token: string;
     /**
-     * Passphrase for encryption
+     * Secret passphrase
      */
     readonly passphrase: string;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.62",
+    "version": "1.1.66",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,7 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.0.94",
         "@etsoo/restclient": "^1.0.62",
-        "@etsoo/shared": "^1.0.75",
+        "@etsoo/shared": "^1.0.76",
         "@types/crypto-js": "^4.0.2",
         "crypto-js": "^4.1.1"
     },
@@ -71,7 +71,7 @@
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.3",
         "jest": "^27.4.3",
-        "ts-jest": "^27.0.7",
+        "ts-jest": "^27.1.0",
         "typescript": "^4.5.2"
     }
 }

package/src/app/CoreApp.ts

@@ -12,7 +12,8 @@ import {
     DateUtils,
     DomUtils,
     NumberUtils,
-    StorageUtils
+    StorageUtils,
+    Utils
 } from '@etsoo/shared';
 import { AES } from 'crypto-js';
 import { AddressRegion } from '../address/AddressRegion';
@@ -129,6 +130,11 @@ export interface ICoreApp<
      */
     userData?: IUserData;
 
+    /**
+     * Passphrase for encryption
+     */
+    passphrase?: string;
+
     /**
      * Search input element
      */
@@ -432,6 +438,11 @@ export abstract class CoreApp<
      */
     userData?: IUserData;
 
+    /**
+     * Passphrase for encryption
+     */
+    passphrase?: string;
+
     /**
      * Response token header field name
      */
@@ -649,9 +660,12 @@ export abstract class CoreApp<
      * @returns Pure text
      */
     decrypt(messageEncrypted: string, passphrase: string) {
+        const pos = messageEncrypted.indexOf('+');
+        const timestamp = messageEncrypted.substring(0, pos);
+        const message = messageEncrypted.substring(pos + 1);
         return AES.decrypt(
-            messageEncrypted,
-            this.encryptionEnhance(passphrase)
+            message,
+            this.encryptionEnhance(passphrase, timestamp)
         ).toString();
     }
 
@@ -702,22 +716,27 @@ export abstract class CoreApp<
      * @returns Result
      */
     encrypt(message: string, passphrase: string) {
-        return AES.encrypt(
-            message,
-            this.encryptionEnhance(passphrase)
-        ).toString();
+        const timestamp = Utils.numberToChars(new Date().getTime());
+        return (
+            timestamp +
+            '+' +
+            AES.encrypt(
+                message,
+                this.encryptionEnhance(passphrase, timestamp)
+            ).toString()
+        );
     }
 
     /**
      * Enchance secret passphrase
      * @param passphrase Secret passphrase
+     * @param timestamp Timestamp
      * @returns Enhanced passphrase
      */
-    protected encryptionEnhance(passphrase: string) {
-        passphrase += passphrase.length;
-        if (this.authorized)
-            return passphrase + (this.userData?.passphrase ?? '');
-        return passphrase;
+    protected encryptionEnhance(passphrase: string, timestamp: string) {
+        passphrase += timestamp;
+        passphrase += passphrase.length.toString();
+        return passphrase + (this.passphrase ?? '');
     }
 
     /**
@@ -1046,6 +1065,7 @@ 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/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

@@ -42,6 +42,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/InitCallResult.ts

@@ -0,0 +1,26 @@
+import { IActionResult, IResultData } from './IActionResult';
+
+/**
+ * Result data with id, follow this style to extend for specific model
+ */
+export interface InitCallResultData extends IResultData {
+    /**
+     * Secret passphrase
+     */
+    passphrase: string;
+
+    /**
+     * Actual seconds gap
+     */
+    seconds: number;
+
+    /**
+     * Valid seconds gap
+     */
+    validSeconds: number;
+}
+
+/**
+ * Init call result
+ */
+export type InitCallResult = IActionResult<InitCallResultData>;

package/src/state/User.ts

@@ -35,7 +35,7 @@ export interface IUserData {
     readonly token: string;
 
     /**
-     * Passphrase for encryption
+     * Secret passphrase
      */
     readonly passphrase: string;
 }