@etsoo/react 1.3.38 → 1.3.42

package/lib/app/RefreshTokenRQ.d.ts

@@ -6,6 +6,10 @@ export declare type RefreshTokenRQ = {
      * Service id
      */
     serviceId?: number;
+    /**
+     * Service Uid
+     */
+    serviceUid?: string;
     /**
      * Time zone
      */

package/lib/app/ServiceApp.d.ts

@@ -1,9 +1,10 @@
-import { IApi } from '@etsoo/appscript';
-import { ISmartERPUser } from '..';
+import { IApi, RefreshTokenProps } from '@etsoo/appscript';
 import { IServiceAppSettings } from './IServiceAppSettings';
 import { IServicePageData } from './IServicePage';
 import { IServiceUser } from './IServiceUser';
+import { ISmartERPUser } from './ISmartERPUser';
 import { ReactApp } from './ReactApp';
+import { RefreshTokenRQ } from './RefreshTokenRQ';
 /**
  * Core Service App
  * Service login to core system, get the refesh token and access token
@@ -29,6 +30,15 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
      * Go to the login page
      */
     toLoginPage(): void;
+    /**
+     * Refresh token
+     * @param props Props
+     */
+    refreshToken<D = RefreshTokenRQ>(props?: RefreshTokenProps<D>): Promise<boolean>;
+    /**
+     * Try login
+     */
+    tryLogin(): Promise<boolean>;
     /**
      * User login extended
      * @param user New user

package/lib/app/ServiceApp.js

@@ -1,5 +1,6 @@
 import { createClient } from '@etsoo/appscript';
 import { DomUtils } from '@etsoo/shared';
+import { CoreConstants } from './CoreConstants';
 import { ReactApp } from './ReactApp';
 /**
  * Core Service App
@@ -29,7 +30,7 @@ export class ServiceApp extends ReactApp {
      * Go to the login page
      */
     toLoginPage() {
-        const coreUrl = this.settings.coreApi;
+        const coreUrl = this.settings.coreUrl;
         window.location.href =
             coreUrl +
                 '?serviceId=' +
@@ -39,6 +40,97 @@ export class ServiceApp extends ReactApp {
                 '=' +
                 this.culture;
     }
+    /**
+     * Refresh token
+     * @param props Props
+     */
+    async refreshToken(props) {
+        // Destruct
+        const { callback, data, showLoading = false } = props !== null && props !== void 0 ? props : {};
+        // Token
+        const token = this.getCacheToken();
+        if (token == null || token === '') {
+            if (callback)
+                callback(false);
+            return false;
+        }
+        // Reqest data
+        // Merge additional data passed
+        const rq = {
+            timezone: this.getTimeZone(),
+            ...data
+        };
+        // Payload
+        const payload = {
+            showLoading,
+            config: { headers: { [CoreConstants.TokenHeaderRefresh]: token } },
+            onError: (error) => {
+                if (callback)
+                    callback(error);
+                // Prevent further processing
+                return false;
+            }
+        };
+        // Call API
+        const result = await this.coreApi.put('Auth/RefreshToken', rq, payload);
+        if (result == null)
+            return false;
+        if (!result.ok) {
+            if (callback)
+                callback(result);
+            return false;
+        }
+        // Token
+        const refreshToken = this.getResponseToken(payload.response);
+        if (refreshToken == null || result.data == null) {
+            if (callback)
+                callback(this.get('noData'));
+            return false;
+        }
+        // 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
+        }, {
+            showLoading,
+            onError: (error) => {
+                if (callback)
+                    callback(error);
+                // Prevent further processing
+                return false;
+            }
+        });
+        if (serviceResult == null)
+            return false;
+        if (!serviceResult.ok) {
+            if (callback)
+                callback(serviceResult);
+            return false;
+        }
+        if (serviceResult.data == null) {
+            if (callback)
+                callback(this.get('noData'));
+            return false;
+        }
+        this.userLoginEx(serviceResult.data, refreshToken, userData);
+        return true;
+    }
+    /**
+     * Try login
+     */
+    async tryLogin() {
+        // Reset user state
+        const result = await super.tryLogin();
+        if (!result)
+            return false;
+        // Refresh token
+        return await this.refreshToken({
+            callback: (_result) => {
+                this.toLoginPage();
+            }
+        });
+    }
     /**
      * User login extended
      * @param user New user

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.38",
+    "version": "1.3.42",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,7 +50,7 @@
         "@emotion/react": "^11.7.0",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.1.53",
+        "@etsoo/appscript": "^1.1.56",
         "@etsoo/notificationbase": "^1.0.94",
         "@etsoo/shared": "^1.0.75",
         "@mui/icons-material": "^5.2.0",
@@ -83,7 +83,7 @@
         "@types/react-test-renderer": "^17.0.1",
         "@typescript-eslint/eslint-plugin": "^5.5.0",
         "@typescript-eslint/parser": "^5.5.0",
-        "eslint": "^8.3.0",
+        "eslint": "^8.4.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.3",
         "eslint-plugin-react": "^7.27.1",

package/src/app/RefreshTokenRQ.ts

@@ -7,6 +7,11 @@ export type RefreshTokenRQ = {
      */
     serviceId?: number;
 
