@etsoo/react 1.3.41 → 1.3.45

package/lib/app/RefreshTokenRQ.d.ts

@@ -2,6 +2,10 @@
  * Refresh token request data
  */
 export declare type RefreshTokenRQ = {
+    /**
+     * Login password
+     */
+    pwd?: string;
     /**
      * Service id
      */

package/lib/app/ServiceApp.d.ts

@@ -1,10 +1,10 @@
-import { IActionResult, IApi } from '@etsoo/appscript';
-import { ApiDataError } from '@etsoo/restclient';
+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
@@ -31,14 +31,15 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
      */
     toLoginPage(): void;
     /**
-     * Try login result processing
-     * @param result Result
+     * Refresh token
+     * @param props Props
      */
-    protected tryLoginResult(result: string | ApiDataError | IActionResult): void;
+    refreshToken<D = RefreshTokenRQ>(props?: RefreshTokenProps<D>): Promise<boolean>;
+    private loginFailed;
     /**
      * Try login
      */
-    tryLogin(): Promise<boolean>;
+    tryLogin<D extends {} = {}>(data?: D): Promise<boolean>;
     /**
      * User login extended
      * @param user New user

package/lib/app/ServiceApp.js

@@ -41,72 +41,142 @@ export class ServiceApp extends ReactApp {
                 this.culture;
     }
     /**
-     * Try login result processing
-     * @param result Result
+     * Refresh token
+     * @param props Props
      */
-    tryLoginResult(result) { }
-    /**
-     * Try login
-     */
-    async tryLogin() {
+    async refreshToken(props) {
+        // Destruct
+        const { callback, data, relogin = false, showLoading = false } = props !== null && props !== void 0 ? props : {};
         // Token
         const token = this.getCacheToken();
         if (token == null || token === '') {
-            this.tryLoginResult('');
+            if (callback)
+                callback(false);
             return false;
         }
         // Reqest data
-        const data = {
-            timezone: this.getTimeZone()
+        // Merge additional data passed
+        const rq = {
+            timezone: this.getTimeZone(),
+            ...data
         };
         // Payload
         const payload = {
+            showLoading,
             config: { headers: { [CoreConstants.TokenHeaderRefresh]: token } },
             onError: (error) => {
-                this.tryLoginResult(error);
+                if (callback)
+                    callback(error);
                 // Prevent further processing
                 return false;
             }
         };
+        // Success callback
+        const success = async (result, failCallback) => {
+            // Token
+            const refreshToken = this.getResponseToken(payload.response);
+            if (refreshToken == null || result.data == null) {
+                if (failCallback)
+                    failCallback(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 (failCallback)
+                        failCallback(error);
+                    // Prevent further processing
+                    return false;
+                }
+            });
+            if (serviceResult == null)
+                return false;
+            if (!serviceResult.ok) {
+                if (failCallback)
+                    failCallback(serviceResult);
+                return false;
+            }
+            if (serviceResult.data == null) {
+                if (failCallback)
+                    failCallback(this.get('noData'));
+                return false;
+            }
+            this.userLoginEx(serviceResult.data, refreshToken, userData);
+            return true;
+        };
         // Call API
-        const result = await this.coreApi.put('Auth/RefreshToken', data, payload);
+        const result = await this.coreApi.put('Auth/RefreshToken', rq, payload);
         if (result == null)
             return false;
         if (!result.ok) {
-            this.tryLoginResult(result);
-            return false;
-        }
-        // Token
-        const refreshToken = this.getResponseToken(payload.response);
-        if (refreshToken == null || result.data == null) {
-            this.tryLoginResult(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
-        }, {
-            onError: (error) => {
-                // Set message
-                this.tryLoginResult(error);
-                // Prevent further processing
-                return false;
+            if (result.type === 'TokenExpired' && relogin) {
+                // Try login
+                // Dialog to receive password
+                var labels = this.getLabels('reloginTip', 'login');
+                this.notifier.prompt(labels.reloginTip, async (pwd) => {
+                    if (pwd == null) {
+                        this.toLoginPage();
+                        return;
+                    }
+                    // Set password for the action
+                    rq.pwd = this.encrypt(pwd, this.settings.serviceId.toString());
+                    // Submit again
+                    const result = await this.api.put('Auth/RefreshToken', data, payload);
+                    if (result == null)
+                        return;
+                    if (result.ok) {
+                        await success(result, (loginResult) => {
+                            const message = this.formatRefreshTokenResult(loginResult);
+                            if (message)
+                                this.notifier.alert(message);
+                        });
+                        return;
+                    }
+                    // Popup message
+                    this.alertResult(result);
+                    return false;
+                }, labels.login, { type: 'password' });
+                // Fake truth to avoid reloading
+                return true;
             }
-        });
-        if (serviceResult == null)
-            return false;
-        if (!serviceResult.ok) {
-            this.tryLoginResult(result);
+            if (callback)
+                callback(result);
             return false;
         }
-        if (serviceResult.data == null) {
-            this.tryLoginResult(this.get('noData'));
+        return await success(result, callback);
+    }
+    loginFailed() {
+        this.userUnauthorized();
+        this.toLoginPage();
+    }
+    /**
+     * Try login
+     */
+    async tryLogin(data) {
+        // Reset user state
+        const result = await super.tryLogin(data);
+        if (!result)
             return false;
-        }
-        this.userLoginEx(serviceResult.data, refreshToken, userData);
-        return true;
+        // Refresh token
+        return await this.refreshToken({
+            callback: (result) => {
+                const message = this.formatRefreshTokenResult(result);
+                if (message == null) {
+                    this.loginFailed();
+                    return;
+                }
+                this.notifier.alert(message, () => {
+                    this.loginFailed();
+                });
+            },
+            data,
+            relogin: true
+        });
     }
     /**
      * User login extended

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.41",
+    "version": "1.3.45",
     "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.63",
         "@etsoo/notificationbase": "^1.0.94",
         "@etsoo/shared": "^1.0.75",
         "@mui/icons-material": "^5.2.0",
@@ -83,13 +83,13 @@
         "@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",
         "jest": "^27.4.3",
         "react-test-renderer": "^17.0.2",
-        "ts-jest": "^27.0.7",
+        "ts-jest": "^27.1.0",
         "typescript": "^4.5.2"
     }
 }

package/src/app/RefreshTokenRQ.ts

@@ -2,6 +2,11 @@
  * Refresh token request data
  */
 export type RefreshTokenRQ = {
+    /**
+     * Login password
+     */
+    pwd?: string;
+
     /**
      * Service id
      */

package/src/app/ServiceApp.ts

@@ -1,10 +1,10 @@
 import {
     createClient,
-    IActionResult,
     IApi,
-    IApiPayload
+    IApiPayload,
+    RefreshTokenProps,
+    RefreshTokenResult
 } from '@etsoo/appscript';
-import { ApiDataError } from '@etsoo/restclient';
 import { DomUtils } from '@etsoo/shared';
 import { CoreConstants } from './CoreConstants';
 import { IServiceAppSettings } from './IServiceAppSettings';
@@ -72,93 +72,193 @@ export class ServiceApp<
     }
 
     /**
-     * Try login result processing
-     * @param result Result
+     * Refresh token
+     * @param props Props
      */
-    protected tryLoginResult(result: string | ApiDataError | IActionResult) {}
+    override async refreshToken<D = RefreshTokenRQ>(
+        props?: RefreshTokenProps<D>
+    ) {
+        // Destruct
+        const {
+            callback,
+            data,
+            relogin = false,
+            showLoading = false
+        } = props ?? {};
 
-    /**
-     * Try login
-     */
-    override async tryLogin() {
         // Token
         const token = this.getCacheToken();
         if (token == null || token === '') {
-            this.tryLoginResult('');
+            if (callback) callback(false);
             return false;
         }
 
         // Reqest data
-        const data: RefreshTokenRQ = {
-            timezone: this.getTimeZone()
+        // 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) => {
-                this.tryLoginResult(error);
+                if (callback) callback(error);
 
                 // Prevent further processing
                 return false;
             }
         };
 
+        // Success callback
+        const success = async (
+            result: SmartERPLoginResult,
+            failCallback?: (result: RefreshTokenResult) => void
+        ) => {
+            // Token
+            const refreshToken = this.getResponseToken(payload.response);
+            if (refreshToken == null || result.data == null) {
+                if (failCallback) failCallback(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 (failCallback) failCallback(error);
+
+                        // Prevent further processing
+                        return false;
+                    }
+                }
+            );
+
+            if (serviceResult == null) return false;
+
+            if (!serviceResult.ok) {
+                if (failCallback) failCallback(serviceResult);
+                return false;
+            }
+
+            if (serviceResult.data == null) {
+                if (failCallback) failCallback(this.get('noData')!);
+                return false;
+            }
+
+            this.userLoginEx(serviceResult.data, refreshToken, userData);
+
+            return true;
+        };
+
         // Call API
         const result = await this.coreApi.put<SmartERPLoginResult>(
             'Auth/RefreshToken',
-            data,
+            rq,
             payload
         );
         if (result == null) return false;
 
         if (!result.ok) {
-            this.tryLoginResult(result);
-            return false;
-        }
+            if (result.type === 'TokenExpired' && relogin) {
+                // Try login
+                // Dialog to receive password
+                var labels = this.getLabels('reloginTip', 'login');
+                this.notifier.prompt(
+                    labels.reloginTip,
+                    async (pwd) => {
+                        if (pwd == null) {
+                            this.toLoginPage();
+                            return;
+                        }
 
-        // Token
-        const refreshToken = this.getResponseToken(payload.response);
-        if (refreshToken == null || result.data == null) {
-            this.tryLoginResult(this.get('noData')!);
-            return false;
-        }
+                        // Set password for the action
+                        rq.pwd = this.encrypt(
+                            pwd,
+                            this.settings.serviceId.toString()
+                        );
 
-        // User data
-        const userData = result.data;
+                        // Submit again
+                        const result = await this.api.put<SmartERPLoginResult>(
+                            'Auth/RefreshToken',
+                            data,
+                            payload
+                        );
 
-        // 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
-            },
-            {
-                onError: (error) => {
-                    // Set message
-                    this.tryLoginResult(error);
+                        if (result == null) return;
 
-                    // Prevent further processing
-                    return false;
-                }
-            }
-        );
+                        if (result.ok) {
+                            await success(
+                                result,
+                                (loginResult: RefreshTokenResult) => {
+                                    const message =
+                                        this.formatRefreshTokenResult(
+                                            loginResult
+                                        );
+                                    if (message) this.notifier.alert(message);
+                                }
+                            );
+                            return;
+                        }
 
-        if (serviceResult == null) return false;
+                        // Popup message
+                        this.alertResult(result);
+                        return false;
+                    },
+                    labels.login,
+                    { type: 'password' }
+                );
 
-        if (!serviceResult.ok) {
-            this.tryLoginResult(result);
-            return false;
-        }
+                // Fake truth to avoid reloading
+                return true;
+            }
 
-        if (serviceResult.data == null) {
-            this.tryLoginResult(this.get('noData')!);
+            if (callback) callback(result);
             return false;
         }
 
-        this.userLoginEx(serviceResult.data, refreshToken, userData);
+        return await success(result, callback);
+    }
+
+    private loginFailed() {
+        this.userUnauthorized();
+        this.toLoginPage();
+    }
 
-        return true;
+    /**
+     * Try login
+     */
+    override async tryLogin<D extends {} = {}>(data?: D) {
+        // Reset user state
+        const result = await super.tryLogin(data);
+        if (!result) return false;
+
+        // Refresh token
+        return await this.refreshToken({
+            callback: (result) => {
+                const message = this.formatRefreshTokenResult(result);
+                if (message == null) {
+                    this.loginFailed();
+                    return;
+                }
+
+                this.notifier.alert(message, () => {
+                    this.loginFailed();
+                });
+            },
+            data,
+            relogin: true
+        });
     }
 
     /**