@etsoo/react 1.3.63 → 1.3.67

package/lib/app/ReactApp.d.ts

@@ -144,8 +144,9 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
      * @param user New user
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
+     * @param dispatch User state dispatch
      */
-    userLogin(user: IUserData, refreshToken: string, keep?: boolean): void;
+    userLogin(user: IUserData, refreshToken: string, keep?: boolean, dispatch?: boolean): void;
     /**
      * User logout
      * @param clearToken Clear refresh token or not

package/lib/app/ReactApp.js

@@ -24,25 +24,24 @@ export function ReactAppStateDetector(props) {
     const { state } = globalApp == null
         ? { state: {} }
         : React.useContext(globalApp.userState.context);
-    // Match fields
-    const authorized = state.authorized;
-    const changedFields = state.lastChangedFields;
-    let matchedFields;
-    if (targetFields == null || changedFields == null) {
-        matchedFields = changedFields;
-    }
-    else {
-        matchedFields = [];
-        targetFields.forEach((targetField) => {
-            if (changedFields.includes(targetField))
-                matchedFields === null || matchedFields === void 0 ? void 0 : matchedFields.push(targetField);
-        });
-    }
     // Ready
     React.useEffect(() => {
+        // Match fields
+        const changedFields = state.lastChangedFields;
+        let matchedFields;
+        if (targetFields == null || changedFields == null) {
+            matchedFields = changedFields;
+        }
+        else {
+            matchedFields = [];
+            targetFields.forEach((targetField) => {
+                if (changedFields.includes(targetField))
+                    matchedFields === null || matchedFields === void 0 ? void 0 : matchedFields.push(targetField);
+            });
+        }
         // Callback
-        update(authorized, matchedFields);
-    }, [authorized, JSON.stringify(matchedFields !== null && matchedFields !== void 0 ? matchedFields : [])]);
+        update(state.authorized, matchedFields);
+    }, [state]);
     // return
     return React.createElement(React.Fragment);
 }
@@ -211,12 +210,13 @@ export class ReactApp extends CoreApp {
      * @param user New user
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
+     * @param dispatch User state dispatch
      */