+    /**
+     * Service Uid
+     */
+    serviceUid?: string;
+
     /**
      * Time zone
      */

package/src/app/ServiceApp.ts

@@ -1,10 +1,17 @@
-import { createClient, IApi } from '@etsoo/appscript';
+import {
+    createClient,
+    IApi,
+    IApiPayload,
+    RefreshTokenProps
+} from '@etsoo/appscript';
 import { DomUtils } from '@etsoo/shared';
-import { ISmartERPUser } from '..';
+import { CoreConstants } from './CoreConstants';
 import { IServiceAppSettings } from './IServiceAppSettings';
 import { IServicePageData } from './IServicePage';
-import { IServiceUser } from './IServiceUser';
+import { IServiceUser, ServiceLoginResult } from './IServiceUser';
+import { ISmartERPUser, SmartERPLoginResult } from './ISmartERPUser';
 import { ReactApp } from './ReactApp';
+import { RefreshTokenRQ } from './RefreshTokenRQ';
 
 /**
  * Core Service App
@@ -52,7 +59,7 @@ export class ServiceApp<
      * Go to the login page
      */
     override toLoginPage() {
-        const coreUrl = this.settings.coreApi;
+        const coreUrl = this.settings.coreUrl;
         window.location.href =
             coreUrl +
             '?serviceId=' +
@@ -63,6 +70,115 @@ export class ServiceApp<
             this.culture;
     }
 
+    /**
+     * Refresh token
+     * @param props Props
+     */
+    override async refreshToken<D = RefreshTokenRQ>(
+        props?: RefreshTokenProps<D>
+    ) {
+        // Destruct
+        const { callback, data, showLoading = false } = props ?? {};
+
+        // Token
+        const token = this.getCacheToken();
+        if (token == null || token === '') {
+            if (callback) callback(false);
+            return false;
+        }
+
+        // Reqest data
+        // Merge additional data passed
+        const rq: RefreshTokenRQ = {
+            timezone: this.getTimeZone(),
+            ...data
+        };
+
+        // Payload
+        const payload: IApiPayload<SmartERPLoginResult, any> = {
+            showLoading,
+            config: { headers: { [CoreConstants.TokenHeaderRefresh]: token } },
+            onError: (error) => {
+                if (callback) callback(error);
+
+                // Prevent further processing
+                return false;
+            }
+        };
+
+        // Call API
+        const result = await this.coreApi.put<SmartERPLoginResult>(
+            'Auth/RefreshToken',
+            rq,
+            payload
+        );
+        if (result == null) return false;
+
+        if (!result.ok) {
+            if (callback) callback(result);
+            return false;
+        }
+
+        // Token
+        const refreshToken = this.getResponseToken(payload.response);
+        if (refreshToken == null || result.data == null) {
+            if (callback) callback(this.get('noData')!);
+            return false;
+        }
+
+        // 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<ServiceLoginResult>(
+            'Auth/ExchangeToken',
+            {
+                token: userData.token
+            },
+            {
+                showLoading,
+                onError: (error) => {
+                    if (callback) callback(error);
+
+                    // Prevent further processing
+                    return false;
+                }
+            }
+        );
+
+        if (serviceResult == null) return false;
+
+        if (!serviceResult.ok) {
+            if (callback) callback(serviceResult);
+            return false;
+        }
+
+        if (serviceResult.data == null) {
+            if (callback) callback(this.get('noData')!);
+            return false;
+        }
+
+        this.userLoginEx(serviceResult.data, refreshToken, userData);
+
+        return true;
+    }
+
+    /**
+     * Try login
+     */
+    override async tryLogin() {
+        // Reset user state
+        const result = await super.tryLogin();
+        if (!result) return false;
+
+        // Refresh token
+        return await this.refreshToken({
+            callback: (_result) => {
+                this.toLoginPage();
+            }
+        });
+    }
+
     /**
      * User login extended
      * @param user New user