@etsoo/react 1.3.67 → 1.3.72

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

@@ -1,4 +1,4 @@
-import { IApi, InitCallDto, InitCallResult, RefreshTokenProps } from '@etsoo/appscript';
+import { IApi, RefreshTokenProps } from '@etsoo/appscript';
 import { IServiceAppSettings } from './IServiceAppSettings';
 import { IServicePageData } from './IServicePage';
 import { IServiceUser } from './IServiceUser';
@@ -13,25 +13,23 @@ import { RefreshTokenRQ } from './RefreshTokenRQ';
  */
 export declare class ServiceApp<P extends IServicePageData = IServicePageData, U extends IServiceUser = IServiceUser, S extends IServiceAppSettings = IServiceAppSettings> extends ReactApp<S, U, P> {
     /**
-     * Core system API
+     * Service API
      */
-    readonly coreApi: IApi;
+    readonly serviceApi: IApi;
     /**
-     * Core system user
+     * Service user
      */
-    coreUser?: ISmartERPUser;
+    serviceUser?: ISmartERPUser;
+    /**
+     * Service passphrase
+     */
+    servicePassphrase: string;
     /**
      * Constructor
      * @param settings Settings
      * @param name Application name
      */
     constructor(settings: S, name: string);
-    /**
-     * Api init call, connect to the core Api
-     * @param data Data
-     * @returns Result
-     */
-    protected apiInitCall(data: InitCallDto): Promise<InitCallResult | undefined>;
     /**
      * Go to the login page
      */
@@ -42,15 +40,30 @@ 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
      */
     tryLogin<D extends {} = {}>(data?: D): Promise<boolean>;
     /**
      * User login extended
-     * @param user New user
+     * @param user Core system user
      * @param refreshToken Refresh token
-     * @param coreUser Core system user
+     * @param serviceUser Service user
      */
-    userLoginEx(user: IServiceUser, refreshToken: string, coreUser: ISmartERPUser): void;
+    userLoginEx(user: ISmartERPUser, refreshToken: string, serviceUser: IServiceUser): void;
 }

package/lib/app/ServiceApp.js

