@etsoo/appscript 1.1.57 → 1.1.61

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

@@ -30,6 +30,10 @@ export interface RefreshTokenProps<D extends {}> {
      * Data to pass
      */
     data?: D;
+    /**
+     * Support relogin or not
+     */
+    relogin?: boolean;
     /**
      * Show loading bar or not
      */
@@ -109,11 +113,25 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param culture New culture definition
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
+    /**
+     * Decrypt message
+     * @param messageEncrypted Encrypted message
+     * @param passphrase Secret passphrase
+     * @returns Pure text
+     */
+    decrypt(messageEncrypted: string, passphrase: string): string;
     /**
      * Detect IP data, call only one time
      * @param callback Callback will be called when the IP is ready
      */
     detectIP(callback?: IDetectIPCallback): void;
+    /**
+     * Encrypt message
+     * @param message Message
+     * @param passphrase Secret passphrase
+     * @returns Result
+     */
+    encrypt(message: string, passphrase: string): string;
     /**
      * Format date to string
      * @param input Input date
@@ -122,6 +140,12 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns string
      */
     formatDate(input?: Date | string, options?: DateUtils.FormatOptions, timeZone?: string): string | undefined;
+    /**
+     * Format error
+     * @param error Error
+     * @returns Error message
+     */
+    formatError(error: ApiDataError): string;
     /**
      * Format money number
      * @param input Input money number
@@ -137,6 +161,12 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns Result
      */
     formatNumber(input?: number | bigint, options?: Intl.NumberFormatOptions): string | undefined;
+    /**
+     * Format refresh token result
+     * @param result Refresh token result
+     * @returns Message
+     */
+    formatRefreshTokenResult(result: RefreshTokenResult): string | undefined;
     /**
      * Format result text
      * @param result Action result
@@ -348,12 +378,32 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param culture New culture definition
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
+    /**
+     * Decrypt message
+     * @param messageEncrypted Encrypted message
+     * @param passphrase Secret passphrase
+     * @returns Pure text
+     */
+    decrypt(messageEncrypted: string, passphrase: string): string;
     /**
      * Detect IP data, call only one time
      * @param callback Callback will be called when the IP is ready
      */
     detectIP(callback?: IDetectIPCallback): void;
     private detectIPCallbacks;
+    /**
+     * Encrypt message
+     * @param message Message
+     * @param passphrase Secret passphrase
+     * @returns Result
+     */
+    encrypt(message: string, passphrase: string): string;
+    /**
+     * Enchance secret passphrase
+     * @param passphrase Secret passphrase
+     * @returns Enhanced passphrase
+     */
+    protected encryptionEnhance(passphrase: string): string;
     /**
      * Format date to string
      * @param input Input date
@@ -383,6 +433,12 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @returns Error message
      */
     formatError(error: ApiDataError): string;
+    /**
+     * Format refresh token result
+     * @param result Refresh token result
+     * @returns Message
+     */
+    formatRefreshTokenResult(result: RefreshTokenResult): string | undefined;
     /**
      * Format result text
      * @param result Action result

package/lib/cjs/app/CoreApp.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CoreApp = void 0;
 const notificationbase_1 = require("@etsoo/notificationbase");
+const restclient_1 = require("@etsoo/restclient");
 const shared_1 = require("@etsoo/shared");
 const AddressRegion_1 = require("../address/AddressRegion");
 const AddressUtils_1 = require("../address/AddressUtils");
@@ -194,6 +195,15 @@ class CoreApp {
                 region.name = AddressUtils_1.AddressUtils.getRegionLabel(id, this.labelDelegate);
         });
     }
+    /**
+     * Decrypt message
+     * @param messageEncrypted Encrypted message
+     * @param passphrase Secret passphrase
+     * @returns Pure text
+     */
+    decrypt(messageEncrypted, passphrase) {
+        return CryptoJS.AES.decrypt(messageEncrypted, this.encryptionEnhance(passphrase)).toString();
+    }
     /**
      * Detect IP data, call only one time
      * @param callback Callback will be called when the IP is ready
@@ -227,6 +237,27 @@ class CoreApp {
         var _a;
         (_a = this.ipDetectCallbacks) === null || _a === void 0 ? void 0 : _a.forEach((f) => f());
     }
+    /**
+     * Encrypt message
+     * @param message Message
+     * @param passphrase Secret passphrase
+     * @returns Result
+     */
+    encrypt(message, passphrase) {
+        return CryptoJS.AES.encrypt(message, this.encryptionEnhance(passphrase)).toString();
+    }
+    /**
+     * Enchance secret passphrase
+     * @param passphrase Secret passphrase
+     * @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;
+    }
     /**
      * Format date to string
      * @param input Input date
@@ -266,6 +297,21 @@ class CoreApp {
     formatError(error) {
         return error.toString();
     }
+    /**
+     * Format refresh token result
+     * @param result Refresh token result
+     * @returns Message
+     */
+    formatRefreshTokenResult(result) {
+        // Undefined for boolean
+        if (typeof result === 'boolean')
+            return undefined;
+        return result instanceof restclient_1.ApiDataError
+            ? this.formatError(result)
+            : typeof result !== 'string'
+                ? ActionResultError_1.ActionResultError.format(result)
+                : result;
+    }
     /**
      * Format result text
      * @param result Action result

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

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

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

@@ -30,6 +30,10 @@ export interface RefreshTokenProps<D extends {}> {
      * Data to pass
      */
     data?: D;
+    /**
+     * Support relogin or not
+     */
+    relogin?: boolean;
     /**
      * Show loading bar or not
      */
@@ -109,11 +113,25 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @param culture New culture definition
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
+    /**
+     * Decrypt message
+     * @param messageEncrypted Encrypted message
+     * @param passphrase Secret passphrase
+     * @returns Pure text
+     */
+    decrypt(messageEncrypted: string, passphrase: string): string;
     /**
      * Detect IP data, call only one time
      * @param callback Callback will be called when the IP is ready
      */
     detectIP(callback?: IDetectIPCallback): void;
+    /**
+     * Encrypt message
+     * @param message Message
+     * @param passphrase Secret passphrase
+     * @returns Result
+     */
+    encrypt(message: string, passphrase: string): string;
     /**
      * Format date to string
      * @param input Input date
@@ -122,6 +140,12 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns string
      */
     formatDate(input?: Date | string, options?: DateUtils.FormatOptions, timeZone?: string): string | undefined;
+    /**
+     * Format error
+     * @param error Error
+     * @returns Error message
+     */
+    formatError(error: ApiDataError): string;
     /**
      * Format money number
      * @param input Input money number
@@ -137,6 +161,12 @@ export interface ICoreApp<S extends IAppSettings, N, C extends NotificationCallP
      * @returns Result
      */
     formatNumber(input?: number | bigint, options?: Intl.NumberFormatOptions): string | undefined;
+    /**
+     * Format refresh token result
+     * @param result Refresh token result
+     * @returns Message
+     */
+    formatRefreshTokenResult(result: RefreshTokenResult): string | undefined;
     /**
      * Format result text
      * @param result Action result
@@ -348,12 +378,32 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @param culture New culture definition
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
+    /**
+     * Decrypt message
+     * @param messageEncrypted Encrypted message
+     * @param passphrase Secret passphrase
+     * @returns Pure text
+     */
+    decrypt(messageEncrypted: string, passphrase: string): string;
     /**
      * Detect IP data, call only one time
      * @param callback Callback will be called when the IP is ready
      */
     detectIP(callback?: IDetectIPCallback): void;
     private detectIPCallbacks;
+    /**
+     * Encrypt message
+     * @param message Message
+     * @param passphrase Secret passphrase
+     * @returns Result
+     */
+    encrypt(message: string, passphrase: string): string;
+    /**
+     * Enchance secret passphrase
+     * @param passphrase Secret passphrase
+     * @returns Enhanced passphrase
+     */
+    protected encryptionEnhance(passphrase: string): string;
     /**
      * Format date to string
      * @param input Input date
@@ -383,6 +433,12 @@ export declare abstract class CoreApp<S extends IAppSettings, N, C extends Notif
      * @returns Error message
      */
     formatError(error: ApiDataError): string;
+    /**
+     * Format refresh token result
+     * @param result Refresh token result
+     * @returns Message
+     */
+    formatRefreshTokenResult(result: RefreshTokenResult): string | undefined;
     /**
      * Format result text
      * @param result Action result

package/lib/mjs/app/CoreApp.js

@@ -1,4 +1,5 @@
 import { NotificationAlign, NotificationMessageType } from '@etsoo/notificationbase';
+import { ApiDataError } from '@etsoo/restclient';
 import { DateUtils, DomUtils, NumberUtils, StorageUtils } from '@etsoo/shared';
 import { AddressRegion } from '../address/AddressRegion';
 import { AddressUtils } from '../address/AddressUtils';
@@ -191,6 +192,15 @@ export class CoreApp {
                 region.name = AddressUtils.getRegionLabel(id, this.labelDelegate);
         });
     }
+    /**
+     * Decrypt message
+     * @param messageEncrypted Encrypted message
+     * @param passphrase Secret passphrase
+     * @returns Pure text
+     */
+    decrypt(messageEncrypted, passphrase) {
+        return CryptoJS.AES.decrypt(messageEncrypted, this.encryptionEnhance(passphrase)).toString();
+    }
     /**
      * Detect IP data, call only one time
      * @param callback Callback will be called when the IP is ready
@@ -224,6 +234,27 @@ export class CoreApp {
         var _a;
         (_a = this.ipDetectCallbacks) === null || _a === void 0 ? void 0 : _a.forEach((f) => f());
     }
+    /**
+     * Encrypt message
+     * @param message Message
+     * @param passphrase Secret passphrase
+     * @returns Result
+     */
+    encrypt(message, passphrase) {
+        return CryptoJS.AES.encrypt(message, this.encryptionEnhance(passphrase)).toString();
+    }
+    /**
+     * Enchance secret passphrase
+     * @param passphrase Secret passphrase
+     * @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;
+    }
     /**
      * Format date to string
      * @param input Input date
@@ -263,6 +294,21 @@ export class CoreApp {
     formatError(error) {
         return error.toString();
     }
+    /**
+     * Format refresh token result
+     * @param result Refresh token result
+     * @returns Message
+     */
+    formatRefreshTokenResult(result) {
+        // Undefined for boolean
+        if (typeof result === 'boolean')
+            return undefined;
+        return result instanceof ApiDataError
+            ? this.formatError(result)
+            : typeof result !== 'string'
+                ? ActionResultError.format(result)
+                : result;
+    }
     /**
      * Format result text
      * @param result Action result

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.1.57",
+    "version": "1.1.61",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",
@@ -54,7 +54,9 @@
     "dependencies": {
         "@etsoo/notificationbase": "^1.0.94",
         "@etsoo/restclient": "^1.0.62",
-        "@etsoo/shared": "^1.0.75"
+        "@etsoo/shared": "^1.0.75",
+        "@types/crypto-js": "^4.0.2",
+        "crypto-js": "^4.1.1"
     },
     "devDependencies": {
         "@babel/cli": "^7.16.0",

package/src/app/CoreApp.ts

@@ -54,6 +54,11 @@ export interface RefreshTokenProps<D extends {}> {
      */
     data?: D;
 
+    /**
+     * Support relogin or not
+     */
+    relogin?: boolean;
+
     /**
      * Show loading bar or not
      */
@@ -154,12 +159,28 @@ export interface ICoreApp<
      */
     changeCulture(culture: DataTypes.CultureDefinition): void;
 
+    /**
+     * Decrypt message
+     * @param messageEncrypted Encrypted message
+     * @param passphrase Secret passphrase
+     * @returns Pure text
+     */
+    decrypt(messageEncrypted: string, passphrase: string): string;
+
     /**
      * Detect IP data, call only one time
      * @param callback Callback will be called when the IP is ready
      */
     detectIP(callback?: IDetectIPCallback): void;
 
+    /**
+     * Encrypt message
+     * @param message Message
+     * @param passphrase Secret passphrase
+     * @returns Result
+     */
+    encrypt(message: string, passphrase: string): string;
+
     /**
      * Format date to string
      * @param input Input date
@@ -173,6 +194,13 @@ export interface ICoreApp<
         timeZone?: string
     ): string | undefined;
 
+    /**
+     * Format error
+     * @param error Error
+     * @returns Error message
+     */
+    formatError(error: ApiDataError): string;
+
     /**
      * Format money number
      * @param input Input money number
@@ -197,6 +225,13 @@ export interface ICoreApp<
         options?: Intl.NumberFormatOptions
     ): string | undefined;
 
+    /**
+     * Format refresh token result
+     * @param result Refresh token result
+     * @returns Message
+     */
+    formatRefreshTokenResult(result: RefreshTokenResult): string | undefined;
+
     /**
      * Format result text
      * @param result Action result
@@ -606,6 +641,19 @@ export abstract class CoreApp<
         });
     }
 
+    /**
+     * Decrypt message
+     * @param messageEncrypted Encrypted message
+     * @param passphrase Secret passphrase
+     * @returns Pure text
+     */
+    decrypt(messageEncrypted: string, passphrase: string) {
+        return CryptoJS.AES.decrypt(
+            messageEncrypted,
+            this.encryptionEnhance(passphrase)
+        ).toString();
+    }
+
     /**
      * Detect IP data, call only one time
      * @param callback Callback will be called when the IP is ready
@@ -646,6 +694,31 @@ export abstract class CoreApp<
         this.ipDetectCallbacks?.forEach((f) => f());
     }
 
+    /**
+     * Encrypt message
+     * @param message Message
+     * @param passphrase Secret passphrase
+     * @returns Result
+     */
+    encrypt(message: string, passphrase: string) {
+        return CryptoJS.AES.encrypt(
+            message,
+            this.encryptionEnhance(passphrase)
+        ).toString();
+    }
+
+    /**
+     * Enchance secret passphrase
+     * @param passphrase Secret passphrase
+     * @returns Enhanced passphrase
+     */
+    protected encryptionEnhance(passphrase: string) {
+        passphrase += passphrase.length;
+        if (this.authorized)
+            return passphrase + (this.userData?.passphrase ?? '');
+        return passphrase;
+    }
+
     /**
      * Format date to string
      * @param input Input date
@@ -703,6 +776,22 @@ export abstract class CoreApp<
         return error.toString();
     }
 
+    /**
+     * Format refresh token result
+     * @param result Refresh token result
+     * @returns Message
+     */
+    formatRefreshTokenResult(result: RefreshTokenResult) {
+        // Undefined for boolean
+        if (typeof result === 'boolean') return undefined;
+
+        return result instanceof ApiDataError
+            ? this.formatError(result)
+            : typeof result !== 'string'
+            ? ActionResultError.format(result)
+            : result;
+    }
+
     /**
      * Format result text
      * @param result Action result

package/src/state/User.ts

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