@etsoo/react 1.3.67 → 1.3.68

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/ServiceApp.d.ts

@@ -20,6 +20,10 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
      * Core system user
      */
     coreUser?: ISmartERPUser;
+    /**
+     * Service device id
+     */
+    protected serviceDeviceId: 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 device id
+         */
+        this.serviceDeviceId = '';
         // 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) => {
@@ -139,7 +143,7 @@ export class ServiceApp extends ReactApp {
                     // Set password for the action
                     rq.pwd = this.encrypt(this.hash(pwd));
                     // Submit again
-                    const result = await this.api.put('Auth/RefreshToken', rq, payload);
+                    const result = await this.coreApi.put('Auth/RefreshToken', rq, payload);
                     if (result == null)
                         return;
                     if (result.ok) {
@@ -172,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.serviceDeviceId);
+    }
+    /**
+     * 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.serviceDeviceId, iterations);
+    }
     /**
      * Try login
      */
@@ -207,6 +230,7 @@ export class ServiceApp extends ReactApp {
      */
     userLoginEx(user, refreshToken, coreUser) {
         // Service user login
+        this.serviceDeviceId = user.serviceDeviceId;
         super.userLogin(user, refreshToken, false);
         // Core system user
         this.coreUser = coreUser;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.67",
+    "version": "1.3.68",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

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/ServiceApp.ts

@@ -37,6 +37,11 @@ export class ServiceApp<
      */
     coreUser?: ISmartERPUser;
 
+    /**
+     * Service device id
+     */
+    protected serviceDeviceId: 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,
@@ -202,11 +210,12 @@ export class ServiceApp<
                         rq.pwd = this.encrypt(this.hash(pwd));
 
                         // Submit again
-                        const result = await this.api.put<SmartERPLoginResult>(
-                            'Auth/RefreshToken',
-                            rq,
-                            payload
-                        );
+                        const result =
+                            await this.coreApi.put<SmartERPLoginResult>(
+                                'Auth/RefreshToken',
+                                rq,
+                                payload
+                            );
 
                         if (result == null) return;
 
@@ -253,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.serviceDeviceId
+        );
+    }
+
+    /**
+     * 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.serviceDeviceId,
+            iterations
+        );
+    }
+
     /**
      * Try login
      */
@@ -294,6 +331,7 @@ export class ServiceApp<
         coreUser: ISmartERPUser
     ): void {
         // Service user login
+        this.serviceDeviceId = user.serviceDeviceId;
         super.userLogin(user, refreshToken, false);
 
         // Core system user