@beinformed/ui 1.18.2 → 1.18.5

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.2",
+  "version": "1.18.5",
   "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,
@@ -78,7 +78,7 @@
     "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,41 +96,41 @@
   },
   "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",
+    "@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-hooks": "^8.0.0",
     "auditjs": "^4.0.37",
-    "babel-jest": "^28.0.3",
+    "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.14.0",
+    "eslint": "^8.15.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.176.3",
+    "flow-bin": "^0.178.0",
     "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",
-    "jest": "^28.0.3",
-    "jest-environment-jsdom": "^28.0.2",
+    "husky": "^8.0.1",
+    "jest": "^28.1.0",
+    "jest-environment-jsdom": "^28.1.0",
     "jest-junit": "^13.2.0",
     "jest-sonar-reporter": "^2.0.0",
     "jscodeshift": "^0.13.1",
@@ -147,7 +147,7 @@
     "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/constants/Constants.js

@@ -198,6 +198,7 @@ export const ATTRIBUTE_WIDTH = {
 
 export const ALL_CONTENT_IN_DATA_SETTING = "hasAllContentInData";
 
+export const LOGIN_TYPE = "security.clients";
 export const LOGIN_PATH_SETTING = "FormClient.login_url";
 export const LOGIN_USERNAME_SETTING = "FormClient.username_field_name";
 export const LOGIN_PASSWORD_SETTING = "FormClient.password_field_name";

package/src/constants/Settings.js

@@ -1,8 +1,8 @@
 // @flow
 import { isPlainObject, has } from "../utils/helpers/objects";
 import {
-  BASE,
   ALL_CONTENT_IN_DATA_SETTING,
+  LOGIN_TYPE,
   LOGIN_PATH_SETTING,
   LOGIN_USERNAME_SETTING,
   LOGIN_PASSWORD_SETTING,
@@ -123,10 +123,15 @@ export const allSettings = (): { [name: string]: Setting } => settings;
 export const hasAllContentInData = (): boolean =>
   getSetting(ALL_CONTENT_IN_DATA_SETTING, true);
 
+/**
+ * Login type, only available when pac4j is configured
+ */
+export const loginType = (): string => getSetting(LOGIN_TYPE, "JAAS");
+
 /**
  */
 export const loginPath = (): string =>
-  getSetting(LOGIN_PATH_SETTING, `${BASE}/j_security_check`);
+  getSetting(LOGIN_PATH_SETTING, "/j_security_check");
 /**
  */
 export const loginUsernameField = (): string =>
@@ -138,4 +143,4 @@ export const loginPasswordField = (): string =>
 /**
  */
 export const logoutPath = (): string =>
-  getSetting(LOGOUT_PATH_SETTING, `${BASE}/Logoff`);
+  getSetting(LOGOUT_PATH_SETTING, "/Logoff");

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

@@ -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/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/models/form/FormModel.js

@@ -472,7 +472,7 @@ class FormModel extends ResourceModel {
         }
       }
 
-      return this.currentFormObject.isValid;
+      return this.currentFormObject?.isValid ?? true;
     }
 
     return true;

package/src/models/list/ListModel.js

