@beinformed/ui 1.18.3 → 1.18.4

package/lib/react-server/__tests__/serverUtil.spec.js.flow

@@ -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/lib/redux/actions/Preferences.js

@@ -147,7 +147,7 @@ exports.setAllContentInDataSetting = setAllContentInDataSetting;
 var setLoginPreferences = function setLoginPreferences(state) {
   var _state$preferences$LO, _state$preferences$LO2, _state$preferences$LO3, _state$preferences$LO4, _loginSettings;
 
-  var loginSettings = (_loginSettings = {}, (0, _defineProperty2.default)(_loginSettings, _constants.LOGIN_PATH_SETTING, getServerPreferenceValue(_constants.LOGIN_PATH_SETTING, (_state$preferences$LO = state === null || state === void 0 ? void 0 : state.preferences[_constants.LOGIN_PATH_SETTING]) !== null && _state$preferences$LO !== void 0 ? _state$preferences$LO : "".concat(_constants.BASE, "/j_security_check"))), (0, _defineProperty2.default)(_loginSettings, _constants.LOGIN_USERNAME_SETTING, getServerPreferenceValue(_constants.LOGIN_USERNAME_SETTING, (_state$preferences$LO2 = state === null || state === void 0 ? void 0 : state.preferences[_constants.LOGIN_USERNAME_SETTING]) !== null && _state$preferences$LO2 !== void 0 ? _state$preferences$LO2 : "j_username")), (0, _defineProperty2.default)(_loginSettings, _constants.LOGIN_PASSWORD_SETTING, getServerPreferenceValue(_constants.LOGIN_PASSWORD_SETTING, (_state$preferences$LO3 = state === null || state === void 0 ? void 0 : state.preferences[_constants.LOGIN_PASSWORD_SETTING]) !== null && _state$preferences$LO3 !== void 0 ? _state$preferences$LO3 : "j_password")), (0, _defineProperty2.default)(_loginSettings, _constants.LOGOUT_PATH_SETTING, getServerPreferenceValue(_constants.LOGOUT_PATH_SETTING, (_state$preferences$LO4 = state === null || state === void 0 ? void 0 : state.preferences[_constants.LOGOUT_PATH_SETTING]) !== null && _state$preferences$LO4 !== void 0 ? _state$preferences$LO4 : "".concat(_constants.BASE, "/Logoff"))), _loginSettings);
+  var loginSettings = (_loginSettings = {}, (0, _defineProperty2.default)(_loginSettings, _constants.LOGIN_TYPE, getServerPreferenceValue(_constants.LOGIN_TYPE, state === null || state === void 0 ? void 0 : state.preferences[_constants.LOGIN_TYPE])), (0, _defineProperty2.default)(_loginSettings, _constants.LOGIN_PATH_SETTING, getServerPreferenceValue(_constants.LOGIN_PATH_SETTING, (_state$preferences$LO = state === null || state === void 0 ? void 0 : state.preferences[_constants.LOGIN_PATH_SETTING]) !== null && _state$preferences$LO !== void 0 ? _state$preferences$LO : "/j_security_check")), (0, _defineProperty2.default)(_loginSettings, _constants.LOGIN_USERNAME_SETTING, getServerPreferenceValue(_constants.LOGIN_USERNAME_SETTING, (_state$preferences$LO2 = state === null || state === void 0 ? void 0 : state.preferences[_constants.LOGIN_USERNAME_SETTING]) !== null && _state$preferences$LO2 !== void 0 ? _state$preferences$LO2 : "j_username")), (0, _defineProperty2.default)(_loginSettings, _constants.LOGIN_PASSWORD_SETTING, getServerPreferenceValue(_constants.LOGIN_PASSWORD_SETTING, (_state$preferences$LO3 = state === null || state === void 0 ? void 0 : state.preferences[_constants.LOGIN_PASSWORD_SETTING]) !== null && _state$preferences$LO3 !== void 0 ? _state$preferences$LO3 : "j_password")), (0, _defineProperty2.default)(_loginSettings, _constants.LOGOUT_PATH_SETTING, getServerPreferenceValue(_constants.LOGOUT_PATH_SETTING, (_state$preferences$LO4 = state === null || state === void 0 ? void 0 : state.preferences[_constants.LOGOUT_PATH_SETTING]) !== null && _state$preferences$LO4 !== void 0 ? _state$preferences$LO4 : "/Logoff")), _loginSettings);
   (0, _Settings.setSettings)(loginSettings);
   return setPreferences(loginSettings);
 };

