@etsoo/react 1.3.65 → 1.3.69

package/lib/app/IServiceUser.d.ts

@@ -3,6 +3,10 @@ import { IActionResult, IUser } from '@etsoo/appscript';
  * Service user interface
  */
 export interface IServiceUser extends IUser {
+    /**
+     * Service device id
+     */
+    serviceDeviceId: string;
 }
 /**
  * Service user login result

package/lib/app/ReactApp.d.ts

@@ -144,8 +144,9 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
      * @param user New user
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
+     * @param dispatch User state dispatch
      */
-    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean, dispatch?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/app/ReactApp.js

@@ -210,12 +210,13 @@ export class ReactApp extends CoreApp {
      * @param user New user
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
+     * @param dispatch User state dispatch
      */
-    userLogin(user, refreshToken, keep) {
+    userLogin(user, refreshToken, keep, dispatch) {
         // Super call, set token
         super.userLogin(user, refreshToken, keep);
         // Dispatch action
-        if (this.userStateDispatch != null)
+        if (this.userStateDispatch != null && dispatch !== false)
             this.userStateDispatch({
                 type: UserActionType.Login,
                 user

package/lib/app/ServiceApp.d.ts

@@ -20,6 +20,10 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
      * Core system user
      */
     coreUser?: ISmartERPUser;
+    /**
+     * Service passphrase
+     */
+    servicePassphrase: string;
     /**
      * Constructor
      * @param settings Settings
@@ -42,6 +46,21 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
      */
     refreshToken<D = RefreshTokenRQ>(props?: RefreshTokenProps<D>): Promise<boolean>;
     private loginFailed;
+    /**
+     * Service decrypt message
+     * @param messageEncrypted Encrypted message
+     * @param passphrase Secret passphrase
+     * @returns Pure text
+     */
+    serviceDecrypt(messageEncrypted: string, passphrase?: string): string | undefined;
+    /**
+     * Service encrypt message
+     * @param message Message
+     * @param passphrase Secret passphrase
+     * @param iterations Iterations, 1000 times, 1 - 99
+     * @returns Result
+     */
+    serviceEncrypt(message: string, passphrase?: string, iterations?: number): string;
     /**
      * Try login
      */

package/lib/app/ServiceApp.js

@@ -16,6 +16,10 @@ export class ServiceApp extends ReactApp {
      */
     constructor(settings, name) {
         super(settings, name);
+        /**
+         * Service passphrase
+         */
+        this.servicePassphrase = '';
         // Check
         if (settings.serviceId == null || settings.coreApi == null) {
             throw new Error('No service settings');
@@ -93,7 +97,7 @@ export class ServiceApp extends ReactApp {
             const userData = result.data;
             // Use core system access token to service api to exchange service access token
             const serviceResult = await this.api.put('Auth/ExchangeToken', {
-                token: userData.token
+                token: this.encryptEnhanced(userData.token, this.settings.serviceId.toString())
             }, {
                 showLoading,
                 onError: (error) => {
@@ -115,7 +119,11 @@ export class ServiceApp extends ReactApp {
                     failCallback(this.get('noData'));
                 return false;
             }
+            // Login
             this.userLoginEx(serviceResult.data, refreshToken, userData);
+            // Success callback
+            if (failCallback)
+                failCallback(true);
             return true;
         };
         // Call API
@@ -133,13 +141,18 @@ export class ServiceApp extends ReactApp {
                         return;
                     }
                     // Set password for the action
-                    rq.pwd = this.encrypt(pwd, this.settings.serviceId.toString());
+                    rq.pwd = this.encrypt(this.hash(pwd));
                     // Submit again
-                    const result = await this.api.put('Auth/RefreshToken', data, payload);
+                    const result = await this.coreApi.put('Auth/RefreshToken', rq, payload);
                     if (result == null)
                         return;
                     if (result.ok) {
                         await success(result, (loginResult) => {
+                            if (loginResult === true) {
+                                if (callback)
+                                    callback(true);
+                                return;
+                            }
                             const message = this.formatRefreshTokenResult(loginResult);
                             if (message)
                                 this.notifier.alert(message);
@@ -163,6 +176,25 @@ export class ServiceApp extends ReactApp {
         this.userUnauthorized();
         this.toLoginPage();
     }
+    /**
+     * Service decrypt message
+     * @param messageEncrypted Encrypted message
+     * @param passphrase Secret passphrase
+     * @returns Pure text
+     */
+    serviceDecrypt(messageEncrypted, passphrase) {
+        return this.decrypt(messageEncrypted, passphrase !== null && passphrase !== void 0 ? passphrase : this.servicePassphrase);
+    }
+    /**
+     * Service encrypt message
+     * @param message Message
+     * @param passphrase Secret passphrase
+     * @param iterations Iterations, 1000 times, 1 - 99
+     * @returns Result
+     */
+    serviceEncrypt(message, passphrase, iterations) {
+        return this.encrypt(message, passphrase !== null && passphrase !== void 0 ? passphrase : this.servicePassphrase, iterations);
+    }
     /**
      * Try login
      */
@@ -174,6 +206,9 @@ export class ServiceApp extends ReactApp {
         // Refresh token
         return await this.refreshToken({
             callback: (result) => {
+                // Success
+                if (result === true)
+                    return;
                 const message = this.formatRefreshTokenResult(result);
                 if (message == null) {
                     this.loginFailed();
@@ -194,7 +229,10 @@ export class ServiceApp extends ReactApp {
      * @param coreUser Core system user
      */
     userLoginEx(user, refreshToken, coreUser) {
+        var _a;
         // Service user login
+        this.servicePassphrase =
+            (_a = this.decrypt(user.serviceDeviceId, this.settings.serviceId.toString())) !== null && _a !== void 0 ? _a : '';
         super.userLogin(user, refreshToken, false);
         // Core system user
         this.coreUser = coreUser;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.65",
+    "version": "1.3.69",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,7 +50,7 @@
         "@emotion/react": "^11.7.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.1.82",
+        "@etsoo/appscript": "^1.1.83",
         "@etsoo/notificationbase": "^1.0.94",
         "@etsoo/shared": "^1.0.78",
         "@mui/icons-material": "^5.2.4",

package/src/app/IServiceUser.ts

@@ -3,7 +3,12 @@ import { IActionResult, IUser } from '@etsoo/appscript';
 /**
  * Service user interface
  */
-export interface IServiceUser extends IUser {}
+export interface IServiceUser extends IUser {
+    /**
+     * Service device id
+     */
+    serviceDeviceId: string;
+}
 
 /**
  * Service user login result

package/src/app/ReactApp.ts

@@ -353,17 +353,19 @@ export class ReactApp<
      * @param user New user
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
+     * @param dispatch User state dispatch
      */
     override userLogin(
         user: IUserData,
         refreshToken: string,
-        keep?: boolean
+        keep?: boolean,
+        dispatch?: boolean
     ): void {
         // Super call, set token
         super.userLogin(user, refreshToken, keep);
 
         // Dispatch action
-        if (this.userStateDispatch != null)
+        if (this.userStateDispatch != null && dispatch !== false)
             this.userStateDispatch({
                 type: UserActionType.Login,
                 user

package/src/app/ServiceApp.ts

@@ -37,6 +37,11 @@ export class ServiceApp<
      */
     coreUser?: ISmartERPUser;
 
+    /**
+     * Service passphrase
+     */
+    servicePassphrase: string = '';
+
     /**
      * Constructor
      * @param settings Settings
@@ -143,7 +148,10 @@ export class ServiceApp<
             const serviceResult = await this.api.put<ServiceLoginResult>(
                 'Auth/ExchangeToken',
                 {
-                    token: userData.token
+                    token: this.encryptEnhanced(
+                        userData.token,
+                        this.settings.serviceId.toString()
+                    )
                 },
                 {
                     showLoading,
@@ -168,8 +176,12 @@ export class ServiceApp<
                 return false;
             }
 
+            // Login
             this.userLoginEx(serviceResult.data, refreshToken, userData);
 
+            // Success callback
+            if (failCallback) failCallback(true);
+
             return true;
         };
 
@@ -195,17 +207,15 @@ export class ServiceApp<
                         }
 
                         // Set password for the action
-                        rq.pwd = this.encrypt(
-                            pwd,
-                            this.settings.serviceId.toString()
-                        );
+                        rq.pwd = this.encrypt(this.hash(pwd));
 
                         // Submit again
-                        const result = await this.api.put<SmartERPLoginResult>(
-                            'Auth/RefreshToken',
-                            data,
-                            payload
-                        );
+                        const result =
+                            await this.coreApi.put<SmartERPLoginResult>(
+                                'Auth/RefreshToken',
+                                rq,
+                                payload
+                            );
 
                         if (result == null) return;
 
@@ -213,6 +223,11 @@ export class ServiceApp<
                             await success(
                                 result,
                                 (loginResult: RefreshTokenResult) => {
+                                    if (loginResult === true) {
+                                        if (callback) callback(true);
+                                        return;
+                                    }
+
                                     const message =
                                         this.formatRefreshTokenResult(
                                             loginResult
@@ -247,6 +262,34 @@ export class ServiceApp<
         this.toLoginPage();
     }
 
+    /**
+     * Service decrypt message
+     * @param messageEncrypted Encrypted message
+     * @param passphrase Secret passphrase
+     * @returns Pure text
+     */
+    serviceDecrypt(messageEncrypted: string, passphrase?: string) {
+        return this.decrypt(
+            messageEncrypted,
+            passphrase ?? this.servicePassphrase
+        );
+    }
+
+    /**
+     * Service encrypt message
+     * @param message Message
+     * @param passphrase Secret passphrase
+     * @param iterations Iterations, 1000 times, 1 - 99
+     * @returns Result
+     */
+    serviceEncrypt(message: string, passphrase?: string, iterations?: number) {
+        return this.encrypt(
+            message,
+            passphrase ?? this.servicePassphrase,
+            iterations
+        );
+    }
+
     /**
      * Try login
      */
@@ -258,6 +301,9 @@ export class ServiceApp<
         // Refresh token
         return await this.refreshToken({
             callback: (result) => {
+                // Success
+                if (result === true) return;
+
                 const message = this.formatRefreshTokenResult(result);
                 if (message == null) {
                     this.loginFailed();
@@ -285,6 +331,11 @@ export class ServiceApp<
         coreUser: ISmartERPUser
     ): void {
         // Service user login
+        this.servicePassphrase =
+            this.decrypt(
+                user.serviceDeviceId,
+                this.settings.serviceId.toString()
+            ) ?? '';
         super.userLogin(user, refreshToken, false);
 
         // Core system user