@beinformed/ui 1.18.4 → 1.18.7-beta.0

package/lib/utils/number/parseNumbers.js.map

@@ -1 +1 @@
-{"version":3,"file":"parseNumbers.js","names":["removeGroupingSeparator","input","groupingSeparator","escapedGroupingSeparator","replace","RegExp","updateDecimalSeparator","decimalSeparator","parseToNumber","NaN","inputNoGrouping","inputCorrectDecimalSeparator","Number","parseNumberToString","toFixed","error"],"sources":["../../../src/utils/number/parseNumbers.js"],"sourcesContent":["// @flow\nimport big from \"big.js\";\n\n/**\n * @private\n */\nconst removeGroupingSeparator = (input, groupingSeparator) => {\n  if (typeof input === \"number\") {\n    return input;\n  }\n\n  if (groupingSeparator == null) {\n    return input;\n  }\n\n  const escapedGroupingSeparator = groupingSeparator.replace(\n    /[$()*+.?[\\\\\\]^{|}]/g,\n    \"\\\\$&\"\n  );\n\n  return input.replace(new RegExp(escapedGroupingSeparator, \"g\"), \"\");\n};\n\n/**\n * @private\n */\nconst updateDecimalSeparator = (input, decimalSeparator) => {\n  if (typeof input === \"number\") {\n    return input;\n  }\n\n  if (decimalSeparator == null || decimalSeparator === \"\") {\n    return input;\n  }\n\n  return input.replace(decimalSeparator, \".\");\n};\n\n/**\n * Parses input into a number, removes the grouping separator from the input and\n * replaces the decimal separator with a dot to make it a JavaScript parseable number\n */\nconst parseToNumber = (\n  input: ?string | ?number,\n  groupingSeparator: ?string = \",\",\n  decimalSeparator: ?string = \".\"\n): number => {\n  if (input == null || input === \"\") {\n    return NaN;\n  }\n\n  const inputNoGrouping = removeGroupingSeparator(input, groupingSeparator);\n\n  const inputCorrectDecimalSeparator = updateDecimalSeparator(\n    inputNoGrouping,\n    decimalSeparator\n  );\n\n  return Number(inputCorrectDecimalSeparator);\n};\n\n/**\n * parses Numbers To String\n */\nconst parseNumberToString = (\n  input: ?string | ?number,\n  groupingSeparator: ?string = \",\",\n  decimalSeparator: ?string = \".\"\n): string => {\n  if (input == null || input === \"\") {\n    return \"NaN\";\n  }\n\n  const inputNoGrouping = removeGroupingSeparator(input, groupingSeparator);\n\n  const inputCorrectDecimalSeparator = updateDecimalSeparator(\n    inputNoGrouping,\n    decimalSeparator\n  );\n\n  try {\n    return big(inputCorrectDecimalSeparator).toFixed();\n  } catch (error) {\n    return \"NaN\";\n  }\n};\n\nexport { parseToNumber, parseNumberToString };\n"],"mappings":";;;;;;;;;AACA;;AAEA;AACA;AACA;AACA,IAAMA,uBAAuB,GAAG,SAA1BA,uBAA0B,CAACC,KAAD,EAAQC,iBAAR,EAA8B;EAC5D,IAAI,OAAOD,KAAP,KAAiB,QAArB,EAA+B;IAC7B,OAAOA,KAAP;EACD;;EAED,IAAIC,iBAAiB,IAAI,IAAzB,EAA+B;IAC7B,OAAOD,KAAP;EACD;;EAED,IAAME,wBAAwB,GAAGD,iBAAiB,CAACE,OAAlB,CAC/B,qBAD+B,EAE/B,MAF+B,CAAjC;EAKA,OAAOH,KAAK,CAACG,OAAN,CAAc,IAAIC,MAAJ,CAAWF,wBAAX,EAAqC,GAArC,CAAd,EAAyD,EAAzD,CAAP;AACD,CAfD;AAiBA;AACA;AACA;;;AACA,IAAMG,sBAAsB,GAAG,SAAzBA,sBAAyB,CAACL,KAAD,EAAQM,gBAAR,EAA6B;EAC1D,IAAI,OAAON,KAAP,KAAiB,QAArB,EAA+B;IAC7B,OAAOA,KAAP;EACD;;EAED,IAAIM,gBAAgB,IAAI,IAApB,IAA4BA,gBAAgB,KAAK,EAArD,EAAyD;IACvD,OAAON,KAAP;EACD;;EAED,OAAOA,KAAK,CAACG,OAAN,CAAcG,gBAAd,EAAgC,GAAhC,CAAP;AACD,CAVD;AAYA;AACA;AACA;AACA;;;AACA,IAAMC,aAAa,GAAG,SAAhBA,aAAgB,CACpBP,KADoB,EAIT;EAAA,IAFXC,iBAEW,uEAFkB,GAElB;EAAA,IADXK,gBACW,uEADiB,GACjB;;EACX,IAAIN,KAAK,IAAI,IAAT,IAAiBA,KAAK,KAAK,EAA/B,EAAmC;IACjC,OAAOQ,GAAP;EACD;;EAED,IAAMC,eAAe,GAAGV,uBAAuB,CAACC,KAAD,EAAQC,iBAAR,CAA/C;EAEA,IAAMS,4BAA4B,GAAGL,sBAAsB,CACzDI,eADyD,EAEzDH,gBAFyD,CAA3D;EAKA,OAAOK,MAAM,CAACD,4BAAD,CAAb;AACD,CAjBD;AAmBA;AACA;AACA;;;;;AACA,IAAME,mBAAmB,GAAG,SAAtBA,mBAAsB,CAC1BZ,KAD0B,EAIf;EAAA,IAFXC,iBAEW,uEAFkB,GAElB;EAAA,IADXK,gBACW,uEADiB,GACjB;;EACX,IAAIN,KAAK,IAAI,IAAT,IAAiBA,KAAK,KAAK,EAA/B,EAAmC;IACjC,OAAO,KAAP;EACD;;EAED,IAAMS,eAAe,GAAGV,uBAAuB,CAACC,KAAD,EAAQC,iBAAR,CAA/C;EAEA,IAAMS,4BAA4B,GAAGL,sBAAsB,CACzDI,eADyD,EAEzDH,gBAFyD,CAA3D;;EAKA,IAAI;IACF,OAAO,kBAAII,4BAAJ,EAAkCG,OAAlC,EAAP;EACD,CAFD,CAEE,OAAOC,KAAP,EAAc;IACd,OAAO,KAAP;EACD;AACF,CArBD"}
+{"version":3,"file":"parseNumbers.js","names":["removeGroupingSeparator","input","groupingSeparator","escapedGroupingSeparator","replace","RegExp","updateDecimalSeparator","decimalSeparator","parseToNumber","NaN","inputNoGrouping","inputCorrectDecimalSeparator","Number","parseNumberToString","big","toFixed","error"],"sources":["../../../src/utils/number/parseNumbers.js"],"sourcesContent":["// @flow\nimport big from \"big.js\";\n\n/**\n * @private\n */\nconst removeGroupingSeparator = (input, groupingSeparator) => {\n  if (typeof input === \"number\") {\n    return input;\n  }\n\n  if (groupingSeparator == null) {\n    return input;\n  }\n\n  const escapedGroupingSeparator = groupingSeparator.replace(\n    /[$()*+.?[\\\\\\]^{|}]/g,\n    \"\\\\$&\"\n  );\n\n  return input.replace(new RegExp(escapedGroupingSeparator, \"g\"), \"\");\n};\n\n/**\n * @private\n */\nconst updateDecimalSeparator = (input, decimalSeparator) => {\n  if (typeof input === \"number\") {\n    return input;\n  }\n\n  if (decimalSeparator == null || decimalSeparator === \"\") {\n    return input;\n  }\n\n  return input.replace(decimalSeparator, \".\");\n};\n\n/**\n * Parses input into a number, removes the grouping separator from the input and\n * replaces the decimal separator with a dot to make it a JavaScript parseable number\n */\nconst parseToNumber = (\n  input: ?string | ?number,\n  groupingSeparator: ?string = \",\",\n  decimalSeparator: ?string = \".\"\n): number => {\n  if (input == null || input === \"\") {\n    return NaN;\n  }\n\n  const inputNoGrouping = removeGroupingSeparator(input, groupingSeparator);\n\n  const inputCorrectDecimalSeparator = updateDecimalSeparator(\n    inputNoGrouping,\n    decimalSeparator\n  );\n\n  return Number(inputCorrectDecimalSeparator);\n};\n\n/**\n * parses Numbers To String\n */\nconst parseNumberToString = (\n  input: ?string | ?number,\n  groupingSeparator: ?string = \",\",\n  decimalSeparator: ?string = \".\"\n): string => {\n  if (input == null || input === \"\") {\n    return \"NaN\";\n  }\n\n  const inputNoGrouping = removeGroupingSeparator(input, groupingSeparator);\n\n  const inputCorrectDecimalSeparator = updateDecimalSeparator(\n    inputNoGrouping,\n    decimalSeparator\n  );\n\n  try {\n    return big(inputCorrectDecimalSeparator).toFixed();\n  } catch (error) {\n    return \"NaN\";\n  }\n};\n\nexport { parseToNumber, parseNumberToString };\n"],"mappings":";;;;;;;;;AACA;;AAEA;AACA;AACA;AACA,IAAMA,uBAAuB,GAAG,SAA1BA,uBAA0B,CAACC,KAAD,EAAQC,iBAAR,EAA8B;EAC5D,IAAI,OAAOD,KAAP,KAAiB,QAArB,EAA+B;IAC7B,OAAOA,KAAP;EACD;;EAED,IAAIC,iBAAiB,IAAI,IAAzB,EAA+B;IAC7B,OAAOD,KAAP;EACD;;EAED,IAAME,wBAAwB,GAAGD,iBAAiB,CAACE,OAAlB,CAC/B,qBAD+B,EAE/B,MAF+B,CAAjC;EAKA,OAAOH,KAAK,CAACG,OAAN,CAAc,IAAIC,MAAJ,CAAWF,wBAAX,EAAqC,GAArC,CAAd,EAAyD,EAAzD,CAAP;AACD,CAfD;AAiBA;AACA;AACA;;;AACA,IAAMG,sBAAsB,GAAG,SAAzBA,sBAAyB,CAACL,KAAD,EAAQM,gBAAR,EAA6B;EAC1D,IAAI,OAAON,KAAP,KAAiB,QAArB,EAA+B;IAC7B,OAAOA,KAAP;EACD;;EAED,IAAIM,gBAAgB,IAAI,IAApB,IAA4BA,gBAAgB,KAAK,EAArD,EAAyD;IACvD,OAAON,KAAP;EACD;;EAED,OAAOA,KAAK,CAACG,OAAN,CAAcG,gBAAd,EAAgC,GAAhC,CAAP;AACD,CAVD;AAYA;AACA;AACA;AACA;;;AACA,IAAMC,aAAa,GAAG,SAAhBA,aAAgB,CACpBP,KADoB,EAIT;EAAA,IAFXC,iBAEW,uEAFkB,GAElB;EAAA,IADXK,gBACW,uEADiB,GACjB;;EACX,IAAIN,KAAK,IAAI,IAAT,IAAiBA,KAAK,KAAK,EAA/B,EAAmC;IACjC,OAAOQ,GAAP;EACD;;EAED,IAAMC,eAAe,GAAGV,uBAAuB,CAACC,KAAD,EAAQC,iBAAR,CAA/C;EAEA,IAAMS,4BAA4B,GAAGL,sBAAsB,CACzDI,eADyD,EAEzDH,gBAFyD,CAA3D;EAKA,OAAOK,MAAM,CAACD,4BAAD,CAAb;AACD,CAjBD;AAmBA;AACA;AACA;;;;;AACA,IAAME,mBAAmB,GAAG,SAAtBA,mBAAsB,CAC1BZ,KAD0B,EAIf;EAAA,IAFXC,iBAEW,uEAFkB,GAElB;EAAA,IADXK,gBACW,uEADiB,GACjB;;EACX,IAAIN,KAAK,IAAI,IAAT,IAAiBA,KAAK,KAAK,EAA/B,EAAmC;IACjC,OAAO,KAAP;EACD;;EAED,IAAMS,eAAe,GAAGV,uBAAuB,CAACC,KAAD,EAAQC,iBAAR,CAA/C;EAEA,IAAMS,4BAA4B,GAAGL,sBAAsB,CACzDI,eADyD,EAEzDH,gBAFyD,CAA3D;;EAKA,IAAI;IACF,OAAO,IAAAO,YAAA,EAAIH,4BAAJ,EAAkCI,OAAlC,EAAP;EACD,CAFD,CAEE,OAAOC,KAAP,EAAc;IACd,OAAO,KAAP;EACD;AACF,CArBD"}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.18.4",
+  "version": "1.18.7-beta.0",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
   "main": "lib/index.js",
   "module": "esm/index.js",
   "engines": {
-    "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
+    "node": "^14.13.1 || >=16.0.0"
   },
   "esnext": "src/index.js",
   "sideEffects": false,
