@etsoo/react 1.3.68 → 1.3.73

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,29 +13,25 @@ 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;
+    private _serviceUser?;
     /**
-     * Core system user
+     * Service user
      */
-    coreUser?: ISmartERPUser;
+    get serviceUser(): IServiceUser | undefined;
+    protected set serviceUser(value: IServiceUser | undefined);
     /**
-     * Service device id
+     * Service passphrase
      */
-    protected serviceDeviceId: string;
+    protected 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
      */
@@ -67,9 +63,9 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
     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

@@ -17,32 +17,33 @@ export class ServiceApp extends ReactApp {
     constructor(settings, name) {
         super(settings, name);
         /**
-         * Service device id
+         * Service passphrase
          */
-        this.serviceDeviceId = '';
+        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;
+        this.serviceApi = api;
     }
     /**
-     * Api init call, connect to the core Api
-     * @param data Data
-     * @returns Result
+     * Service user
      */
-    async apiInitCall(data) {
-        return await this.coreApi.put(this.initCallApi, data);
+    get serviceUser() {
+        return this._serviceUser;
+    }
+    set serviceUser(value) {
+        this._serviceUser = value;
     }
     /**
      * Go to the login page
      */
     toLoginPage() {
-        const coreUrl = this.settings.coreUrl;
+        const coreUrl = this.settings.webUrl;
         window.location.href =
             coreUrl +
                 '?serviceId=' +
@@ -96,7 +97,7 @@ 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', {
+            const serviceResult = await this.serviceApi.put('Auth/ExchangeToken', {
                 token: this.encryptEnhanced(userData.token, this.settings.serviceId.toString())
             }, {
                 showLoading,
@@ -120,14 +121,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) {
@@ -143,7 +144,7 @@ export class ServiceApp extends ReactApp {
                     // Set password for the action
                     rq.pwd = this.encrypt(this.hash(pwd));
                     // Submit again
-                    const result = await this.coreApi.put('Auth/RefreshToken', rq, payload);
+                    const result = await this.api.put('Auth/RefreshToken', rq, payload);
                     if (result == null)
                         return;
                     if (result.ok) {
@@ -183,7 +184,7 @@ export class ServiceApp extends ReactApp {
      * @returns Pure text
      */
     serviceDecrypt(messageEncrypted, passphrase) {
-        return this.decrypt(messageEncrypted, passphrase !== null && passphrase !== void 0 ? passphrase : this.serviceDeviceId);
+        return this.decrypt(messageEncrypted, passphrase !== null && passphrase !== void 0 ? passphrase : this.servicePassphrase);
     }
     /**
      * Service encrypt message
@@ -193,7 +194,7 @@ export class ServiceApp extends ReactApp {
      * @returns Result
      */
     serviceEncrypt(message, passphrase, iterations) {
-        return this.encrypt(message, passphrase !== null && passphrase !== void 0 ? passphrase : this.serviceDeviceId, iterations);
+        return this.encrypt(message, passphrase !== null && passphrase !== void 0 ? passphrase : this.servicePassphrase, iterations);
     }
     /**
      * Try login
@@ -224,17 +225,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
-        this.serviceDeviceId = user.serviceDeviceId;
-        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.68",
+    "version": "1.3.73",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,11 +50,11 @@
         "@emotion/react": "^11.7.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.1.83",
-        "@etsoo/notificationbase": "^1.0.94",
-        "@etsoo/shared": "^1.0.78",
-        "@mui/icons-material": "^5.2.4",
-        "@mui/material": "^5.2.4",
+        "@etsoo/appscript": "^1.1.86",
+        "@etsoo/notificationbase": "^1.0.95",
+        "@etsoo/shared": "^1.0.82",
+        "@mui/icons-material": "^5.2.5",
+        "@mui/material": "^5.2.5",
         "@reach/router": "^1.3.4",
         "@types/pica": "^5.1.3",
         "@types/pulltorefreshjs": "^0.1.5",
@@ -81,8 +81,8 @@
         "@babel/runtime-corejs3": "^7.16.5",
         "@types/jest": "^27.0.3",
         "@types/react-test-renderer": "^17.0.1",
-        "@typescript-eslint/eslint-plugin": "^5.7.0",
-        "@typescript-eslint/parser": "^5.7.0",
+        "@typescript-eslint/eslint-plugin": "^5.8.0",
+        "@typescript-eslint/parser": "^5.8.0",
         "eslint": "^8.5.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.3",

package/src/app/ServiceApp.ts

@@ -2,8 +2,6 @@ import {
     createClient,
     IApi,
     IApiPayload,
-    InitCallDto,
-    InitCallResult,
     RefreshTokenProps,
     RefreshTokenResult
 } from '@etsoo/appscript';
@@ -28,19 +26,25 @@ export class ServiceApp<
     S extends IServiceAppSettings = IServiceAppSettings
 > extends ReactApp<S, U, P> {
     /**
-     * Core system API
+     * Service API
      */
-    readonly coreApi: IApi;
+    readonly serviceApi: IApi;
 
+    private _serviceUser?: IServiceUser;
     /**
-     * Core system user
+     * Service user
      */
-    coreUser?: ISmartERPUser;
+    get serviceUser() {
+        return this._serviceUser;
+    }
+    protected set serviceUser(value: IServiceUser | undefined) {
+        this._serviceUser = value;
+    }
 
     /**
-     * Service device id
+     * Service passphrase
      */
-    protected serviceDeviceId: string = '';
+    protected servicePassphrase: string = '';
 
     /**
      * Constructor
@@ -51,32 +55,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=' +
@@ -145,7 +140,7 @@ 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: this.encryptEnhanced(
@@ -177,7 +172,7 @@ export class ServiceApp<
             }
 
             // Login
-            this.userLoginEx(serviceResult.data, refreshToken, userData);
+            this.userLoginEx(userData, refreshToken, serviceResult.data);
 
             // Success callback
             if (failCallback) failCallback(true);
@@ -186,7 +181,7 @@ export class ServiceApp<
         };
 
         // Call API
-        const result = await this.coreApi.put<SmartERPLoginResult>(
+        const result = await this.api.put<SmartERPLoginResult>(
             'Auth/RefreshToken',
             rq,
             payload
@@ -210,12 +205,11 @@ export class ServiceApp<
                         rq.pwd = this.encrypt(this.hash(pwd));
 
                         // Submit again
-                        const result =
-                            await this.coreApi.put<SmartERPLoginResult>(
-                                'Auth/RefreshToken',
-                                rq,
-                                payload
-                            );
+                        const result = await this.api.put<SmartERPLoginResult>(
+                            'Auth/RefreshToken',
+                            rq,
+                            payload
+                        );
 
                         if (result == null) return;
 
@@ -271,7 +265,7 @@ export class ServiceApp<
     serviceDecrypt(messageEncrypted: string, passphrase?: string) {
         return this.decrypt(
             messageEncrypted,
-            passphrase ?? this.serviceDeviceId
+            passphrase ?? this.servicePassphrase
         );
     }
 
@@ -285,7 +279,7 @@ export class ServiceApp<
     serviceEncrypt(message: string, passphrase?: string, iterations?: number) {
         return this.encrypt(
             message,
-            passphrase ?? this.serviceDeviceId,
+            passphrase ?? this.servicePassphrase,
             iterations
         );
     }
@@ -321,23 +315,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
-        this.serviceDeviceId = user.serviceDeviceId;
-        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);
     }
 }