@@ -48,7 +48,7 @@ export default class ListModel extends ResourceModel {
       data.contributions.resourcetype &&
       (data.contributions.resourcetype.endsWith("List") ||
         data.contributions.resourcetype.endsWith("ListPanel") ||
-        data.contributions.resourcetype.endsWith("RelatedDatastorePanel") ||
+        data.contributions.resourcetype.endsWith("RelatedDataStorePanel") ||
         [
           "list-related-cases",
           "RecordPanel",

package/src/models/list/__tests__/ListModel.spec.js

@@ -7,6 +7,10 @@ import ListModel from "../ListModel";
 import mockList from "./list.json";
 import mockListContributions from "./listContributions.json";
 
+import testData from "./related-data.json";
+import testContributions from "./related-contributions.json";
+import ModularUIResponse from "../../../modularui/ModularUIResponse";
+
 describe("listModel spec", () => {
   it("should be able to create an empty list", () => {
     const list = new ListModel();
@@ -120,4 +124,13 @@ describe("listModel spec", () => {
       "<p>This is introtext</p>"
     );
   });
+
+  it("list model is applicable for contributions with resourcetype RecordRelatedDataStorePanel", () => {
+    const data = ModularUIResponse.create({
+      key: "Bewijsstukken",
+      data: testData,
+      contributions: testContributions,
+    });
+    expect(ListModel.isApplicableModel(data)).toBe(true);
+  });
 });

package/src/models/list/__tests__/related-contributions.json

@@ -0,0 +1,42 @@
+{
+  "Bewijsstukken": {
+    "label": "Bewijsstukken",
+    "resourcetype": "RecordRelatedDataStorePanel",
+    "paging": {
+      "pagesize": {
+        "options": [10, 25, 50]
+      }
+    },
+    "sorting": {
+      "attributes": ["CreationDate", "FileName"]
+    },
+    "results": {
+      "Bewijsstukken": {
+        "metadata": {
+          "_id": {
+            "type": "number"
+          }
+        },
+        "attributes": [
+          {
+            "FileName": {
+              "type": "string",
+              "label": "FileName",
+              "layouthint": ["download=CmfDocumentRecordId"],
+              "displaysize": 50,
+              "maxLength": 255
+            }
+          },
+          {
+            "CreationDate": {
+              "type": "date",
+              "label": "CreationDate",
+              "formatlabel": "dd-mm-jjjj",
+              "format": "dd-MM-yyyy"
+            }
+          }
+        ]
+      }
+    }
+  }
+}

package/src/models/list/__tests__/related-data.json

@@ -0,0 +1,32 @@
+{
+  "Bewijsstukken": {
+    "_links": {
+      "self": {
+        "href": "/mijn-account/gebruiker/981/overige-wijzigingshistorie/ta-wijzigings-historie/6341/bewijsstukken"
+      },
+      "api_doc": {
+        "href": "/api-docs/v3/mijn-account/gebruiker/(case-id)/overige-wijzigingshistorie/ta-wijzigings-historie/(ta-wijzigings-historie-record-id)/bewijsstukken"
+      },
+      "contributions": {
+        "href": "/contributions/mijn-account/gebruiker/(case-id)/overige-wijzigingshistorie/ta-wijzigings-historie/(ta-wijzigings-historie-record-id)/bewijsstukken"
+      }
+    },
+    "paging": { "totalresults": 1, "pagesize": 25, "page": 1, "maxpages": 1 },
+    "_embedded": {
+      "results": [
+        {
+          "Bewijsstukken": {
+            "_id": 181,
+            "_links": {
+              "self": {
+                "href": "/mijn-account/gebruiker/981/overige-wijzigingshistorie/ta-wijzigings-historie/6341/bewijsstukken/181"
+              }
+            },
+            "FileName": "dummy.pdf",
+            "CreationDate": "2022-04-22"
+          }
+        }
+      ]
+    }
+  }
+}

package/src/modularui/Authenticate.js

@@ -5,10 +5,10 @@ import universalFetch from "../utils/fetch/universalFetch";
 import Cache from "../utils/browser/Cache";
 
 import { UnauthorizedException } from "../exceptions";
-import type { RequestOptions } from "../utils/fetch/types";
 import {
-  loginPasswordField,
+  loginType,
   loginPath,
+  loginPasswordField,
   loginUsernameField,
   logoutPath,
 } from "../constants";
@@ -24,10 +24,27 @@ class Authenticate {
     this._isBasic = false;
   }
 
+  /**
+   */
+  get authenticationType(): "JAAS" | "PAC4J_FORM" | "PAC4J_BASIC" {
+    const type = loginType();
+
+    if (!type || type === "JAAS") {
+      return "JAAS";
+    }
+    if (type.includes("FormClient")) {
+      return "PAC4J_FORM";
+    } else if (type.includes("BasicClient")) {
+      return "PAC4J_BASIC";
+    }
+
+    throw new Error(`Unsupported login type found: ${type}`);
+  }
+
   /**
    */
   get isBasicAuthentication(): boolean {
-    return this._isBasic;
+    return this._isBasic || this.authenticationType === "PAC4J_BASIC";
   }
 
   /**
@@ -64,47 +81,85 @@ class Authenticate {
 
   /**
    */
-  createLogin(username: string, password: string): $Shape<RequestOptions> {
-    const LOGIN_PATH = loginPath();
-    const usernameField = loginUsernameField();
-    const passwordField = loginPasswordField();
+  login(username: string, password: string): Promise<any> {
+    switch (this.authenticationType) {
+      case "PAC4J_FORM":
+        return this.doFormLogin(username, password);
+      case "PAC4J_BASIC":
+        return this.doBasicAuthentication(username, password);
+      default:
+        return this.doJaasAuthentication(username, password);
+    }
+  }
+
+  /**
+   */
+  getFormLoginUrl(): string {
+    switch (this.authenticationType) {
+      case "PAC4J_BASIC":
+      case "PAC4J_FORM":
+        return `${BASE}${loginPath()}`;
+      default:
+        return `${BASE}/j_security_check`;
+    }
+  }
 
+  /**
+   */
+  getFormLoginData(username: string, password: string): string {
     const encodedUsername = encodeURIComponent(username);
     const encodedPassword = encodeURIComponent(password);
 
-    return {
-      url: LOGIN_PATH,
+    switch (this.authenticationType) {
+      case "PAC4J_BASIC":
+      case "PAC4J_FORM":
+        return `${loginUsernameField()}=${encodedUsername}&${loginPasswordField()}=${encodedPassword}`;
+      default:
+        return `j_username=${encodedUsername}&j_password=${encodedPassword}`;
+    }
+  }
+
+  /**
+   */
+  doFormLogin(username: string, password: string): Promise<any> {
+    return universalFetch({
+      url: this.getFormLoginUrl(),
       method: HTTP_METHODS.POST,
       headers: {
         Accept: "application/json",
         "Content-Type": "application/x-www-form-urlencoded",
       },
-      data: `${usernameField}=${encodedUsername}&${passwordField}=${encodedPassword}`,
-    };
+      data: this.getFormLoginData(username, password),
+    });
   }
 
   /**
    */
-  login(username: string, password: string): Promise<any> {
+  doBasicAuthentication(username: string, password: string): Promise<any> {
+    Cache.addItem("basic", btoa(`${username}:${password}`));
+    return Promise.resolve();
+  }
+
+  /**
+   */
+  doJaasAuthentication(username: string, password: string): Promise<any> {
     return this.initLogin(true).then(() => {
       if (this.isBasicAuthentication) {
-        Cache.addItem("basic", btoa(`${username}:${password}`));
-
-        return Promise.resolve();
+        return this.doBasicAuthentication(username, password);
       }
-
-      return universalFetch(this.createLogin(username, password));
+      return this.doFormLogin(username, password);
     });
   }
 
   /**
    */
-  logout(): Promise<void> {
+  logout(): Promise<any> {
     return universalFetch({
-      url: logoutPath(),
-    }).then(() => {
+      url: `${BASE}${logoutPath()}`,
+    }).then((response) => {
       // clear cache because of cached contributions
       Cache.clear();
+      return response;
     });
   }
 }

package/src/react-server/__tests__/serverUtil.spec.js

@@ -112,10 +112,11 @@ describe("serverUtil", () => {
       {
         type: "SET_PREFERENCES",
         payload: {
-          "FormClient.login_url": "/BeInformed/j_security_check",
-          "FormClient.logout_url": "/BeInformed/Logoff",
+          "FormClient.login_url": "/j_security_check",
+          "FormClient.logout_url": "/Logoff",
           "FormClient.password_field_name": "j_password",
           "FormClient.username_field_name": "j_username",
+          "security.clients": null,
         },
       },
     ]);
@@ -158,10 +159,11 @@ describe("serverUtil", () => {
       {
         type: "SET_PREFERENCES",
         payload: {
-          "FormClient.login_url": "/BeInformed/j_security_check",
-          "FormClient.logout_url": "/BeInformed/Logoff",
+          "FormClient.login_url": "/j_security_check",
+          "FormClient.logout_url": "/Logoff",
           "FormClient.password_field_name": "j_password",
           "FormClient.username_field_name": "j_username",
+          "security.clients": null,
         },
       },
     ]);

package/src/redux/actions/Preferences.js

@@ -12,8 +12,8 @@ import type {
 } from "../types";
 
 import {
-  BASE,
   ALL_CONTENT_IN_DATA_SETTING,
+  LOGIN_TYPE,
   LOGIN_PASSWORD_SETTING,
   LOGIN_PATH_SETTING,
   LOGIN_USERNAME_SETTING,
@@ -123,9 +123,13 @@ export const setLoginPreferences = (
   state?: ReduxState
 ): SetPreferencesAction => {
   const loginSettings = {
+    [LOGIN_TYPE]: getServerPreferenceValue(
+      LOGIN_TYPE,
+      state?.preferences[LOGIN_TYPE]
+    ),
     [LOGIN_PATH_SETTING]: getServerPreferenceValue(
       LOGIN_PATH_SETTING,
-      state?.preferences[LOGIN_PATH_SETTING] ?? `${BASE}/j_security_check`
+      state?.preferences[LOGIN_PATH_SETTING] ?? `/j_security_check`
     ),
     [LOGIN_USERNAME_SETTING]: getServerPreferenceValue(
       LOGIN_USERNAME_SETTING,
@@ -137,7 +141,7 @@ export const setLoginPreferences = (
     ),
     [LOGOUT_PATH_SETTING]: getServerPreferenceValue(
       LOGOUT_PATH_SETTING,
-      state?.preferences[LOGOUT_PATH_SETTING] ?? `${BASE}/Logoff`
+      state?.preferences[LOGOUT_PATH_SETTING] ?? `/Logoff`
     ),
   };
 

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 };