@@ -68,17 +68,17 @@
   "peerDependencies": {
     "history": "^4.0.0",
     "polished": "^4.0.0",
-    "react": "^16.14.0 || ^17.0.0",
-    "react-dom": "^16.14.0 || ^17.0.0",
+    "react": "^16.14.0 || ^17.0.0 || ^18.0.0",
+    "react-dom": "^16.14.0 || ^17.0.0 || ^18.0.0",
     "react-helmet-async": "^1.0.0",
-    "react-redux": "^7.0.0",
+    "react-redux": "^7.0.0 || ^8.0.0",
     "react-router": "^5.2.0",
     "redux": "^4.0.0",
     "redux-thunk": "^2.3.0",
     "styled-components": "^5.2.0"
   },
   "dependencies": {
-    "@babel/runtime-corejs3": "^7.17.9",
+    "@babel/runtime-corejs3": "^7.18.0",
     "big.js": "^6.1.1",
     "date-fns": "^2.28.0",
     "deepmerge": "^4.2.2",
@@ -96,39 +96,39 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.17.10",
-    "@babel/core": "^7.17.10",
+    "@babel/core": "^7.18.0",
     "@babel/eslint-parser": "^7.17.0",
     "@babel/eslint-plugin": "^7.16.5",
-    "@babel/plugin-proposal-class-properties": "^7.16.7",
+    "@babel/plugin-proposal-class-properties": "^7.17.12",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@babel/plugin-transform-runtime": "^7.17.10",
-    "@babel/preset-env": "^7.17.10",
-    "@babel/preset-flow": "^7.16.7",
-    "@babel/preset-react": "^7.16.7",
-    "@commitlint/cli": "^16.2.4",
-    "@commitlint/config-conventional": "^16.2.4",
-    "@testing-library/react-hooks": "^8.0.0",
+    "@babel/plugin-transform-runtime": "^7.18.0",
+    "@babel/preset-env": "^7.18.0",
+    "@babel/preset-flow": "^7.17.12",
+    "@babel/preset-react": "^7.17.12",
+    "@commitlint/cli": "^17.0.0",
+    "@commitlint/config-conventional": "^17.0.0",
+    "@testing-library/react": "^13.2.0",
     "auditjs": "^4.0.37",
     "babel-jest": "^28.1.0",
     "babel-plugin-styled-components": "^2.0.7",
     "cherry-pick": "^0.5.0",
     "cross-env": "^7.0.3",
     "documentation": "^13.2.5",
-    "eslint": "^8.15.0",
+    "eslint": "^8.16.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-plugin-babel": "^5.3.1",
     "eslint-plugin-ft-flow": "^2.0.1",
     "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jest": "^26.1.5",
-    "eslint-plugin-jsdoc": "^39.2.9",
-    "eslint-plugin-react": "^7.28.0",
+    "eslint-plugin-jest": "^26.2.2",
+    "eslint-plugin-jsdoc": "^39.3.0",
+    "eslint-plugin-react": "^7.30.0",
     "eslint-plugin-react-hooks": "^4.5.0",
-    "flow-bin": "^0.178.0",
+    "flow-bin": "^0.178.1",
     "flow-copy-source": "^2.0.9",
     "flow-typed": "^3.6.1",
-    "glob": "^8.0.1",
+    "glob": "^8.0.3",
     "history": "^4.0.0",
-    "husky": "^7.0.4",
+    "husky": "^8.0.1",
     "jest": "^28.1.0",
     "jest-environment-jsdom": "^28.1.0",
     "jest-junit": "^13.2.0",
@@ -137,17 +137,17 @@
     "lint-staged": "^12.4.1",
     "polished": "^4.2.2",
     "prettier": "^2.6.2",
-    "react": "^17.0.2",
-    "react-dom": "^17.0.2",
+    "react": "^18.1.0",
+    "react-dom": "^18.1.0",
     "react-helmet-async": "^1.3.0",
-    "react-redux": "^7.2.8",
+    "react-redux": "^8.0.2",
     "react-router": "^5.2.0",
-    "react-test-renderer": "^17.0.2",
+    "react-test-renderer": "^18.1.0",
     "redux": "^4.2.0",
     "redux-mock-store": "^1.5.4",
     "redux-thunk": "^2.4.1",
     "rimraf": "^3.0.2",
-    "standard-version": "^9.3.2",
+    "standard-version": "^9.5.0",
     "styled-components": "^5.3.5",
     "xhr-mock": "^2.5.1"
   },