-    userLogin(user, refreshToken, keep) {
+    userLogin(user, refreshToken, keep, dispatch) {
         // Super call, set token
         super.userLogin(user, refreshToken, keep);
         // Dispatch action
-        if (this.userStateDispatch != null)
+        if (this.userStateDispatch != null && dispatch !== false)
             this.userStateDispatch({
                 type: UserActionType.Login,
                 user

package/lib/app/RefreshTokenRQ.d.ts

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

package/lib/app/ServiceApp.d.ts

@@ -1,4 +1,4 @@
-import { IApi, RefreshTokenProps } from '@etsoo/appscript';
+import { IApi, InitCallDto, InitCallResult, RefreshTokenProps } from '@etsoo/appscript';
 import { IServiceAppSettings } from './IServiceAppSettings';
 import { IServicePageData } from './IServicePage';
 import { IServiceUser } from './IServiceUser';
@@ -26,6 +26,12 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
      * @param name Application name
      */
     constructor(settings: S, name: string);
+    /**
+     * Api init call, connect to the core Api
+     * @param data Data
+     * @returns Result
+     */
+    protected apiInitCall(data: InitCallDto): Promise<InitCallResult | undefined>;
     /**
      * Go to the login page
      */

package/lib/app/ServiceApp.js

@@ -26,6 +26,14 @@ export class ServiceApp extends ReactApp {
         this.setApi(api);
         this.coreApi = api;
     }
+    /**
+     * Api init call, connect to the core Api
+     * @param data Data
+     * @returns Result
+     */
+    async apiInitCall(data) {
+        return await this.coreApi.put(this.initCallApi, data);
+    }
     /**
      * Go to the login page
      */
@@ -57,6 +65,7 @@ export class ServiceApp extends ReactApp {
         // Reqest data
         // Merge additional data passed
         const rq = {
+            deviceId: this.deviceId,
             timezone: this.getTimeZone(),
             ...data
         };
@@ -106,7 +115,11 @@ export class ServiceApp extends ReactApp {
                     failCallback(this.get('noData'));
                 return false;
             }
+            // Login
             this.userLoginEx(serviceResult.data, refreshToken, userData);
+            // Success callback
+            if (failCallback)
+                failCallback(true);
             return true;
         };
         // Call API
@@ -124,13 +137,18 @@ export class ServiceApp extends ReactApp {
                         return;
                     }
                     // Set password for the action
-                    rq.pwd = this.encrypt(pwd, this.settings.serviceId.toString());
+                    rq.pwd = this.encrypt(this.hash(pwd));
                     // Submit again
-                    const result = await this.api.put('Auth/RefreshToken', data, payload);
+                    const result = await this.api.put('Auth/RefreshToken', rq, payload);
                     if (result == null)
                         return;
                     if (result.ok) {
                         await success(result, (loginResult) => {
+                            if (loginResult === true) {
+                                if (callback)
+                                    callback(true);
+                                return;
+                            }
                             const message = this.formatRefreshTokenResult(loginResult);
                             if (message)
                                 this.notifier.alert(message);
@@ -165,6 +183,9 @@ export class ServiceApp extends ReactApp {
         // Refresh token
         return await this.refreshToken({
             callback: (result) => {
+                // Success
+                if (result === true)
+                    return;
                 const message = this.formatRefreshTokenResult(result);
                 if (message == null) {
                     this.loginFailed();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.63",
+    "version": "1.3.67",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,7 +50,7 @@
         "@emotion/react": "^11.7.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.1.80",
+        "@etsoo/appscript": "^1.1.83",
         "@etsoo/notificationbase": "^1.0.94",
         "@etsoo/shared": "^1.0.78",
         "@mui/icons-material": "^5.2.4",

package/src/app/ReactApp.ts

@@ -53,25 +53,24 @@ export function ReactAppStateDetector(props: IStateProps) {
                   (globalApp.userState as UserState<IUser>).context
               );
 
-    // Match fields
-    const authorized = state.authorized;
-    const changedFields = state.lastChangedFields;
-    let matchedFields: string[] | undefined;
-    if (targetFields == null || changedFields == null) {
-        matchedFields = changedFields;
-    } else {
-        matchedFields = [];
-        targetFields.forEach((targetField) => {
-            if (changedFields.includes(targetField))
-                matchedFields?.push(targetField);
-        });
-    }
-
     // Ready
     React.useEffect(() => {
+        // Match fields
+        const changedFields = state.lastChangedFields;
+        let matchedFields: string[] | undefined;
+        if (targetFields == null || changedFields == null) {
+            matchedFields = changedFields;
+        } else {
+            matchedFields = [];
+            targetFields.forEach((targetField) => {
+                if (changedFields.includes(targetField))
+                    matchedFields?.push(targetField);
+            });
+        }
+
         // Callback
-        update(authorized, matchedFields);
-    }, [authorized, JSON.stringify(matchedFields ?? [])]);
+        update(state.authorized, matchedFields);
+    }, [state]);
 
     // return
     return React.createElement(React.Fragment);
@@ -354,17 +353,19 @@ export class ReactApp<
      * @param user New user
      * @param refreshToken Refresh token
      * @param keep Keep in local storage or not
+     * @param dispatch User state dispatch
      */
     override userLogin(
         user: IUserData,
         refreshToken: string,
-        keep?: boolean
+        keep?: boolean,
+        dispatch?: boolean
     ): void {
         // Super call, set token
         super.userLogin(user, refreshToken, keep);
 
         // Dispatch action
-        if (this.userStateDispatch != null)
+        if (this.userStateDispatch != null && dispatch !== false)
             this.userStateDispatch({
                 type: UserActionType.Login,
                 user

package/src/app/RefreshTokenRQ.ts

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

package/src/app/ServiceApp.ts

@@ -2,6 +2,8 @@ import {
     createClient,
     IApi,
     IApiPayload,
+    InitCallDto,
+    InitCallResult,
     RefreshTokenProps,
     RefreshTokenResult
 } from '@etsoo/appscript';
@@ -56,6 +58,15 @@ export class ServiceApp<
         this.coreApi = api;
     }
 
+    /**
+     * Api init call, connect to the core Api
+     * @param data Data
+     * @returns Result
+     */
+    protected override async apiInitCall(data: InitCallDto) {
+        return await this.coreApi.put<InitCallResult>(this.initCallApi, data);
+    }
+
     /**
      * Go to the login page
      */
@@ -96,6 +107,7 @@ export class ServiceApp<
         // Reqest data
         // Merge additional data passed
         const rq: RefreshTokenRQ = {
+            deviceId: this.deviceId,
             timezone: this.getTimeZone(),
             ...data
         };
@@ -156,8 +168,12 @@ export class ServiceApp<
                 return false;
             }
 
+            // Login
             this.userLoginEx(serviceResult.data, refreshToken, userData);
 
+            // Success callback
+            if (failCallback) failCallback(true);
+
             return true;
         };
 
@@ -183,15 +199,12 @@ export class ServiceApp<
                         }
 
                         // Set password for the action
-                        rq.pwd = this.encrypt(
-                            pwd,
-                            this.settings.serviceId.toString()
-                        );
+                        rq.pwd = this.encrypt(this.hash(pwd));
 
                         // Submit again
                         const result = await this.api.put<SmartERPLoginResult>(
                             'Auth/RefreshToken',
-                            data,
+                            rq,
                             payload
                         );
 
@@ -201,6 +214,11 @@ export class ServiceApp<
                             await success(
                                 result,
                                 (loginResult: RefreshTokenResult) => {
+                                    if (loginResult === true) {
+                                        if (callback) callback(true);
+                                        return;
+                                    }
+
                                     const message =
                                         this.formatRefreshTokenResult(
                                             loginResult
@@ -246,6 +264,9 @@ export class ServiceApp<
         // Refresh token
         return await this.refreshToken({
             callback: (result) => {
+                // Success
+                if (result === true) return;
+
                 const message = this.formatRefreshTokenResult(result);
                 if (message == null) {
                     this.loginFailed();