@etsoo/react 1.3.72 → 1.3.76

package/lib/app/ReactApp.js

@@ -1,4 +1,5 @@
 import { CoreApp, createClient } from '@etsoo/appscript';
+import { WindowStorage } from '@etsoo/shared';
 import React from 'react';
 import { NotifierMU } from '../mu/NotifierMU';
 import { ProgressCount } from '../mu/ProgressCount';
@@ -55,7 +56,11 @@ export class ReactApp extends CoreApp {
      * @param name Application name
      */
     constructor(settings, name) {
-        super(settings, ReactApp.createApi(settings), ReactApp.createNotifier(), name);
+        super(settings, ReactApp.createApi(settings), ReactApp.createNotifier(), new WindowStorage([
+            CoreApp.deviceIdField,
+            CoreApp.headerTokenField,
+            CoreApp.serversideDeviceIdField
+        ]), name);
         /**
          * User state
          */

package/lib/app/RefreshTokenRQ.d.ts

@@ -10,6 +10,10 @@ export declare type RefreshTokenRQ = {
      * Login password
      */
     pwd?: string;
+    /**
+     * Service device id
+     */
+    serviceDeviceId?: string;
     /**
      * Service id
      */

package/lib/app/ServiceApp.d.ts

@@ -16,14 +16,16 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
      * Service API
      */
     readonly serviceApi: IApi;
+    private _serviceUser?;
     /**
      * Service user
      */
-    serviceUser?: ISmartERPUser;
+    get serviceUser(): IServiceUser | undefined;
+    protected set serviceUser(value: IServiceUser | undefined);
     /**
      * Service passphrase
      */
-    servicePassphrase: string;
+    protected servicePassphrase: string;
     /**
      * Constructor
      * @param settings Settings

package/lib/app/ServiceApp.js

@@ -30,6 +30,15 @@ export class ServiceApp extends ReactApp {
         this.setApi(api);
         this.serviceApi = api;
     }
+    /**
+     * Service user
+     */
+    get serviceUser() {
+        return this._serviceUser;
+    }
+    set serviceUser(value) {
+        this._serviceUser = value;
+    }
     /**
      * Go to the login page
      */
@@ -39,6 +48,8 @@ export class ServiceApp extends ReactApp {
             coreUrl +
                 '?serviceId=' +
                 this.settings.serviceId +
+                '&serviceDeviceId=' +
+                encodeURIComponent(this.deviceId) +
                 '&' +
                 DomUtils.Culture +
                 '=' +

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.72",
+    "version": "1.3.76",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,16 +50,16 @@
         "@emotion/react": "^11.7.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.1.85",
-        "@etsoo/notificationbase": "^1.0.94",
-        "@etsoo/shared": "^1.0.78",
-        "@mui/icons-material": "^5.2.4",
-        "@mui/material": "^5.2.4",
+        "@etsoo/appscript": "^1.1.93",
+        "@etsoo/notificationbase": "^1.0.95",
+        "@etsoo/shared": "^1.0.83",
+        "@mui/icons-material": "^5.2.5",
+        "@mui/material": "^5.2.5",
         "@reach/router": "^1.3.4",
         "@types/pica": "^5.1.3",
         "@types/pulltorefreshjs": "^0.1.5",
-        "@types/reach__router": "^1.3.9",
-        "@types/react": "^17.0.37",
+        "@types/reach__router": "^1.3.10",
+        "@types/react": "^17.0.38",
         "@types/react-avatar-editor": "^10.3.6",
         "@types/react-dom": "^17.0.11",
         "@types/react-input-mask": "^3.0.1",
@@ -81,12 +81,12 @@
         "@babel/runtime-corejs3": "^7.16.5",
         "@types/jest": "^27.0.3",
         "@types/react-test-renderer": "^17.0.1",
-        "@typescript-eslint/eslint-plugin": "^5.7.0",
-        "@typescript-eslint/parser": "^5.7.0",
+        "@typescript-eslint/eslint-plugin": "^5.8.0",
+        "@typescript-eslint/parser": "^5.8.0",
         "eslint": "^8.5.0",
         "eslint-config-airbnb-base": "^15.0.0",
         "eslint-plugin-import": "^2.25.3",
-        "eslint-plugin-react": "^7.27.1",
+        "eslint-plugin-react": "^7.28.0",
         "jest": "^27.4.5",
         "react-test-renderer": "^17.0.2",
         "ts-jest": "^27.1.2",

package/src/app/ReactApp.ts

@@ -7,7 +7,7 @@ import {
     IUserData
 } from '@etsoo/appscript';
 import { NotificationRenderProps } from '@etsoo/notificationbase';
-import { DataTypes } from '@etsoo/shared';
+import { DataTypes, WindowStorage } from '@etsoo/shared';
 import React from 'react';
 import { NotifierMU } from '../mu/NotifierMU';
 import { ProgressCount } from '../mu/ProgressCount';
@@ -188,6 +188,11 @@ export class ReactApp<
             settings,
             ReactApp.createApi(settings),
             ReactApp.createNotifier(),
+            new WindowStorage([
+                CoreApp.deviceIdField,
+                CoreApp.headerTokenField,
+                CoreApp.serversideDeviceIdField
+            ]),
             name
         );
         this.cultureState = new CultureState(settings.currentCulture);

package/src/app/RefreshTokenRQ.ts

@@ -12,6 +12,11 @@ export type RefreshTokenRQ = {
      */
     pwd?: string;
 
+    /**
+     * Service device id
+     */
+    serviceDeviceId?: string;
+
     /**
      * Service id
      */

package/src/app/ServiceApp.ts

@@ -30,15 +30,21 @@ export class ServiceApp<
      */
     readonly serviceApi: IApi;
 
+    private _serviceUser?: IServiceUser;
     /**
      * Service user
      */
-    serviceUser?: ISmartERPUser;
+    get serviceUser() {
+        return this._serviceUser;
+    }
+    protected set serviceUser(value: IServiceUser | undefined) {
+        this._serviceUser = value;
+    }
 
     /**
      * Service passphrase
      */
-    servicePassphrase: string = '';
+    protected servicePassphrase: string = '';
 
     /**
      * Constructor
@@ -70,6 +76,8 @@ export class ServiceApp<
             coreUrl +
             '?serviceId=' +
             this.settings.serviceId +
+            '&serviceDeviceId=' +
+            encodeURIComponent(this.deviceId) +
             '&' +
             DomUtils.Culture +
             '=' +