@etsoo/react 1.3.38 → 1.3.39

package/lib/app/ServiceApp.d.ts

@@ -1,8 +1,9 @@
-import { IApi } from '@etsoo/appscript';
-import { ISmartERPUser } from '..';
+import { IActionResult, IApi } from '@etsoo/appscript';
+import { ApiDataError } from '@etsoo/restclient';
 import { IServiceAppSettings } from './IServiceAppSettings';
 import { IServicePageData } from './IServicePage';
 import { IServiceUser } from './IServiceUser';
+import { ISmartERPUser } from './ISmartERPUser';
 import { ReactApp } from './ReactApp';
 /**
  * Core Service App
@@ -29,6 +30,15 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
      * Go to the login page
      */
     toLoginPage(): void;
+    /**
+     * Try login result processing
+     * @param result Result
+     */
+    protected tryLoginResult(result: string | ApiDataError | IActionResult): void;
+    /**
+     * 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
@@ -39,6 +40,74 @@ export class ServiceApp extends ReactApp {
                 '=' +
                 this.culture;
     }
+    /**
+     * Try login result processing
+     * @param result Result
+     */
+    tryLoginResult(result) { }
+    /**
+     * Try login
+     */
+    async tryLogin() {
+        // Token
+        const token = this.getCacheToken();
+        if (token == null || token === '') {
+            this.tryLoginResult('');
+            return false;
+        }
+        // Reqest data
+        const data = {
+            timezone: this.getTimeZone()
+        };
+        // Payload
+        const payload = {
+            config: { headers: { [CoreConstants.TokenHeaderRefresh]: token } },
+            onError: (error) => {
+                this.tryLoginResult(error);
+                // Prevent further processing
+                return false;
+            }
+        };
+        // Call API
+        const result = await this.coreApi.put('Auth/RefreshToken', data, 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 (serviceResult == null)
+            return false;
+        if (!serviceResult.ok) {
+            this.tryLoginResult(result);
+            return false;
+        }
+        if (serviceResult.data == null) {
+            this.tryLoginResult(this.get('noData'));
+            return false;
+        }
+        this.userLoginEx(serviceResult.data, refreshToken, userData);
+        return true;
+    }
     /**
      * User login extended
      * @param user New user

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.38",
+    "version": "1.3.39",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",

package/src/app/ServiceApp.ts

@@ -1,10 +1,18 @@
-import { createClient, IApi } from '@etsoo/appscript';
+import {
+    createClient,
+    IActionResult,
+    IApi,
+    IApiPayload
+} from '@etsoo/appscript';
+import { ApiDataError } from '@etsoo/restclient';
 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
@@ -63,6 +71,96 @@ export class ServiceApp<
             this.culture;
     }
 
+    /**
+     * Try login result processing
+     * @param result Result
+     */
+    protected tryLoginResult(result: string | ApiDataError | IActionResult) {}
+
+    /**
+     * Try login
+     */
+    override async tryLogin() {
+        // Token
+        const token = this.getCacheToken();
+        if (token == null || token === '') {
+            this.tryLoginResult('');
+            return false;
+        }
+
+        // Reqest data
+        const data: RefreshTokenRQ = {
+            timezone: this.getTimeZone()
+        };
+
+        // Payload
+        const payload: IApiPayload<SmartERPLoginResult, any> = {
+            config: { headers: { [CoreConstants.TokenHeaderRefresh]: token } },
+            onError: (error) => {
+                this.tryLoginResult(error);
+
+                // Prevent further processing
+                return false;
+            }
+        };
+
+        // Call API
+        const result = await this.coreApi.put<SmartERPLoginResult>(
+            'Auth/RefreshToken',
+            data,
+            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<ServiceLoginResult>(
+            'Auth/ExchangeToken',
+            {
+                token: userData.token
+            },
+            {
+                onError: (error) => {
+                    // Set message
+                    this.tryLoginResult(error);
+
+                    // Prevent further processing
+                    return false;
+                }
+            }
+        );
+
+        if (serviceResult == null) return false;
+
+        if (!serviceResult.ok) {
+            this.tryLoginResult(result);
+            return false;
+        }
+
+        if (serviceResult.data == null) {
+            this.tryLoginResult(this.get('noData')!);
+            return false;
+        }
+
+        this.userLoginEx(serviceResult.data, refreshToken, userData);
+
+        return true;
+    }
+
     /**
      * User login extended
      * @param user New user