@@ -16,29 +16,25 @@ export class ServiceApp extends ReactApp {
      */
     constructor(settings, name) {
         super(settings, name);
+        /**
+         * Service passphrase
+         */
+        this.servicePassphrase = '';
         // Check
-        if (settings.serviceId == null || settings.coreApi == null) {
+        if (settings.serviceId == null || settings.serviceEndpoint == null) {
             throw new Error('No service settings');
         }
-        // Core API
+        // Service API
         const api = createClient();
-        api.baseUrl = settings.coreApi;
+        api.baseUrl = settings.serviceEndpoint;
         this.setApi(api);
-        this.coreApi = api;
-    }
-    /**
-     * Api init call, connect to the core Api
-     * @param data Data
-     * @returns Result
-     */
-    async apiInitCall(data) {
-        return await this.coreApi.put(this.initCallApi, data);
+        this.serviceApi = api;
     }
     /**
      * Go to the login page
      */
     toLoginPage() {
-        const coreUrl = this.settings.coreUrl;
+        const coreUrl = this.settings.webUrl;
         window.location.href =
             coreUrl +
                 '?serviceId=' +
@@ -92,8 +88,8 @@ export class ServiceApp extends ReactApp {
             // User data
             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
+            const serviceResult = await this.serviceApi.put('Auth/ExchangeToken', {
+                token: this.encryptEnhanced(userData.token, this.settings.serviceId.toString())
             }, {
                 showLoading,
                 onError: (error) => {
@@ -116,14 +112,14 @@ export class ServiceApp extends ReactApp {
                 return false;
             }
             // Login
-            this.userLoginEx(serviceResult.data, refreshToken, userData);
+            this.userLoginEx(userData, refreshToken, serviceResult.data);
             // Success callback
             if (failCallback)
                 failCallback(true);
             return true;
         };
         // Call API
-        const result = await this.coreApi.put('Auth/RefreshToken', rq, payload);
+        const result = await this.api.put('Auth/RefreshToken', rq, payload);
         if (result == null)
             return false;
         if (!result.ok) {
@@ -172,6 +168,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
      */
@@ -201,16 +216,20 @@ export class ServiceApp extends ReactApp {
     }
     /**
      * User login extended
-     * @param user New user
+     * @param user Core system user
      * @param refreshToken Refresh token
-     * @param coreUser Core system user
+     * @param serviceUser Service user
      */
-    userLoginEx(user, refreshToken, coreUser) {
+    userLoginEx(user, refreshToken, serviceUser) {
+        var _a;
         // Service user login
-        super.userLogin(user, refreshToken, false);
-        // Core system user
-        this.coreUser = coreUser;
-        // Core system API token
-        this.coreApi.authorize(this.settings.authScheme, coreUser.token);
+        this.servicePassphrase =
+            (_a = this.decrypt(serviceUser.serviceDeviceId, this.settings.serviceId.toString())) !== null && _a !== void 0 ? _a : '';
+        // Keep = true, means service could hold the refresh token for long access
+        super.userLogin(user, refreshToken, true);
+        // Service user
+        this.serviceUser = serviceUser;
+        // Service API token
+        this.serviceApi.authorize(this.settings.authScheme, serviceUser.token);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.67",
+    "version": "1.3.72",
     "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.83",
+        "@etsoo/appscript": "^1.1.85",
         "@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/ServiceApp.ts

@@ -2,8 +2,6 @@ import {
     createClient,
     IApi,
     IApiPayload,
-    InitCallDto,
-    InitCallResult,
     RefreshTokenProps,
     RefreshTokenResult
 } from '@etsoo/appscript';
@@ -28,14 +26,19 @@ export class ServiceApp<
     S extends IServiceAppSettings = IServiceAppSettings
 > extends ReactApp<S, U, P> {
     /**
-     * Core system API
+     * Service API
      */
-    readonly coreApi: IApi;
+    readonly serviceApi: IApi;
 
     /**
-     * Core system user
+     * Service user
      */
-    coreUser?: ISmartERPUser;
+    serviceUser?: ISmartERPUser;
+
+    /**
+     * Service passphrase
+     */
+    servicePassphrase: string = '';
 
     /**
      * Constructor
@@ -46,32 +49,23 @@ export class ServiceApp<
         super(settings, name);
 
         // Check
-        if (settings.serviceId == null || settings.coreApi == null) {
+        if (settings.serviceId == null || settings.serviceEndpoint == null) {
             throw new Error('No service settings');
         }
 
-        // Core API
+        // Service API
         const api = createClient();
-        api.baseUrl = settings.coreApi;
+        api.baseUrl = settings.serviceEndpoint;
 
         this.setApi(api);
-        this.coreApi = api;
-    }
-
-    /**
-     * Api init call, connect to the core Api
-     * @param data Data
-     * @returns Result
-     */
-    protected override async apiInitCall(data: InitCallDto) {
-        return await this.coreApi.put<InitCallResult>(this.initCallApi, data);
+        this.serviceApi = api;
     }
 
     /**
      * Go to the login page
      */
     override toLoginPage() {
-        const coreUrl = this.settings.coreUrl;
+        const coreUrl = this.settings.webUrl;
         window.location.href =
             coreUrl +
             '?serviceId=' +
@@ -140,10 +134,13 @@ export class ServiceApp<
             const userData = result.data;
 
             // Use core system access token to service api to exchange service access token
-            const serviceResult = await this.api.put<ServiceLoginResult>(
+            const serviceResult = await this.serviceApi.put<ServiceLoginResult>(
                 'Auth/ExchangeToken',
                 {
-                    token: userData.token
+                    token: this.encryptEnhanced(
+                        userData.token,
+                        this.settings.serviceId.toString()
+                    )
                 },
                 {
                     showLoading,
@@ -169,7 +166,7 @@ export class ServiceApp<
             }
 
             // Login
-            this.userLoginEx(serviceResult.data, refreshToken, userData);
+            this.userLoginEx(userData, refreshToken, serviceResult.data);
 
             // Success callback
             if (failCallback) failCallback(true);
@@ -178,7 +175,7 @@ export class ServiceApp<
         };
 
         // Call API
-        const result = await this.coreApi.put<SmartERPLoginResult>(
+        const result = await this.api.put<SmartERPLoginResult>(
             'Auth/RefreshToken',
             rq,
             payload
@@ -253,6 +250,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
      */
@@ -284,22 +309,29 @@ export class ServiceApp<
 
     /**
      * User login extended
-     * @param user New user
+     * @param user Core system user
      * @param refreshToken Refresh token
-     * @param coreUser Core system user
+     * @param serviceUser Service user
      */
     userLoginEx(
-        user: IServiceUser,
+        user: ISmartERPUser,
         refreshToken: string,
-        coreUser: ISmartERPUser
+        serviceUser: IServiceUser
     ): void {
         // Service user login
-        super.userLogin(user, refreshToken, false);
+        this.servicePassphrase =
+            this.decrypt(
+                serviceUser.serviceDeviceId,
+                this.settings.serviceId.toString()
+            ) ?? '';
+
+        // Keep = true, means service could hold the refresh token for long access
+        super.userLogin(user, refreshToken, true);
 
-        // Core system user
-        this.coreUser = coreUser;
+        // Service user
+        this.serviceUser = serviceUser;
 
-        // Core system API token
-        this.coreApi.authorize(this.settings.authScheme, coreUser.token);
+        // Service API token
+        this.serviceApi.authorize(this.settings.authScheme, serviceUser.token);
     }
 }