@etsoo/react 1.3.76 → 1.3.80

package/lib/app/ReactApp.d.ts

@@ -85,8 +85,9 @@ export declare class ReactApp<S extends IAppSettings, D extends IUser, P extends
      * Constructor
      * @param settings Settings
      * @param name Application name
+     * @param globalFields Global fields
      */
-    constructor(settings: S, name: string);
+    constructor(settings: S, name: string, globalFields: string[]);
     /**
      * Change culture
      * @param culture New culture definition

package/lib/app/ReactApp.js

@@ -1,5 +1,5 @@
 import { CoreApp, createClient } from '@etsoo/appscript';
-import { WindowStorage } from '@etsoo/shared';
+import { DomUtils, StorageUtils, WindowStorage } from '@etsoo/shared';
 import React from 'react';
 import { NotifierMU } from '../mu/NotifierMU';
 import { ProgressCount } from '../mu/ProgressCount';
@@ -54,13 +54,25 @@ export class ReactApp extends CoreApp {
      * Constructor
      * @param settings Settings
      * @param name Application name
+     * @param globalFields Global fields
      */
-    constructor(settings, name) {
+    constructor(settings, name, globalFields) {
         super(settings, ReactApp.createApi(settings), ReactApp.createNotifier(), new WindowStorage([
+            ...globalFields,
+            DomUtils.CountryField,
+            DomUtils.CultureField,
             CoreApp.deviceIdField,
             CoreApp.headerTokenField,
             CoreApp.serversideDeviceIdField
-        ]), name);
+        ], (field, data, index) => {
+            if (index > 0 && field === CoreApp.headerTokenField) {
+                // Clear passphrase to regenerate the device id
+                StorageUtils.setSessionData(CoreApp.devicePassphraseField, undefined);
+                // Clear token
+                return null;
+            }
+            return data;
+        }), name);
         /**
          * User state
          */

package/lib/app/ServiceApp.d.ts

@@ -30,8 +30,9 @@ export declare class ServiceApp<P extends IServicePageData = IServicePageData, U
      * Constructor
      * @param settings Settings
      * @param name Application name
+     * @param globalFields Global fields
      */
-    constructor(settings: S, name: string);
+    constructor(settings: S, name: string, globalFields: string[]);
     /**
      * Go to the login page
      */

package/lib/app/ServiceApp.js

@@ -13,9 +13,10 @@ export class ServiceApp extends ReactApp {
      * Constructor
      * @param settings Settings
      * @param name Application name
+     * @param globalFields Global fields
      */
-    constructor(settings, name) {
-        super(settings, name);
+    constructor(settings, name, globalFields) {
+        super(settings, name, globalFields);
         /**
          * Service passphrase
          */
@@ -51,7 +52,7 @@ export class ServiceApp extends ReactApp {
                 '&serviceDeviceId=' +
                 encodeURIComponent(this.deviceId) +
                 '&' +
-                DomUtils.Culture +
+                DomUtils.CultureField +
                 '=' +
                 this.culture;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/react",
-    "version": "1.3.76",
+    "version": "1.3.80",
     "description": "TypeScript ReactJs framework",
     "main": "lib/index.js",
     "types": "lib/index.d.ts",
@@ -50,9 +50,9 @@
         "@emotion/react": "^11.7.1",
         "@emotion/style": "^0.8.0",
         "@emotion/styled": "^11.6.0",
-        "@etsoo/appscript": "^1.1.93",
+        "@etsoo/appscript": "^1.1.97",
         "@etsoo/notificationbase": "^1.0.95",
-        "@etsoo/shared": "^1.0.83",
+        "@etsoo/shared": "^1.0.89",
         "@mui/icons-material": "^5.2.5",
         "@mui/material": "^5.2.5",
         "@reach/router": "^1.3.4",

package/src/app/ReactApp.ts

@@ -7,7 +7,12 @@ import {
     IUserData
 } from '@etsoo/appscript';
 import { NotificationRenderProps } from '@etsoo/notificationbase';
-import { DataTypes, WindowStorage } from '@etsoo/shared';
+import {
+    DataTypes,
+    DomUtils,
+    StorageUtils,
+    WindowStorage
+} from '@etsoo/shared';
 import React from 'react';
 import { NotifierMU } from '../mu/NotifierMU';
 import { ProgressCount } from '../mu/ProgressCount';
@@ -182,17 +187,38 @@ export class ReactApp<
      * Constructor
      * @param settings Settings
      * @param name Application name
+     * @param globalFields Global fields
      */
-    constructor(settings: S, name: string) {
+    constructor(settings: S, name: string, globalFields: string[]) {
         super(
             settings,
             ReactApp.createApi(settings),
             ReactApp.createNotifier(),
-            new WindowStorage([
-                CoreApp.deviceIdField,
-                CoreApp.headerTokenField,
-                CoreApp.serversideDeviceIdField
-            ]),
+            new WindowStorage(
+                [
+                    ...globalFields,
+
+                    DomUtils.CountryField,
+                    DomUtils.CultureField,
+
+                    CoreApp.deviceIdField,
+                    CoreApp.headerTokenField,
+                    CoreApp.serversideDeviceIdField
+                ],
+                (field, data, index) => {
+                    if (index > 0 && field === CoreApp.headerTokenField) {
+                        // Clear passphrase to regenerate the device id
+                        StorageUtils.setSessionData(
+                            CoreApp.devicePassphraseField,
+                            undefined
+                        );
+
+                        // Clear token
+                        return null;
+                    }
+                    return data;
+                }
+            ),
             name
         );
         this.cultureState = new CultureState(settings.currentCulture);

package/src/app/ServiceApp.ts

@@ -50,9 +50,10 @@ export class ServiceApp<
      * Constructor
      * @param settings Settings
      * @param name Application name
+     * @param globalFields Global fields
      */
-    constructor(settings: S, name: string) {
-        super(settings, name);
+    constructor(settings: S, name: string, globalFields: string[]) {
+        super(settings, name, globalFields);
 
         // Check
         if (settings.serviceId == null || settings.serviceEndpoint == null) {
@@ -79,7 +80,7 @@ export class ServiceApp<
             '&serviceDeviceId=' +
             encodeURIComponent(this.deviceId) +
             '&' +
-            DomUtils.Culture +
+            DomUtils.CultureField +
             '=' +
             this.culture;
     }