@etsoo/react 1.3.69 → 1.3.71

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,9 +13,9 @@ 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
      */
@@ -30,12 +30,6 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
      * @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
      */

package/lib/app/ServiceApp.js

@@ -21,28 +21,20 @@ export class ServiceApp extends ReactApp {
          */
         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=' +
@@ -96,7 +88,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,
@@ -127,7 +119,7 @@ export class ServiceApp extends ReactApp {
             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 +135,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) {
@@ -233,10 +225,11 @@ export class ServiceApp extends ReactApp {
         // Service user login
         this.servicePassphrase =
             (_a = this.decrypt(user.serviceDeviceId, this.settings.serviceId.toString())) !== null && _a !== void 0 ? _a : '';
-        super.userLogin(user, refreshToken, false);
+        // Keep = true, means service could hold the refresh token for long access
+        super.userLogin(user, refreshToken, true);
         // Core system user
         this.coreUser = coreUser;
-        // Core system API token
-        this.coreApi.authorize(this.settings.authScheme, coreUser.token);
+        // Service API token
+        this.serviceApi.authorize(this.settings.authScheme, coreUser.token);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.69",
+    "version": "1.3.71",
     "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/ServiceApp.ts

@@ -2,8 +2,6 @@ import {
     createClient,
     IApi,
     IApiPayload,
-    InitCallDto,
-    InitCallResult,
     RefreshTokenProps,
     RefreshTokenResult
 } from '@etsoo/appscript';
@@ -28,9 +26,9 @@ 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
@@ -51,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=' +
@@ -145,7 +134,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(
@@ -186,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
@@ -210,12 +199,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;
 
@@ -336,12 +324,14 @@ export class ServiceApp<
                 user.serviceDeviceId,
                 this.settings.serviceId.toString()
             ) ?? '';
-        super.userLogin(user, refreshToken, false);
+
+        // Keep = true, means service could hold the refresh token for long access
+        super.userLogin(user, refreshToken, true);
 
         // Core system user
         this.coreUser = coreUser;
 
-        // Core system API token
-        this.coreApi.authorize(this.settings.authScheme, coreUser.token);
+        // Service API token
+        this.serviceApi.authorize(this.settings.authScheme, coreUser.token);
     }
 }