@etsoo/react 1.3.35 → 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
@@ -25,6 +26,19 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
      * @param name Application name
      */
     constructor(settings: S, name: string);
+    /**
+     * 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,4 +1,6 @@
 import { createClient } from '@etsoo/appscript';
+import { DomUtils } from '@etsoo/shared';
+import { CoreConstants } from './CoreConstants';
 import { ReactApp } from './ReactApp';
 /**
  * Core Service App
@@ -24,6 +26,88 @@ export class ServiceApp extends ReactApp {
         this.setApi(api);
         this.coreApi = api;
     }
+    /**
+     * Go to the login page
+     */
+    toLoginPage() {
+        const coreUrl = this.settings.coreApi;
+        window.location.href =
+            coreUrl +
+                '?serviceId=' +
+                this.settings.serviceId +
+                '&' +
+                DomUtils.Culture +
+                '=' +
+                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
@@ -36,6 +120,6 @@ export class ServiceApp extends ReactApp {
         // Core system user
         this.coreUser = coreUser;
         // Core system API token
-        this.api.authorize(this.settings.authScheme, coreUser.token);
+        this.coreApi.authorize(this.settings.authScheme, coreUser.token);
     }
 }

package/lib/mu/NotifierMU.js

@@ -350,7 +350,7 @@ export class NotifierMU extends NotifierReact {
      */
     addRaw(data, modal) {
         // Destruct
-        const { type, content, title, align, timespan, ...rest } = data;
+        const { type, content, title, align, timespan = modal ? 0 : undefined, ...rest } = data;
         // Setup
         const n = new NotificationMU(type, content, title, align, timespan);
         // Assign other properties

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.35",
+    "version": "1.3.39",
     "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.50",
+        "@etsoo/appscript": "^1.1.53",
         "@etsoo/notificationbase": "^1.0.94",
         "@etsoo/shared": "^1.0.75",
         "@mui/icons-material": "^5.2.0",

package/src/app/ServiceApp.ts

@@ -1,9 +1,18 @@
-import { createClient, IApi } from '@etsoo/appscript';
-import { ISmartERPUser } from '..';
+import {
+    createClient,
+    IActionResult,
+    IApi,
+    IApiPayload
+} from '@etsoo/appscript';
+import { ApiDataError } from '@etsoo/restclient';
+import { DomUtils } from '@etsoo/shared';
+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
@@ -47,6 +56,111 @@ export class ServiceApp<
         this.coreApi = api;
     }
 
+    /**
+     * Go to the login page
+     */
+    override toLoginPage() {
+        const coreUrl = this.settings.coreApi;
+        window.location.href =
+            coreUrl +
+            '?serviceId=' +
+            this.settings.serviceId +
+            '&' +
+            DomUtils.Culture +
+            '=' +
+            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
@@ -65,6 +179,6 @@ export class ServiceApp<
         this.coreUser = coreUser;
 
         // Core system API token
-        this.api.authorize(this.settings.authScheme, coreUser.token);
+        this.coreApi.authorize(this.settings.authScheme, coreUser.token);
     }
 }

package/src/mu/NotifierMU.tsx

@@ -581,7 +581,14 @@ export class NotifierMU extends NotifierReact {
         modal?: boolean
     ): INotificationReact {
         // Destruct
-        const { type, content, title, align, timespan, ...rest } = data;
+        const {
+            type,
+            content,
+            title,
+            align,
+            timespan = modal ? 0 : undefined,
+            ...rest
+        } = data;
 
         // Setup
         const n = new NotificationMU(type, content, title, align, timespan);