@etsoo/appscript 1.1.61 → 1.1.65

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

@@ -4,6 +4,7 @@ exports.CoreApp = void 0;
 const notificationbase_1 = require("@etsoo/notificationbase");
 const restclient_1 = require("@etsoo/restclient");
 const shared_1 = require("@etsoo/shared");
+const crypto_js_1 = require("crypto-js");
 const AddressRegion_1 = require("../address/AddressRegion");
 const AddressUtils_1 = require("../address/AddressUtils");
 const ActionResultError_1 = require("../result/ActionResultError");
@@ -202,7 +203,10 @@ class CoreApp {
      * @returns Pure text
      */
     decrypt(messageEncrypted, passphrase) {
-        return CryptoJS.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
@@ -244,19 +248,22 @@ class CoreApp {
      * @returns Result
      */
     encrypt(message, passphrase) {
-        return CryptoJS.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
@@ -533,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/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,7 @@
 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';
 import { ActionResultError } from '../result/ActionResultError';
@@ -199,7 +200,10 @@ export class CoreApp {
      * @returns Pure text
      */
     decrypt(messageEncrypted, passphrase) {
-        return CryptoJS.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
@@ -241,19 +245,22 @@ export class CoreApp {
      * @returns Result
      */
     encrypt(message, passphrase) {
-        return CryptoJS.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
@@ -530,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/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.61",
+    "version": "1.1.65",
     "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,8 +12,10 @@ import {
     DateUtils,
     DomUtils,
     NumberUtils,
-    StorageUtils
+    StorageUtils,
+    Utils
 } from '@etsoo/shared';
+import { AES } from 'crypto-js';
 import { AddressRegion } from '../address/AddressRegion';
 import { AddressUtils } from '../address/AddressUtils';
 import { ActionResultError } from '../result/ActionResultError';
@@ -128,6 +130,11 @@ export interface ICoreApp<
      */
     userData?: IUserData;
 
+    /**
+     * Passphrase for encryption
+     */
+    passphrase?: string;
+
     /**
      * Search input element
      */
@@ -431,6 +438,11 @@ export abstract class CoreApp<
      */
     userData?: IUserData;
 
+    /**
+     * Passphrase for encryption
+     */
+    passphrase?: string;
+
     /**
      * Response token header field name
      */
@@ -648,9 +660,12 @@ export abstract class CoreApp<
      * @returns Pure text
      */
     decrypt(messageEncrypted: string, passphrase: string) {
-        return CryptoJS.AES.decrypt(
-            messageEncrypted,
-            this.encryptionEnhance(passphrase)
+        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();
     }
 
@@ -701,22 +716,27 @@ export abstract class CoreApp<
      * @returns Result
      */
     encrypt(message: string, passphrase: string) {
-        return CryptoJS.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 ?? '');
     }
 
     /**
@@ -1045,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/state/User.ts

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