package/lib/redux/actions/Preferences.js.flow

@@ -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/lib/redux/actions/Preferences.js.map

@@ -1 +1 @@
-{"version":3,"file":"Preferences.js","names":["getServerPreferenceValue","preferenceName","defaultValue","type","value","preferencesProvider","getPreferenceByName","split","val","setServerPreference","propertyName","setPreference","propertyValue","payload","setPreferences","preferences","setThemePreference","configTheme","themeData","JSON","parse","error","JsonParseException","settings","setAllContentInDataSetting","state","allContentInDataSetting","getModularUIContentInData","ALL_CONTENT_IN_DATA_SETTING","setLoginPreferences","loginSettings","LOGIN_PATH_SETTING","BASE","LOGIN_USERNAME_SETTING","LOGIN_PASSWORD_SETTING","LOGOUT_PATH_SETTING"],"sources":["../../../src/redux/actions/Preferences.js"],"sourcesContent":["// @flow\nimport { isPlainObject } from \"../../utils/helpers/objects\";\n\nimport { JsonParseException } from \"../../exceptions\";\nimport { setSetting, setSettings } from \"../../constants/Settings\";\n\nimport type {\n  PreferenceValue,\n  ReduxState,\n  SetPreferenceAction,\n  SetPreferencesAction,\n} from \"../types\";\n\nimport {\n  BASE,\n  ALL_CONTENT_IN_DATA_SETTING,\n  LOGIN_PASSWORD_SETTING,\n  LOGIN_PATH_SETTING,\n  LOGIN_USERNAME_SETTING,\n  LOGOUT_PATH_SETTING,\n} from \"../../constants\";\n\n/**\n */\nconst getServerPreferenceValue = (\n  preferenceName: string,\n  defaultValue: PreferenceValue = null,\n  type?: string\n) => {\n  let value = null;\n  if (typeof preferencesProvider !== \"undefined\") {\n    value = preferencesProvider.getPreferenceByName(preferenceName);\n  }\n\n  if (value == null) {\n    value = defaultValue;\n  }\n\n  if (typeof value === \"string\" && type !== \"string\" && value.includes(\",\")) {\n    value = value.split(\",\").map((val) => val.trim());\n  }\n\n  return value;\n};\n\n/**\n */\nexport const setServerPreference = (\n  propertyName: string,\n  defaultValue: PreferenceValue = null,\n  type?: string\n): SetPreferenceAction => {\n  const value = getServerPreferenceValue(propertyName, defaultValue, type);\n  return setPreference(propertyName, value);\n};\n\n/**\n */\nexport const setPreference = (\n  propertyName: string,\n  propertyValue: PreferenceValue = null\n): SetPreferenceAction => ({\n  type: \"SET_PREFERENCE\",\n  payload: {\n    [propertyName]: propertyValue,\n  },\n});\n\n/**\n */\nexport const setPreferences = (preferences: Object): SetPreferencesAction => ({\n  type: \"SET_PREFERENCES\",\n  payload: {\n    ...preferences,\n  },\n});\n\n/**\n */\nexport const setThemePreference = (\n  configTheme: string\n): SetPreferenceAction => {\n  let themeData = {};\n\n  try {\n    themeData = configTheme ? JSON.parse(configTheme) : null;\n  } catch (error) {\n    throw new JsonParseException(`Theme file contains invalid JSON: ${error}`);\n  }\n\n  if (themeData && isPlainObject(themeData)) {\n    setSettings(themeData.settings);\n  }\n\n  return setPreference(\"theme\", themeData);\n};\n\n/**\n * Make modular-ui-content-in-data preference available client side\n */\nexport const setAllContentInDataSetting = (\n  state?: ReduxState\n): SetPreferenceAction => {\n  let allContentInDataSetting = false;\n\n  if (\n    typeof preferencesProvider !== \"undefined\" &&\n    typeof preferencesProvider.getModularUIContentInData !== \"undefined\"\n  ) {\n    allContentInDataSetting = preferencesProvider.getModularUIContentInData();\n  } else if (typeof state !== \"undefined\") {\n    allContentInDataSetting = state.preferences[ALL_CONTENT_IN_DATA_SETTING];\n  }\n\n  setSetting(ALL_CONTENT_IN_DATA_SETTING, !!allContentInDataSetting);\n  return setPreference(ALL_CONTENT_IN_DATA_SETTING, allContentInDataSetting);\n};\n\n/**\n * Retrieves login settings from runtime preferences and sets them as setting in the preference reducer\n */\nexport const setLoginPreferences = (\n  state?: ReduxState\n): SetPreferencesAction => {\n  const loginSettings = {\n    [LOGIN_PATH_SETTING]: getServerPreferenceValue(\n      LOGIN_PATH_SETTING,\n      state?.preferences[LOGIN_PATH_SETTING] ?? `${BASE}/j_security_check`\n    ),\n    [LOGIN_USERNAME_SETTING]: getServerPreferenceValue(\n      LOGIN_USERNAME_SETTING,\n      state?.preferences[LOGIN_USERNAME_SETTING] ?? \"j_username\"\n    ),\n    [LOGIN_PASSWORD_SETTING]: getServerPreferenceValue(\n      LOGIN_PASSWORD_SETTING,\n      state?.preferences[LOGIN_PASSWORD_SETTING] ?? \"j_password\"\n    ),\n    [LOGOUT_PATH_SETTING]: getServerPreferenceValue(\n      LOGOUT_PATH_SETTING,\n      state?.preferences[LOGOUT_PATH_SETTING] ?? `${BASE}/Logoff`\n    ),\n  };\n\n  setSettings(loginSettings);\n  return setPreferences(loginSettings);\n};\n"],"mappings":"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"}
+{"version":3,"file":"Preferences.js","names":["getServerPreferenceValue","preferenceName","defaultValue","type","value","preferencesProvider","getPreferenceByName","split","val","setServerPreference","propertyName","setPreference","propertyValue","payload","setPreferences","preferences","setThemePreference","configTheme","themeData","JSON","parse","error","JsonParseException","settings","setAllContentInDataSetting","state","allContentInDataSetting","getModularUIContentInData","ALL_CONTENT_IN_DATA_SETTING","setLoginPreferences","loginSettings","LOGIN_TYPE","LOGIN_PATH_SETTING","LOGIN_USERNAME_SETTING","LOGIN_PASSWORD_SETTING","LOGOUT_PATH_SETTING"],"sources":["../../../src/redux/actions/Preferences.js"],"sourcesContent":["// @flow\nimport { isPlainObject } from \"../../utils/helpers/objects\";\n\nimport { JsonParseException } from \"../../exceptions\";\nimport { setSetting, setSettings } from \"../../constants/Settings\";\n\nimport type {\n  PreferenceValue,\n  ReduxState,\n  SetPreferenceAction,\n  SetPreferencesAction,\n} from \"../types\";\n\nimport {\n  ALL_CONTENT_IN_DATA_SETTING,\n  LOGIN_TYPE,\n  LOGIN_PASSWORD_SETTING,\n  LOGIN_PATH_SETTING,\n  LOGIN_USERNAME_SETTING,\n  LOGOUT_PATH_SETTING,\n} from \"../../constants\";\n\n/**\n */\nconst getServerPreferenceValue = (\n  preferenceName: string,\n  defaultValue: PreferenceValue = null,\n  type?: string\n) => {\n  let value = null;\n  if (typeof preferencesProvider !== \"undefined\") {\n    value = preferencesProvider.getPreferenceByName(preferenceName);\n  }\n\n  if (value == null) {\n    value = defaultValue;\n  }\n\n  if (typeof value === \"string\" && type !== \"string\" && value.includes(\",\")) {\n    value = value.split(\",\").map((val) => val.trim());\n  }\n\n  return value;\n};\n\n/**\n */\nexport const setServerPreference = (\n  propertyName: string,\n  defaultValue: PreferenceValue = null,\n  type?: string\n): SetPreferenceAction => {\n  const value = getServerPreferenceValue(propertyName, defaultValue, type);\n  return setPreference(propertyName, value);\n};\n\n/**\n */\nexport const setPreference = (\n  propertyName: string,\n  propertyValue: PreferenceValue = null\n): SetPreferenceAction => ({\n  type: \"SET_PREFERENCE\",\n  payload: {\n    [propertyName]: propertyValue,\n  },\n});\n\n/**\n */\nexport const setPreferences = (preferences: Object): SetPreferencesAction => ({\n  type: \"SET_PREFERENCES\",\n  payload: {\n    ...preferences,\n  },\n});\n\n/**\n */\nexport const setThemePreference = (\n  configTheme: string\n): SetPreferenceAction => {\n  let themeData = {};\n\n  try {\n    themeData = configTheme ? JSON.parse(configTheme) : null;\n  } catch (error) {\n    throw new JsonParseException(`Theme file contains invalid JSON: ${error}`);\n  }\n\n  if (themeData && isPlainObject(themeData)) {\n    setSettings(themeData.settings);\n  }\n\n  return setPreference(\"theme\", themeData);\n};\n\n/**\n * Make modular-ui-content-in-data preference available client side\n */\nexport const setAllContentInDataSetting = (\n  state?: ReduxState\n): SetPreferenceAction => {\n  let allContentInDataSetting = false;\n\n  if (\n    typeof preferencesProvider !== \"undefined\" &&\n    typeof preferencesProvider.getModularUIContentInData !== \"undefined\"\n  ) {\n    allContentInDataSetting = preferencesProvider.getModularUIContentInData();\n  } else if (typeof state !== \"undefined\") {\n    allContentInDataSetting = state.preferences[ALL_CONTENT_IN_DATA_SETTING];\n  }\n\n  setSetting(ALL_CONTENT_IN_DATA_SETTING, !!allContentInDataSetting);\n  return setPreference(ALL_CONTENT_IN_DATA_SETTING, allContentInDataSetting);\n};\n\n/**\n * Retrieves login settings from runtime preferences and sets them as setting in the preference reducer\n */\nexport const setLoginPreferences = (\n  state?: ReduxState\n): SetPreferencesAction => {\n  const loginSettings = {\n    [LOGIN_TYPE]: getServerPreferenceValue(\n      LOGIN_TYPE,\n      state?.preferences[LOGIN_TYPE]\n    ),\n    [LOGIN_PATH_SETTING]: getServerPreferenceValue(\n      LOGIN_PATH_SETTING,\n      state?.preferences[LOGIN_PATH_SETTING] ?? `/j_security_check`\n    ),\n    [LOGIN_USERNAME_SETTING]: getServerPreferenceValue(\n      LOGIN_USERNAME_SETTING,\n      state?.preferences[LOGIN_USERNAME_SETTING] ?? \"j_username\"\n    ),\n    [LOGIN_PASSWORD_SETTING]: getServerPreferenceValue(\n      LOGIN_PASSWORD_SETTING,\n      state?.preferences[LOGIN_PASSWORD_SETTING] ?? \"j_password\"\n    ),\n    [LOGOUT_PATH_SETTING]: getServerPreferenceValue(\n      LOGOUT_PATH_SETTING,\n      state?.preferences[LOGOUT_PATH_SETTING] ?? `/Logoff`\n    ),\n  };\n\n  setSettings(loginSettings);\n  return setPreferences(loginSettings);\n};\n"],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.18.3",
+  "version": "1.18.4",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "http://support.beinformed.com",
@@ -109,12 +109,12 @@
     "@commitlint/config-conventional": "^16.2.4",
     "@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",
@@ -123,14 +123,14 @@
     "eslint-plugin-jsdoc": "^39.2.9",
     "eslint-plugin-react": "^7.28.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",
     "history": "^4.0.0",
     "husky": "^7.0.4",
-    "jest": "^28.0.3",
-    "jest-environment-jsdom": "^28.0.2",
+    "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",

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/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/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,36 +81,73 @@ 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);
     });
   }
 
@@ -101,7 +155,7 @@ class Authenticate {
    */
   logout(): Promise<void> {
     return universalFetch({
-      url: logoutPath(),
+      url: `${BASE}${logoutPath()}`,
     }).then(() => {
       // clear cache because of cached contributions
       Cache.clear();

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`
     ),
   };