@etsoo/react 1.3.43 → 1.3.44

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

@@ -38,7 +38,7 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
     /**
      * Try login
      */
-    tryLogin(): Promise<boolean>;
+    tryLogin<D extends {} = {}>(data?: D): Promise<boolean>;
     /**
      * User login extended
      * @param user New user

package/lib/app/ServiceApp.js

@@ -1,5 +1,4 @@
-import { ActionResultError, createClient } from '@etsoo/appscript';
-import { ApiDataError } from '@etsoo/restclient';
+import { createClient } from '@etsoo/appscript';
 import { DomUtils } from '@etsoo/shared';
 import { CoreConstants } from './CoreConstants';
 import { ReactApp } from './ReactApp';
@@ -47,7 +46,7 @@ export class ServiceApp extends ReactApp {
      */
     async refreshToken(props) {
         // Destruct
-        const { callback, data, showLoading = false } = props !== null && props !== void 0 ? props : {};
+        const { callback, data, relogin = false, showLoading = false } = props !== null && props !== void 0 ? props : {};
         // Token
         const token = this.getCacheToken();
         if (token == null || token === '') {
@@ -72,76 +71,109 @@ export class ServiceApp extends ReactApp {
                 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', 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 (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 = pwd;
+                    // 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) {
-            if (callback)
-                callback(serviceResult);
-            return false;
-        }
-        if (serviceResult.data == null) {
             if (callback)
-                callback(this.get('noData'));
+                callback(result);
             return false;
         }
-        this.userLoginEx(serviceResult.data, refreshToken, userData);
-        return true;
+        return await success(result, callback);
     }
     /**
      * Try login
      */
-    async tryLogin() {
+    async tryLogin(data) {
         // Reset user state
-        const result = await super.tryLogin();
+        const result = await super.tryLogin(data);
         if (!result)
             return false;
         // Refresh token
         return await this.refreshToken({
             callback: (result) => {
-                if (typeof result === 'boolean') {
+                const message = this.formatRefreshTokenResult(result);
+                if (message == null) {
                     this.toLoginPage();
                     return;
                 }
-                const message = result instanceof ApiDataError
-                    ? this.formatError(result)
-                    : typeof result !== 'string'
-                        ? ActionResultError.format(result)
-                        : result;
-                this.notifier.alert(message, () => {
-                    this.toLoginPage();
-                });
+                else {
+                    this.notifier.alert(message, () => {
+                        this.toLoginPage();
+                    });
+                }
             },
-            showLoading: true
+            data,
+            relogin: true
         });
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.43",
+    "version": "1.3.44",
     "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.56",
+        "@etsoo/appscript": "^1.1.61",
         "@etsoo/notificationbase": "^1.0.94",
         "@etsoo/shared": "^1.0.75",
         "@mui/icons-material": "^5.2.0",
@@ -89,7 +89,7 @@
         "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,11 +1,10 @@
 import {
-    ActionResultError,
     createClient,
     IApi,
     IApiPayload,
-    RefreshTokenProps
+    RefreshTokenProps,
+    RefreshTokenResult
 } from '@etsoo/appscript';
-import { ApiDataError } from '@etsoo/restclient';
 import { DomUtils } from '@etsoo/shared';
 import { CoreConstants } from './CoreConstants';
 import { IServiceAppSettings } from './IServiceAppSettings';
@@ -80,7 +79,12 @@ export class ServiceApp<
         props?: RefreshTokenProps<D>
     ) {
         // Destruct
-        const { callback, data, showLoading = false } = props ?? {};
+        const {
+            callback,
+            data,
+            relogin = false,
+            showLoading = false
+        } = props ?? {};
 
         // Token
         const token = this.getCacheToken();
@@ -108,6 +112,55 @@ export class ServiceApp<
             }
         };
 
+        // 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',
@@ -117,82 +170,86 @@ export class ServiceApp<
         if (result == null) return false;
 
         if (!result.ok) {
-            if (callback) callback(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) {
-            if (callback) callback(this.get('noData')!);
-            return false;
-        }
+                        // Set password for the action
+                        rq.pwd = pwd;
 
-        // 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
-            },
-            {
-                showLoading,
-                onError: (error) => {
-                    if (callback) callback(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) {
-            if (callback) callback(serviceResult);
-            return false;
-        }
+                // Fake truth to avoid reloading
+                return true;
+            }
 
-        if (serviceResult.data == null) {
-            if (callback) callback(this.get('noData')!);
+            if (callback) callback(result);
             return false;
         }
 
-        this.userLoginEx(serviceResult.data, refreshToken, userData);
-
-        return true;
+        return await success(result, callback);
     }
 
     /**
      * Try login
      */
-    override async tryLogin() {
+    override async tryLogin<D extends {} = {}>(data?: D) {
         // Reset user state
-        const result = await super.tryLogin();
+        const result = await super.tryLogin(data);
         if (!result) return false;
 
         // Refresh token
         return await this.refreshToken({
             callback: (result) => {
-                if (typeof result === 'boolean') {
+                const message = this.formatRefreshTokenResult(result);
+                if (message == null) {
                     this.toLoginPage();
                     return;
+                } else {
+                    this.notifier.alert(message, () => {
+                        this.toLoginPage();
+                    });
                 }
-
-                const message =
-                    result instanceof ApiDataError
-                        ? this.formatError(result)
-                        : typeof result !== 'string'
-                        ? ActionResultError.format(result)
-                        : result;
-
-                this.notifier.alert(message, () => {
-                    this.toLoginPage();
-                });
             },
-            showLoading: true
+            data,
+            relogin: true
         });
     }