package/src/hooks/__tests__/UseModularUIModel.spec.js

@@ -1,7 +1,7 @@
 import configureMockStore from "redux-mock-store";
 import thunk from "redux-thunk";
 import { Provider } from "react-redux";
-import { renderHook } from "@testing-library/react-hooks";
+import { renderHook } from "@testing-library/react";
 import xhrMock from "xhr-mock";
 
 import {

package/src/hooks/__tests__/useAuthentication.spec.js

@@ -1,7 +1,7 @@
 import configureMockStore from "redux-mock-store";
 import thunk from "redux-thunk";
 import { Provider } from "react-redux";
-import { renderHook } from "@testing-library/react-hooks";
+import { renderHook } from "@testing-library/react";
 import xhrMock from "xhr-mock";
 
 import { useLogin, useLogout } from "../useAuthentication";
@@ -88,7 +88,8 @@ describe("authentication hooks", () => {
       return res.status(200).body({ data: "ok" });
     });
 
-    const store = mockStore({ auth: {} });
+    const store = mockStore({ auth: {}, i18n: { locale: "en" } });
+
     /**
      */
     const wrapper = ({ children }) => (
@@ -107,6 +108,19 @@ describe("authentication hooks", () => {
     expect(store.getActions()).toStrictEqual([
       { type: "START_PROGRESS" },
       { type: "MODULARUI/RESET" },
+      {
+        type: "MODULARUI/STATUS",
+        payload: { key: "application(/)(en)", status: "LOADING" },
+      },
+      { type: "START_PROGRESS" },
+      expect.objectContaining({
+        type: "MODULARUI/FETCH",
+        payload: expect.objectContaining({
+          href: new Href("/", "Application"),
+        }),
+      }),
+      { type: "FINISH_PROGRESS" },
+
       { type: "AUTHENTICATION_LOGOUT" },
       { type: "FINISH_PROGRESS" },
     ]);

package/src/hooks/__tests__/useForm.spec.js

@@ -1,7 +1,7 @@
 import configureMockStore from "redux-mock-store";
 import thunk from "redux-thunk";
 import { Provider } from "react-redux";
-import { renderHook } from "@testing-library/react-hooks";
+import { renderHook } from "@testing-library/react";
 import xhrMock from "xhr-mock";
 
 import {

package/src/hooks/__tests__/useModal.spec.js

@@ -1,6 +1,6 @@
 import configureMockStore from "redux-mock-store";
 import { Provider } from "react-redux";
-import { renderHook } from "@testing-library/react-hooks";
+import { renderHook } from "@testing-library/react";
 
 import { useModal } from "../useModal";
 import { IllegalArgumentException } from "../../exceptions";

package/src/hooks/__tests__/useModelCatalog.spec.js

@@ -1,7 +1,7 @@
 import configureMockStore from "redux-mock-store";
 import thunk from "redux-thunk";
 import { Provider } from "react-redux";
-import { renderHook } from "@testing-library/react-hooks";
+import { renderHook } from "@testing-library/react";
 import xhrMock from "xhr-mock";
 
 import {

package/src/hooks/__tests__/useModels.spec.js

@@ -1,5 +1,5 @@
 import { useModels } from "../useModels";
-import { renderHook } from "@testing-library/react-hooks";
+import { renderHook } from "@testing-library/react";
 import { Provider } from "react-redux";
 import configureMockStore from "redux-mock-store";
 

package/src/hooks/__tests__/useModularUIBasic.spec.js

@@ -1,12 +1,11 @@
 import configureMockStore from "redux-mock-store";
 import thunk from "redux-thunk";
 import { Provider } from "react-redux";
-import { renderHook } from "@testing-library/react-hooks";
+import { renderHook } from "@testing-library/react";
 import xhrMock from "xhr-mock";
 
 import { useModularUIBasic } from "../useModularUIBasic";
 import { ApplicationModel, Href } from "../../models";
-import { IllegalArgumentException } from "../../exceptions";
 
 const middlewares = [thunk];
 const mockStore = configureMockStore(middlewares);
@@ -74,22 +73,6 @@ describe("modularui hooks", () => {
     ]);
   });
 
-  it("missing href", () => {
-    const store = mockStore({
-      modularui: {},
-      router: { location: { pathname: "/", state: { reload: true } } },
-      i18n: { locale: "en" },
-    });
-    /**
-     */
-    const wrapper = ({ children }) => (
-      <Provider store={store}>{children}</Provider>
-    );
-
-    const { result } = renderHook(() => useModularUIBasic(), { wrapper });
-    expect(result.error).toBeInstanceOf(IllegalArgumentException);
-  });
-
   it("useModularUIBasic with reload", () => {
     expect.assertions(2);
 

package/src/hooks/__tests__/useNotification.spec.js

@@ -1,6 +1,6 @@
 import configureMockStore from "redux-mock-store";
 import { Provider } from "react-redux";
-import { renderHook } from "@testing-library/react-hooks";
+import { renderHook } from "@testing-library/react";
 import { useNotification } from "../useNotification";
 
 const mockStore = configureMockStore();

package/src/hooks/__tests__/usePreference.spec.js

@@ -1,6 +1,6 @@
 import configureMockStore from "redux-mock-store";
 import { Provider } from "react-redux";
-import { renderHook } from "@testing-library/react-hooks";
+import { renderHook } from "@testing-library/react";
 import { usePreference } from "../usePreference";
 
 const mockStore = configureMockStore();

package/src/hooks/__tests__/useProgressIndicator.spec.js

@@ -1,6 +1,6 @@
 import configureMockStore from "redux-mock-store";
 import { Provider } from "react-redux";
-import { renderHook } from "@testing-library/react-hooks";
+import { renderHook } from "@testing-library/react";
 import { useProgressIndicator } from "../useProgressIndicator";
 
 const mockStore = configureMockStore();

package/src/hooks/useAuthentication.js

@@ -1,9 +1,8 @@
 // @flow
 import { useSelector, useDispatch } from "react-redux";
+
 import { getApplication } from "../redux/_modularui/selectors";
 import { login, logout, resetAuthErrors } from "../redux/actions";
-import UserServicesModel from "../models/user/UserServicesModel";
-import { useState, useEffect } from "react";
 
 import type { ResetAuthErrorsAction } from "../redux/types";
 type LoginHook = {
@@ -17,19 +16,6 @@ type LogoutHook = {
   logout: () => void,
 };
 
-const getIsAuthenticated = (isAuthenticated, application) => {
-  if (!application) {
-    return false;
-  }
-
-  const userServicesModel = application.userServices;
-  if (userServicesModel instanceof UserServicesModel) {
-    return isAuthenticated && userServicesModel.isLoggedIn;
-  }
-
-  return false;
-};
-
 /**
  */
 export const useLogin = (): LoginHook => {
@@ -39,7 +25,7 @@ export const useLogin = (): LoginHook => {
   const auth = useSelector((state) => state.auth);
 
   return {
-    isAuthenticated: getIsAuthenticated(auth.isAuthenticated, application),
+    isAuthenticated: application?.isLoggedIn ?? false,
     errorMessage: auth.error,
     resetErrors: () => dispatch(resetAuthErrors()),
     login: (username: string, password: string) =>
@@ -52,28 +38,9 @@ export const useLogin = (): LoginHook => {
 export const useLogout = (): LogoutHook => {
   const dispatch = useDispatch();
   const application = useSelector(getApplication);
-  const auth = useSelector((state) => state.auth?.isAuthenticated || false);
-
-  const [cancel, setCancel] = useState(false);
-  const [isAuthenticated, setIsAuthenticated] = useState(() =>
-    getIsAuthenticated(auth, application)
-  );
-
-  // set cancel to true when the component this hook is used on, has been unmounted
-  // prevents state changes after unmount
-  useEffect(() => {
-    return () => {
-      setCancel(true);
-    };
-  }, []);
 
   return {
-    isAuthenticated,
-    logout: () =>
-      dispatch(logout()).then(() => {
-        if (!cancel) {
-          setIsAuthenticated(false);
-        }
-      }),
+    isAuthenticated: application?.isLoggedIn ?? false,
+    logout: () => dispatch(logout()),
   };
 };

package/src/modularui/Authenticate.js

@@ -153,12 +153,13 @@ class Authenticate {
 
   /**
    */
-  logout(): Promise<void> {
+  logout(): Promise<any> {
     return universalFetch({
       url: `${BASE}${logoutPath()}`,
-    }).then(() => {
+    }).then((response) => {
       // clear cache because of cached contributions
       Cache.clear();
+      return response;
     });
   }
 }

package/src/redux/_router/__tests__/hooks.spec.js

@@ -1,6 +1,6 @@
 import configureMockStore from "redux-mock-store";
 import { Provider } from "react-redux";
-import { renderHook } from "@testing-library/react-hooks";
+import { renderHook } from "@testing-library/react";
 import {
   useLocation,
   useLocationKey,

package/src/redux/actions/SignOut.js

@@ -4,6 +4,7 @@ import { startProgress, finishProgress } from "./ProgressIndicator";
 import { resetModularUI } from "../_modularui/actions";
 
 import type { Dispatch, LogoutSuccessAction, ThunkAction } from "../types";
+import { reloadApplication } from "./Application";
 
 /**
  * Send logout success action
@@ -17,9 +18,12 @@ export const logoutSuccess = (): LogoutSuccessAction => ({
 export const logout = (): ThunkAction => (dispatch: Dispatch) => {
   dispatch(startProgress());
 
-  return new Authenticate().logout().then(() => {
-    dispatch(resetModularUI());
-    dispatch(logoutSuccess());
-    return dispatch(finishProgress());
-  });
+  return new Authenticate()
+    .logout()
+    .then(() => dispatch(resetModularUI()))
+    .then(() => dispatch(reloadApplication()))
+    .then(() => {
+      dispatch(logoutSuccess());
+      return dispatch(finishProgress());
+    });
 };

package/src/redux/connectors/SignIn.js

@@ -5,8 +5,6 @@ import { login } from "../actions/SignIn";
 
 import { getApplication } from "../_modularui/selectors";
 
-import UserServicesModel from "../../models/user/UserServicesModel";
-
 import type { ReduxState, ThunkAction } from "../types";
 import type { ComponentType } from "react";
 
@@ -28,10 +26,7 @@ const mapStateToProps = (state: ReduxState): StateProps => {
   const application = getApplication(state);
 
   return {
-    isAuthenticated:
-      state.auth.isAuthenticated &&
-      application?.userServices instanceof UserServicesModel &&
-      application.userServices.isLoggedIn,
+    isAuthenticated: application?.isLoggedIn ?? false,
     errorMessage: state.auth.error,
   };
 };

package/src/redux/connectors/SignOut.js

@@ -5,6 +5,7 @@ import { logout } from "../actions/SignOut";
 
 import type { ThunkAction } from "../types";
 import type { ComponentType } from "react";
+import { getApplication } from "../_modularui";
 
 type StateProps = {
   isAuthenticated: boolean,
@@ -20,7 +21,7 @@ type Props = {
 };
 
 const mapStateToProps = (state): StateProps => ({
-  isAuthenticated: state.auth.isAuthenticated,
+  isAuthenticated: getApplication(state)?.isLoggedIn ?? false,
 });
 
 const mapDispatchToProps = { doLogout: logout };

package/src/redux/reducers/AuthReducer.js

@@ -1,12 +1,9 @@
 // @flow
-import Cache from "../../utils/browser/Cache";
-
 import type { Reducer } from "redux";
 import type { AuthState, ReduxAction } from "../types";
 
 // REDUCER
 const initialState: AuthState = {
-  isAuthenticated: false,
   mustChangePassword: false,
   error: null,
 };
@@ -26,7 +23,6 @@ const AuthReducer: Reducer<AuthState, ReduxAction> = (
     case "AUTHENTICATION_SUCCESS":
       return {
         ...state,
-        isAuthenticated: true,
         error: null,
         mustChangePassword: false,
       };
@@ -38,15 +34,9 @@ const AuthReducer: Reducer<AuthState, ReduxAction> = (
       return { ...state, error: null };
 
     case "AUTHENTICATION_LOGOUT": {
-      // clear cache because of cached contributions
-      if (state.isAuthenticated) {
-        Cache.clear();
-      }
-
       return {
         ...state,
         mustChangePassword: false,
-        isAuthenticated: false,
         error: null,
       };
     }
@@ -54,7 +44,6 @@ const AuthReducer: Reducer<AuthState, ReduxAction> = (
     case "CHANGE_PASSWORD":
       return {
         ...state,
-        isAuthenticated: true,
         mustChangePassword: true,
         error: null,
       };

package/src/redux/reducers/__tests__/AuthReducer.spec.js

@@ -3,13 +3,11 @@ import AuthReducer from "../AuthReducer";
 describe("authentication reducer", () => {
   it("should return the initial state", () => {
     expect(AuthReducer(undefined, {})).toStrictEqual({
-      isAuthenticated: false,
       mustChangePassword: false,
       error: null,
     });
 
     expect(AuthReducer()).toStrictEqual({
-      isAuthenticated: false,
       mustChangePassword: false,
       error: null,
     });
@@ -24,7 +22,6 @@ describe("authentication reducer", () => {
         }
       )
     ).toStrictEqual({
-      isAuthenticated: true,
       mustChangePassword: false,
       error: null,
     });
@@ -49,7 +46,6 @@ describe("authentication reducer", () => {
     expect(
       AuthReducer(
         {
-          isAuthenticated: true,
           mustChangePassword: false,
           error: null,
         },
@@ -58,7 +54,6 @@ describe("authentication reducer", () => {
         }
       )
     ).toStrictEqual({
-      isAuthenticated: false,
       mustChangePassword: false,
       error: null,
     });
@@ -68,7 +63,6 @@ describe("authentication reducer", () => {
     expect(
       AuthReducer(
         {
-          isAuthenticated: false,
           mustChangePassword: false,
           error: "In error",
         },
@@ -77,7 +71,6 @@ describe("authentication reducer", () => {
         }
       )
     ).toStrictEqual({
-      isAuthenticated: false,
       mustChangePassword: false,
       error: null,
     });
@@ -87,7 +80,6 @@ describe("authentication reducer", () => {
     expect(
       AuthReducer(
         {
-          isAuthenticated: true,
           mustChangePassword: false,
           error: null,
         },
@@ -96,7 +88,6 @@ describe("authentication reducer", () => {
         }
       )
     ).toStrictEqual({
-      isAuthenticated: true,
       mustChangePassword: true,
       error: null,
     });

package/src/redux/types.js

@@ -168,7 +168,6 @@ export type ReduxAction =
 
 // Redux state
 export type AuthState = {
-  +isAuthenticated: boolean,
   +mustChangePassword: boolean,
   +error: ?string,
 };

package/src/utils/helpers/checkResource.js

@@ -17,6 +17,8 @@ export const resourceExists = (url: string | Href): boolean => {
   xhr.open("HEAD", fullUrl, false);
   xhr.setRequestHeader("Accept", "application/json");
   xhr.setRequestHeader("Content-Type", "application/json");
+  xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+
   xhr.send();
 
   return xhr.status !== 404;
@@ -34,6 +36,7 @@ export const resourceRedirectsToSecureLogin = (url: string | Href): boolean => {
   xhr.open("HEAD", fullUrl, false);
   xhr.setRequestHeader("Accept", "application/json");
   xhr.setRequestHeader("Content-Type", "application/json");
+  xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
   xhr.send();
 
   const responseURL = xhr.responseURL ?? "";