@beinformed/ui 1.63.7 → 1.63.9

package/CHANGELOG.md

@@ -2,6 +2,23 @@
 
 All notable changes to this project will be documented in this file. See [commit-and-tag-version](https://github.com/absolute-version/commit-and-tag-version) for commit guidelines.
 
+## [1.63.9](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.63.7...v1.63.9) (2025-11-24)
+
+
+### Bug Fixes
+
+* **authenticate:** convert static methods to instance methods and update `useAuthentication` usage ([c05120a](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/c05120ad267b46aedf8ad7774cb1f58e245b6e52))
+* **authenticate:** refine login type handling and update JAAS support ([c8e87b3](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/c8e87b321ccbd59cb17638f095269c937b8cee15))
+* **logout:** add url parameter to logout redirect for indirect clients ([0cf4ec2](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/0cf4ec2cf73387d95c0e9856a12728fdc48b2a1b))
+
+## [1.63.8](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.63.7...v1.63.8) (2025-11-10)
+
+
+### Bug Fixes
+
+* **authenticate:** convert static methods to instance methods and update `useAuthentication` usage ([c05120a](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/c05120ad267b46aedf8ad7774cb1f58e245b6e52))
+* **authenticate:** refine login type handling and update JAAS support ([c8e87b3](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/c8e87b321ccbd59cb17638f095269c937b8cee15))
+
 ## [1.63.7](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.63.6...v1.63.7) (2025-11-07)
 
 

package/esm/constants/Settings.js.flow

@@ -217,7 +217,7 @@ export const getEnabledLocales = (): Array<string> =>
 /**
  * Login type
  */
-export const loginType = (): string =>
+export const loginType = (): string | Array<string> =>
   getSetting(LOGIN_TYPE, INTERNAL_LOGIN_TYPE.JAAS);
 
 /**

package/esm/constants/Settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"Settings.js","names":["isPlainObject","has","getRepositoryResourceUrl","ALL_CONTENT_IN_DATA_SETTING","INCLUDE_TIME_OFFSET","INTERNAL_LOGIN_TYPE","LOGIN_TYPE","LOGIN_PATH_SETTING","LOGIN_USERNAME_SETTING","LOGIN_PASSWORD_SETTING","LOGOUT_PATH_SETTING","UPLOAD_PATH","CAPTCHA_PATH","serverBase","__CONTEXT_PATH__","defaultSettings","CONTEXT_PATH","window","contextPath","CACHE_CONTRIBUTIONS","DEBUG_I18N_MESSAGE_NOT_FOUND","HIDE_NOTIFICATION_TIMEOUT","ALWAYS_COMMIT_FORM","RENDER_QUESTION_LABELS","RENDER_MANDATORY_ATTRIBUTE_INDICATION","RENDER_OPTIONAL_ATTRIBUTE_INDICATION","AVAILABLE_LIST_VIEWS","USE_CLIENTSIDE_VALIDATION","USE_INSTANT_SERVER_VALIDATION","ENABLED_LOCALES","RENDER_GLOBAL_LOGIN_PAGE","RENDER_GLOBAL_LOGOUT_PAGE","RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE","LOGIN_PATH","ADMINISTRATOR_LOGIN_PATH","LOGOUT_PATH","RENDER_FORMS_IN_MODAL","SHOW_SUBMIT_WAIT_TIMEOUT","SWIM_LANE_DIAGRAM_CONFIGURATION","BUSINESS_SCENARIO_CONCEPT_TYPE","BUSINESS_SCENARIO_STEP_CONCEPT_TYPE","BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE","BUSINESS_SCENARIO_SYSTEM_CONCEPT_TYPE","CALENDAR_WEEK_STARTS_ON","CALENDAR_FIRST_WEEK_CONTAINS_DATE","UI_PARAMETERS","ALLOW_HIDE_WHEN_EMPTY_ON_TABS","PAGE_RELOAD_ON_UNAUTHORIZED_ERROR","XHR_TIMEOUT_MS","XHR_ALWAYS_WITH_CREDENTIALS","HIDE_WHEN_EMPTY_IGNORE_TASKS","SHOW_AVATARS","COMPLETE_SOURCE","settings","setSettings","config","_Object$assign","getSetting","key","defaultValue","undefined","Error","setSetting","value","allSettings","cacheContributions","getBasePath","getBasePathModularUI","getBasePathServer","getUploadPath","origin","getCaptchaPath","hasAllContentInData","isIncludeTimeOffsetInDateTimes","getEnabledLocales","loginType","JAAS","loginPath","clientName","loginUsernameField","loginPasswordField","logoutPath","getSwimLaneDiagramConfiguration","configLocation","_startsWithInstanceProperty","call","setContextPath","BASE"],"sources":["../../src/constants/Settings.js"],"sourcesContent":["// @flow\nimport { isPlainObject, has } from \"../utils/helpers/objects\";\nimport { getRepositoryResourceUrl } from \"../utils/helpers/repositoryResource\";\nimport {\n  ALL_CONTENT_IN_DATA_SETTING,\n  INCLUDE_TIME_OFFSET,\n  INTERNAL_LOGIN_TYPE,\n  LOGIN_TYPE,\n  LOGIN_PATH_SETTING,\n  LOGIN_USERNAME_SETTING,\n  LOGIN_PASSWORD_SETTING,\n  LOGOUT_PATH_SETTING,\n  UPLOAD_PATH,\n  CAPTCHA_PATH,\n} from \"./Constants\";\n\ntype Setting = boolean | string | number | Array<string>;\n\nconst serverBase =\n  typeof __CONTEXT_PATH__ === \"undefined\" ? null : __CONTEXT_PATH__;\n\nconst defaultSettings: { [name: string]: Setting } = {\n  // This uses contextPath set from property from server\n  CONTEXT_PATH:\n    serverBase ??\n    (typeof window !== \"undefined\" && window.contextPath\n      ? window.contextPath\n      : \"/BeInformed\"),\n\n  // Indicates if contributions should be cached\n  CACHE_CONTRIBUTIONS: true,\n\n  // Debug missing i18n messages in layout\n  DEBUG_I18N_MESSAGE_NOT_FOUND: true,\n\n  // Time to show the notification bar\n  HIDE_NOTIFICATION_TIMEOUT: 5000,\n\n  // Always commit form, does not show result pages for instruments\n  ALWAYS_COMMIT_FORM: false,\n\n  // Render instrument and event question labels on forms (might result in duplicate labels)\n  RENDER_QUESTION_LABELS: true,\n\n  // Render mandatory indications on attributes\n  RENDER_MANDATORY_ATTRIBUTE_INDICATION: true,\n\n  // Render optional indications on attributes\n  RENDER_OPTIONAL_ATTRIBUTE_INDICATION: false,\n\n  // Renders a toggle with supported list views, options are ListView and TableView\n  AVAILABLE_LIST_VIEWS: [\"ListView\", \"TableView\"],\n\n  // Toggle client side validation\n  USE_CLIENTSIDE_VALIDATION: true,\n\n  // Indicates if server validation should be used when a form field is changed\n  USE_INSTANT_SERVER_VALIDATION: true,\n\n  // Indicates which locales are enabled\n  ENABLED_LOCALES: [\"en\", \"nl\"],\n\n  // Renders the global log in page\n  RENDER_GLOBAL_LOGIN_PAGE: false,\n\n  // Renders the global log out page\n  RENDER_GLOBAL_LOGOUT_PAGE: false,\n\n  // Renders the login variants as option on the global logout page\n  RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE: false,\n\n  // Path to login page / component\n  LOGIN_PATH: \"/signin\",\n\n  // Path to administrator login page / component\n  ADMINISTRATOR_LOGIN_PATH: \"\",\n\n  // Path to logout page / component\n  LOGOUT_PATH: \"/signout\",\n\n  // Render forms in a modal\n  RENDER_FORMS_IN_MODAL: true,\n\n  // Wait timeout before rendering submit wait icon\n  SHOW_SUBMIT_WAIT_TIMEOUT: 300,\n\n  // Swim lane diagram configuration file\n  SWIM_LANE_DIAGRAM_CONFIGURATION: \"/Library/Diagrams/Overviews.json\",\n\n  // Business scenario concept types\n  BUSINESS_SCENARIO_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/BusinessScenario\",\n  ],\n  BUSINESS_SCENARIO_STEP_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/ScenarioStep\",\n  ],\n  BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/Persona\",\n  ],\n  BUSINESS_SCENARIO_SYSTEM_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/System\",\n  ],\n\n  // indicates on what day the week starts (0 = Sunday)\n  CALENDAR_WEEK_STARTS_ON: 1,\n\n  // indicates which date indicates the first week of the year\n  CALENDAR_FIRST_WEEK_CONTAINS_DATE: 1,\n\n  // parameters that are added for the ui state, but should not be send to the modular ui\n  UI_PARAMETERS: [],\n\n  // disable hide-when-empty hint for layouts running on Be Informed versions older than 21.1\n  ALLOW_HIDE_WHEN_EMPTY_ON_TABS: true,\n\n  // reload the complete page on signout, usefull when third party authentication is in place\n  PAGE_RELOAD_ON_UNAUTHORIZED_ERROR: false,\n\n  XHR_TIMEOUT_MS: 300000,\n\n  XHR_ALWAYS_WITH_CREDENTIALS: false,\n\n  HIDE_WHEN_EMPTY_IGNORE_TASKS: false,\n\n  SHOW_AVATARS: true,\n\n  COMPLETE_SOURCE: false,\n};\n\nlet settings = defaultSettings;\n\n/**\n */\nexport const setSettings = (config: Object) => {\n  if (isPlainObject(config)) {\n    settings = Object.assign(defaultSettings, config);\n  }\n};\n\n/**\n */\nexport const getSetting = (key: string, defaultValue?: any): any => {\n  if (!has(settings, key) && defaultValue === undefined) {\n    throw new Error(\n      `Setting with name ${key} not found and no defaultValue given`,\n    );\n  }\n  return settings[key] ?? defaultValue;\n};\n\n/**\n */\nexport const setSetting = (key: string, value: any) => {\n  settings[key] = value;\n};\n\n/**\n */\nexport const allSettings = (): { [name: string]: Setting } => settings;\n\n/**\n * Indicates if contributions must be cached\n */\nexport const cacheContributions = (): boolean =>\n  getSetting(\"CACHE_CONTRIBUTIONS\", true);\n\n/**\n * The context path is retrieved on the server using the context path property as set in the runtime properties\n * This can be manually overriden by setting the UI setting 'CONTEXT_PATH'\n */\nexport const getBasePath = (): string =>\n  getSetting(\"CONTEXT_PATH\", \"/BeInformed\");\n\n/**\n * The context path to modular ui rest services\n */\nexport const getBasePathModularUI = (): string =>\n  getSetting(\"CONTEXT_PATH_SERVER\", getBasePath());\n\n/**\n * Used to link the css and js files in the server templates\n */\nexport const getBasePathServer = (): string =>\n  getSetting(\"CONTEXT_PATH_SERVER\", getBasePath());\n\n/**\n * Path to upload service\n */\nexport const getUploadPath = (\n  contextPath: string = getBasePathModularUI(),\n  origin: string = \"\",\n): string => `${origin}${contextPath}${UPLOAD_PATH}`;\n\n/**\n * Path to captcha service\n */\nexport const getCaptchaPath = (\n  contextPath: string = getBasePathModularUI(),\n  origin: string = \"\",\n): string => `${origin}${contextPath}${CAPTCHA_PATH}`;\n\n/**\n */\nexport const hasAllContentInData = (): boolean =>\n  getSetting(ALL_CONTENT_IN_DATA_SETTING, true);\n\n/**\n */\nexport const isIncludeTimeOffsetInDateTimes = (): boolean =>\n  getSetting(INCLUDE_TIME_OFFSET, false);\n\n/**\n */\nexport const getEnabledLocales = (): Array<string> =>\n  getSetting(\"ENABLED_LOCALES\", [\"en\"]);\n\n/**\n * Login type\n */\nexport const loginType = (): string =>\n  getSetting(LOGIN_TYPE, INTERNAL_LOGIN_TYPE.JAAS);\n\n/**\n */\nexport const loginPath = (clientName: string = \"FormClient\"): string =>\n  getSetting(LOGIN_PATH_SETTING, `/callback?client_name=${clientName}`);\n/**\n */\nexport const loginUsernameField = (): string =>\n  getSetting(LOGIN_USERNAME_SETTING, \"j_username\");\n/**\n */\nexport const loginPasswordField = (): string =>\n  getSetting(LOGIN_PASSWORD_SETTING, \"j_password\");\n/**\n */\nexport const logoutPath = (): string =>\n  getSetting(LOGOUT_PATH_SETTING, \"/logout\");\n\nexport const LOGIN_PATH: string = loginPath();\nexport const LOGOUT_PATH: string = logoutPath();\n\n/**\n * Model overview swim lane configuration\n */\nexport const getSwimLaneDiagramConfiguration: Object = () => {\n  let configLocation = getSetting(\n    \"SWIM_LANE_DIAGRAM_CONFIGURATION\",\n    \"/Library/Diagrams/Overviews.json\",\n  );\n  if (!configLocation.startsWith(\"/\")) {\n    configLocation = `/${configLocation}`;\n  }\n  return getRepositoryResourceUrl(configLocation);\n};\n\n/**\n * Set the context path for requests to be informed\n */\nexport const setContextPath = (contextPath: string) => {\n  setSetting(\"CONTEXT_PATH\", contextPath);\n};\n\n/**\n * Backwards compatible export of BASE constant\n */\nexport const BASE: string = getBasePath();\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Settings.js","names":["isPlainObject","has","getRepositoryResourceUrl","ALL_CONTENT_IN_DATA_SETTING","INCLUDE_TIME_OFFSET","INTERNAL_LOGIN_TYPE","LOGIN_TYPE","LOGIN_PATH_SETTING","LOGIN_USERNAME_SETTING","LOGIN_PASSWORD_SETTING","LOGOUT_PATH_SETTING","UPLOAD_PATH","CAPTCHA_PATH","serverBase","__CONTEXT_PATH__","defaultSettings","CONTEXT_PATH","window","contextPath","CACHE_CONTRIBUTIONS","DEBUG_I18N_MESSAGE_NOT_FOUND","HIDE_NOTIFICATION_TIMEOUT","ALWAYS_COMMIT_FORM","RENDER_QUESTION_LABELS","RENDER_MANDATORY_ATTRIBUTE_INDICATION","RENDER_OPTIONAL_ATTRIBUTE_INDICATION","AVAILABLE_LIST_VIEWS","USE_CLIENTSIDE_VALIDATION","USE_INSTANT_SERVER_VALIDATION","ENABLED_LOCALES","RENDER_GLOBAL_LOGIN_PAGE","RENDER_GLOBAL_LOGOUT_PAGE","RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE","LOGIN_PATH","ADMINISTRATOR_LOGIN_PATH","LOGOUT_PATH","RENDER_FORMS_IN_MODAL","SHOW_SUBMIT_WAIT_TIMEOUT","SWIM_LANE_DIAGRAM_CONFIGURATION","BUSINESS_SCENARIO_CONCEPT_TYPE","BUSINESS_SCENARIO_STEP_CONCEPT_TYPE","BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE","BUSINESS_SCENARIO_SYSTEM_CONCEPT_TYPE","CALENDAR_WEEK_STARTS_ON","CALENDAR_FIRST_WEEK_CONTAINS_DATE","UI_PARAMETERS","ALLOW_HIDE_WHEN_EMPTY_ON_TABS","PAGE_RELOAD_ON_UNAUTHORIZED_ERROR","XHR_TIMEOUT_MS","XHR_ALWAYS_WITH_CREDENTIALS","HIDE_WHEN_EMPTY_IGNORE_TASKS","SHOW_AVATARS","COMPLETE_SOURCE","settings","setSettings","config","_Object$assign","getSetting","key","defaultValue","undefined","Error","setSetting","value","allSettings","cacheContributions","getBasePath","getBasePathModularUI","getBasePathServer","getUploadPath","origin","getCaptchaPath","hasAllContentInData","isIncludeTimeOffsetInDateTimes","getEnabledLocales","loginType","JAAS","loginPath","clientName","loginUsernameField","loginPasswordField","logoutPath","getSwimLaneDiagramConfiguration","configLocation","_startsWithInstanceProperty","call","setContextPath","BASE"],"sources":["../../src/constants/Settings.js"],"sourcesContent":["// @flow\nimport { isPlainObject, has } from \"../utils/helpers/objects\";\nimport { getRepositoryResourceUrl } from \"../utils/helpers/repositoryResource\";\nimport {\n  ALL_CONTENT_IN_DATA_SETTING,\n  INCLUDE_TIME_OFFSET,\n  INTERNAL_LOGIN_TYPE,\n  LOGIN_TYPE,\n  LOGIN_PATH_SETTING,\n  LOGIN_USERNAME_SETTING,\n  LOGIN_PASSWORD_SETTING,\n  LOGOUT_PATH_SETTING,\n  UPLOAD_PATH,\n  CAPTCHA_PATH,\n} from \"./Constants\";\n\ntype Setting = boolean | string | number | Array<string>;\n\nconst serverBase =\n  typeof __CONTEXT_PATH__ === \"undefined\" ? null : __CONTEXT_PATH__;\n\nconst defaultSettings: { [name: string]: Setting } = {\n  // This uses contextPath set from property from server\n  CONTEXT_PATH:\n    serverBase ??\n    (typeof window !== \"undefined\" && window.contextPath\n      ? window.contextPath\n      : \"/BeInformed\"),\n\n  // Indicates if contributions should be cached\n  CACHE_CONTRIBUTIONS: true,\n\n  // Debug missing i18n messages in layout\n  DEBUG_I18N_MESSAGE_NOT_FOUND: true,\n\n  // Time to show the notification bar\n  HIDE_NOTIFICATION_TIMEOUT: 5000,\n\n  // Always commit form, does not show result pages for instruments\n  ALWAYS_COMMIT_FORM: false,\n\n  // Render instrument and event question labels on forms (might result in duplicate labels)\n  RENDER_QUESTION_LABELS: true,\n\n  // Render mandatory indications on attributes\n  RENDER_MANDATORY_ATTRIBUTE_INDICATION: true,\n\n  // Render optional indications on attributes\n  RENDER_OPTIONAL_ATTRIBUTE_INDICATION: false,\n\n  // Renders a toggle with supported list views, options are ListView and TableView\n  AVAILABLE_LIST_VIEWS: [\"ListView\", \"TableView\"],\n\n  // Toggle client side validation\n  USE_CLIENTSIDE_VALIDATION: true,\n\n  // Indicates if server validation should be used when a form field is changed\n  USE_INSTANT_SERVER_VALIDATION: true,\n\n  // Indicates which locales are enabled\n  ENABLED_LOCALES: [\"en\", \"nl\"],\n\n  // Renders the global log in page\n  RENDER_GLOBAL_LOGIN_PAGE: false,\n\n  // Renders the global log out page\n  RENDER_GLOBAL_LOGOUT_PAGE: false,\n\n  // Renders the login variants as option on the global logout page\n  RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE: false,\n\n  // Path to login page / component\n  LOGIN_PATH: \"/signin\",\n\n  // Path to administrator login page / component\n  ADMINISTRATOR_LOGIN_PATH: \"\",\n\n  // Path to logout page / component\n  LOGOUT_PATH: \"/signout\",\n\n  // Render forms in a modal\n  RENDER_FORMS_IN_MODAL: true,\n\n  // Wait timeout before rendering submit wait icon\n  SHOW_SUBMIT_WAIT_TIMEOUT: 300,\n\n  // Swim lane diagram configuration file\n  SWIM_LANE_DIAGRAM_CONFIGURATION: \"/Library/Diagrams/Overviews.json\",\n\n  // Business scenario concept types\n  BUSINESS_SCENARIO_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/BusinessScenario\",\n  ],\n  BUSINESS_SCENARIO_STEP_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/ScenarioStep\",\n  ],\n  BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/Persona\",\n  ],\n  BUSINESS_SCENARIO_SYSTEM_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/System\",\n  ],\n\n  // indicates on what day the week starts (0 = Sunday)\n  CALENDAR_WEEK_STARTS_ON: 1,\n\n  // indicates which date indicates the first week of the year\n  CALENDAR_FIRST_WEEK_CONTAINS_DATE: 1,\n\n  // parameters that are added for the ui state, but should not be send to the modular ui\n  UI_PARAMETERS: [],\n\n  // disable hide-when-empty hint for layouts running on Be Informed versions older than 21.1\n  ALLOW_HIDE_WHEN_EMPTY_ON_TABS: true,\n\n  // reload the complete page on signout, usefull when third party authentication is in place\n  PAGE_RELOAD_ON_UNAUTHORIZED_ERROR: false,\n\n  XHR_TIMEOUT_MS: 300000,\n\n  XHR_ALWAYS_WITH_CREDENTIALS: false,\n\n  HIDE_WHEN_EMPTY_IGNORE_TASKS: false,\n\n  SHOW_AVATARS: true,\n\n  COMPLETE_SOURCE: false,\n};\n\nlet settings = defaultSettings;\n\n/**\n */\nexport const setSettings = (config: Object) => {\n  if (isPlainObject(config)) {\n    settings = Object.assign(defaultSettings, config);\n  }\n};\n\n/**\n */\nexport const getSetting = (key: string, defaultValue?: any): any => {\n  if (!has(settings, key) && defaultValue === undefined) {\n    throw new Error(\n      `Setting with name ${key} not found and no defaultValue given`,\n    );\n  }\n  return settings[key] ?? defaultValue;\n};\n\n/**\n */\nexport const setSetting = (key: string, value: any) => {\n  settings[key] = value;\n};\n\n/**\n */\nexport const allSettings = (): { [name: string]: Setting } => settings;\n\n/**\n * Indicates if contributions must be cached\n */\nexport const cacheContributions = (): boolean =>\n  getSetting(\"CACHE_CONTRIBUTIONS\", true);\n\n/**\n * The context path is retrieved on the server using the context path property as set in the runtime properties\n * This can be manually overriden by setting the UI setting 'CONTEXT_PATH'\n */\nexport const getBasePath = (): string =>\n  getSetting(\"CONTEXT_PATH\", \"/BeInformed\");\n\n/**\n * The context path to modular ui rest services\n */\nexport const getBasePathModularUI = (): string =>\n  getSetting(\"CONTEXT_PATH_SERVER\", getBasePath());\n\n/**\n * Used to link the css and js files in the server templates\n */\nexport const getBasePathServer = (): string =>\n  getSetting(\"CONTEXT_PATH_SERVER\", getBasePath());\n\n/**\n * Path to upload service\n */\nexport const getUploadPath = (\n  contextPath: string = getBasePathModularUI(),\n  origin: string = \"\",\n): string => `${origin}${contextPath}${UPLOAD_PATH}`;\n\n/**\n * Path to captcha service\n */\nexport const getCaptchaPath = (\n  contextPath: string = getBasePathModularUI(),\n  origin: string = \"\",\n): string => `${origin}${contextPath}${CAPTCHA_PATH}`;\n\n/**\n */\nexport const hasAllContentInData = (): boolean =>\n  getSetting(ALL_CONTENT_IN_DATA_SETTING, true);\n\n/**\n */\nexport const isIncludeTimeOffsetInDateTimes = (): boolean =>\n  getSetting(INCLUDE_TIME_OFFSET, false);\n\n/**\n */\nexport const getEnabledLocales = (): Array<string> =>\n  getSetting(\"ENABLED_LOCALES\", [\"en\"]);\n\n/**\n * Login type\n */\nexport const loginType = (): string | Array<string> =>\n  getSetting(LOGIN_TYPE, INTERNAL_LOGIN_TYPE.JAAS);\n\n/**\n */\nexport const loginPath = (clientName: string = \"FormClient\"): string =>\n  getSetting(LOGIN_PATH_SETTING, `/callback?client_name=${clientName}`);\n/**\n */\nexport const loginUsernameField = (): string =>\n  getSetting(LOGIN_USERNAME_SETTING, \"j_username\");\n/**\n */\nexport const loginPasswordField = (): string =>\n  getSetting(LOGIN_PASSWORD_SETTING, \"j_password\");\n/**\n */\nexport const logoutPath = (): string =>\n  getSetting(LOGOUT_PATH_SETTING, \"/logout\");\n\nexport const LOGIN_PATH: string = loginPath();\nexport const LOGOUT_PATH: string = logoutPath();\n\n/**\n * Model overview swim lane configuration\n */\nexport const getSwimLaneDiagramConfiguration: Object = () => {\n  let configLocation = getSetting(\n    \"SWIM_LANE_DIAGRAM_CONFIGURATION\",\n    \"/Library/Diagrams/Overviews.json\",\n  );\n  if (!configLocation.startsWith(\"/\")) {\n    configLocation = `/${configLocation}`;\n  }\n  return getRepositoryResourceUrl(configLocation);\n};\n\n/**\n * Set the context path for requests to be informed\n */\nexport const setContextPath = (contextPath: string) => {\n  setSetting(\"CONTEXT_PATH\", contextPath);\n};\n\n/**\n * Backwards compatible export of BASE constant\n */\nexport const BASE: string = getBasePath();\n"],"mappings":";;AACA,SAASA,aAAa,EAAEC,GAAG,QAAQ,0BAA0B;AAC7D,SAASC,wBAAwB,QAAQ,qCAAqC;AAC9E,SACEC,2BAA2B,EAC3BC,mBAAmB,EACnBC,mBAAmB,EACnBC,UAAU,EACVC,kBAAkB,EAClBC,sBAAsB,EACtBC,sBAAsB,EACtBC,mBAAmB,EACnBC,WAAW,EACXC,YAAY,QACP,aAAa;AAIpB,MAAMC,UAAU,GACd,OAAOC,gBAAgB,KAAK,WAAW,GAAG,IAAI,GAAGA,gBAAgB;AAEnE,MAAMC,eAA4C,GAAG;EACnD;EACAC,YAAY,EACVH,UAAU,KACT,OAAOI,MAAM,KAAK,WAAW,IAAIA,MAAM,CAACC,WAAW,GAChDD,MAAM,CAACC,WAAW,GAClB,aAAa,CAAC;EAEpB;EACAC,mBAAmB,EAAE,IAAI;EAEzB;EACAC,4BAA4B,EAAE,IAAI;EAElC;EACAC,yBAAyB,EAAE,IAAI;EAE/B;EACAC,kBAAkB,EAAE,KAAK;EAEzB;EACAC,sBAAsB,EAAE,IAAI;EAE5B;EACAC,qCAAqC,EAAE,IAAI;EAE3C;EACAC,oCAAoC,EAAE,KAAK;EAE3C;EACAC,oBAAoB,EAAE,CAAC,UAAU,EAAE,WAAW,CAAC;EAE/C;EACAC,yBAAyB,EAAE,IAAI;EAE/B;EACAC,6BAA6B,EAAE,IAAI;EAEnC;EACAC,eAAe,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC;EAE7B;EACAC,wBAAwB,EAAE,KAAK;EAE/B;EACAC,yBAAyB,EAAE,KAAK;EAEhC;EACAC,wCAAwC,EAAE,KAAK;EAE/C;EACAC,UAAU,EAAE,SAAS;EAErB;EACAC,wBAAwB,EAAE,EAAE;EAE5B;EACAC,WAAW,EAAE,UAAU;EAEvB;EACAC,qBAAqB,EAAE,IAAI;EAE3B;EACAC,wBAAwB,EAAE,GAAG;EAE7B;EACAC,+BAA+B,EAAE,kCAAkC;EAEnE;EACAC,8BAA8B,EAAE,CAC9B,yDAAyD,CAC1D;EACDC,mCAAmC,EAAE,CACnC,qDAAqD,CACtD;EACDC,sCAAsC,EAAE,CACtC,gDAAgD,CACjD;EACDC,qCAAqC,EAAE,CACrC,+CAA+C,CAChD;EAED;EACAC,uBAAuB,EAAE,CAAC;EAE1B;EACAC,iCAAiC,EAAE,CAAC;EAEpC;EACAC,aAAa,EAAE,EAAE;EAEjB;EACAC,6BAA6B,EAAE,IAAI;EAEnC;EACAC,iCAAiC,EAAE,KAAK;EAExCC,cAAc,EAAE,MAAM;EAEtBC,2BAA2B,EAAE,KAAK;EAElCC,4BAA4B,EAAE,KAAK;EAEnCC,YAAY,EAAE,IAAI;EAElBC,eAAe,EAAE;AACnB,CAAC;AAED,IAAIC,QAAQ,GAAGtC,eAAe;;AAE9B;AACA;AACA,OAAO,MAAMuC,WAAW,GAAIC,MAAc,IAAK;EAC7C,IAAIvD,aAAa,CAACuD,MAAM,CAAC,EAAE;IACzBF,QAAQ,GAAGG,cAAA,CAAczC,eAAe,EAAEwC,MAAM,CAAC;EACnD;AACF,CAAC;;AAED;AACA;AACA,OAAO,MAAME,UAAU,GAAGA,CAACC,GAAW,EAAEC,YAAkB,KAAU;EAClE,IAAI,CAAC1D,GAAG,CAACoD,QAAQ,EAAEK,GAAG,CAAC,IAAIC,YAAY,KAAKC,SAAS,EAAE;IACrD,MAAM,IAAIC,KAAK,CACb,qBAAqBH,GAAG,sCAC1B,CAAC;EACH;EACA,OAAOL,QAAQ,CAACK,GAAG,CAAC,IAAIC,YAAY;AACtC,CAAC;;AAED;AACA;AACA,OAAO,MAAMG,UAAU,GAAGA,CAACJ,GAAW,EAAEK,KAAU,KAAK;EACrDV,QAAQ,CAACK,GAAG,CAAC,GAAGK,KAAK;AACvB,CAAC;;AAED;AACA;AACA,OAAO,MAAMC,WAAW,GAAGA,CAAA,KAAmCX,QAAQ;;AAEtE;AACA;AACA;AACA,OAAO,MAAMY,kBAAkB,GAAGA,CAAA,KAChCR,UAAU,CAAC,qBAAqB,EAAE,IAAI,CAAC;;AAEzC;AACA;AACA;AACA;AACA,OAAO,MAAMS,WAAW,GAAGA,CAAA,KACzBT,UAAU,CAAC,cAAc,EAAE,aAAa,CAAC;;AAE3C;AACA;AACA;AACA,OAAO,MAAMU,oBAAoB,GAAGA,CAAA,KAClCV,UAAU,CAAC,qBAAqB,EAAES,WAAW,CAAC,CAAC,CAAC;;AAElD;AACA;AACA;AACA,OAAO,MAAME,iBAAiB,GAAGA,CAAA,KAC/BX,UAAU,CAAC,qBAAqB,EAAES,WAAW,CAAC,CAAC,CAAC;;AAElD;AACA;AACA;AACA,OAAO,MAAMG,aAAa,GAAGA,CAC3BnD,WAAmB,GAAGiD,oBAAoB,CAAC,CAAC,EAC5CG,MAAc,GAAG,EAAE,KACR,GAAGA,MAAM,GAAGpD,WAAW,GAAGP,WAAW,EAAE;;AAEpD;AACA;AACA;AACA,OAAO,MAAM4D,cAAc,GAAGA,CAC5BrD,WAAmB,GAAGiD,oBAAoB,CAAC,CAAC,EAC5CG,MAAc,GAAG,EAAE,KACR,GAAGA,MAAM,GAAGpD,WAAW,GAAGN,YAAY,EAAE;;AAErD;AACA;AACA,OAAO,MAAM4D,mBAAmB,GAAGA,CAAA,KACjCf,UAAU,CAACtD,2BAA2B,EAAE,IAAI,CAAC;;AAE/C;AACA;AACA,OAAO,MAAMsE,8BAA8B,GAAGA,CAAA,KAC5ChB,UAAU,CAACrD,mBAAmB,EAAE,KAAK,CAAC;;AAExC;AACA;AACA,OAAO,MAAMsE,iBAAiB,GAAGA,CAAA,KAC/BjB,UAAU,CAAC,iBAAiB,EAAE,CAAC,IAAI,CAAC,CAAC;;AAEvC;AACA;AACA;AACA,OAAO,MAAMkB,SAAS,GAAGA,CAAA,KACvBlB,UAAU,CAACnD,UAAU,EAAED,mBAAmB,CAACuE,IAAI,CAAC;;AAElD;AACA;AACA,OAAO,MAAMC,SAAS,GAAGA,CAACC,UAAkB,GAAG,YAAY,KACzDrB,UAAU,CAAClD,kBAAkB,EAAE,yBAAyBuE,UAAU,EAAE,CAAC;AACvE;AACA;AACA,OAAO,MAAMC,kBAAkB,GAAGA,CAAA,KAChCtB,UAAU,CAACjD,sBAAsB,EAAE,YAAY,CAAC;AAClD;AACA;AACA,OAAO,MAAMwE,kBAAkB,GAAGA,CAAA,KAChCvB,UAAU,CAAChD,sBAAsB,EAAE,YAAY,CAAC;AAClD;AACA;AACA,OAAO,MAAMwE,UAAU,GAAGA,CAAA,KACxBxB,UAAU,CAAC/C,mBAAmB,EAAE,SAAS,CAAC;AAE5C,OAAO,MAAMuB,UAAkB,GAAG4C,SAAS,CAAC,CAAC;AAC7C,OAAO,MAAM1C,WAAmB,GAAG8C,UAAU,CAAC,CAAC;;AAE/C;AACA;AACA;AACA,OAAO,MAAMC,+BAAuC,GAAGA,CAAA,KAAM;EAC3D,IAAIC,cAAc,GAAG1B,UAAU,CAC7B,iCAAiC,EACjC,kCACF,CAAC;EACD,IAAI,CAAC2B,2BAAA,CAAAD,cAAc,EAAAE,IAAA,CAAdF,cAAc,EAAY,GAAG,CAAC,EAAE;IACnCA,cAAc,GAAG,IAAIA,cAAc,EAAE;EACvC;EACA,OAAOjF,wBAAwB,CAACiF,cAAc,CAAC;AACjD,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMG,cAAc,GAAIpE,WAAmB,IAAK;EACrD4C,UAAU,CAAC,cAAc,EAAE5C,WAAW,CAAC;AACzC,CAAC;;AAED;AACA;AACA;AACA,OAAO,MAAMqE,IAAY,GAAGrB,WAAW,CAAC,CAAC","ignoreList":[]}

package/esm/hooks/useAuthentication.js

@@ -2,7 +2,7 @@ import { useSelector, useDispatch } from "react-redux";
 import { getApplication } from "../redux/_modularui/ModularUISelectors";
 import { login, logout, resetAuthErrors } from "../redux/actions";
 import Cache from "../utils/browser/Cache";
-import { DEFAULT_AUTHENTICATION_TYPE, getBasePathServer, INTERNAL_LOGIN_TYPE, loginType, logoutPath } from "../constants";
+import { DEFAULT_AUTHENTICATION_TYPE, getBasePathServer, INTERNAL_LOGIN_TYPE, logoutPath } from "../constants";
 import { IllegalStateException } from "../exceptions";
 import { Authenticate } from "../modularui";
 /**
@@ -39,14 +39,15 @@ export const useLogout = () => {
   const application = useSelector(getApplication);
   const LOGOUT_PATH = logoutPath();
   const BASE_PATH = getBasePathServer();
+  const authenticate = new Authenticate();
   const isAuthenticated = application?.isLoggedIn ?? false;
   return {
     isAuthenticated,
     authenticationTypes: application?.authenticationTypes ?? [DEFAULT_AUTHENTICATION_TYPE],
     logout: () => {
-      const type = loginType();
+      const type = authenticate.authenticationType;
       if (type === INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {
-        Authenticate.redirectToLogout();
+        authenticate.redirectToLogout();
       } else if (Cache.getItem("isRedirectLogin")) {
         const origin = window.location.origin;
         const url = `${origin}${BASE_PATH}/logout?url=${origin}${BASE_PATH}${LOGOUT_PATH}`;
@@ -56,7 +57,7 @@ export const useLogout = () => {
         return dispatch(logout());
       }
     },
-    logoutUrl: Authenticate.getLogoutUrl()
+    logoutUrl: authenticate.getLogoutUrl()
   };
 };
 //# sourceMappingURL=useAuthentication.js.map

package/esm/hooks/useAuthentication.js.flow

@@ -9,7 +9,6 @@ import {
   DEFAULT_AUTHENTICATION_TYPE,
   getBasePathServer,
   INTERNAL_LOGIN_TYPE,
-  loginType,
   logoutPath,
 } from "../constants";
 import { IllegalStateException } from "../exceptions";
@@ -83,6 +82,8 @@ export const useLogout = (): LogoutHook => {
   const LOGOUT_PATH = logoutPath();
   const BASE_PATH = getBasePathServer();
 
+  const authenticate = new Authenticate();
+
   const isAuthenticated = application?.isLoggedIn ?? false;
   return {
     isAuthenticated,
@@ -90,9 +91,9 @@ export const useLogout = (): LogoutHook => {
       DEFAULT_AUTHENTICATION_TYPE,
     ],
     logout: () => {
-      const type = loginType();
+      const type = authenticate.authenticationType;
       if (type === INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {
-        Authenticate.redirectToLogout();
+        authenticate.redirectToLogout();
       } else if (Cache.getItem("isRedirectLogin")) {
         const origin = window.location.origin;
         const url = `${origin}${BASE_PATH}/logout?url=${origin}${BASE_PATH}${LOGOUT_PATH}`;
@@ -102,6 +103,6 @@ export const useLogout = (): LogoutHook => {
         return dispatch(logout());
       }
     },
-    logoutUrl: Authenticate.getLogoutUrl(),
+    logoutUrl: authenticate.getLogoutUrl(),
   };
 };

package/esm/hooks/useAuthentication.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAuthentication.js","names":["useSelector","useDispatch","getApplication","login","logout","resetAuthErrors","Cache","DEFAULT_AUTHENTICATION_TYPE","getBasePathServer","INTERNAL_LOGIN_TYPE","loginType","logoutPath","IllegalStateException","Authenticate","useLogin","setItem","dispatch","application","auth","state","isAuthenticated","isLoggedIn","authenticationTypes","errorMessage","error","resetErrors","username","password","redirectLogin","authenticationType","getItem","authentication","redirectUri","window","location","assign","useLogout","LOGOUT_PATH","BASE_PATH","type","PAC4J_INDIRECT","redirectToLogout","origin","url","logoutUrl","getLogoutUrl"],"sources":["../../src/hooks/useAuthentication.js"],"sourcesContent":["// @flow\nimport { useSelector, useDispatch } from \"react-redux\";\n\nimport { getApplication } from \"../redux/_modularui/ModularUISelectors\";\nimport { login, logout, resetAuthErrors } from \"../redux/actions\";\n\nimport Cache from \"../utils/browser/Cache\";\nimport {\n  DEFAULT_AUTHENTICATION_TYPE,\n  getBasePathServer,\n  INTERNAL_LOGIN_TYPE,\n  loginType,\n  logoutPath,\n} from \"../constants\";\nimport { IllegalStateException } from \"../exceptions\";\nimport { Authenticate } from \"../modularui\";\n\nimport type { ResetAuthErrorsAction } from \"../redux/types\";\nimport type { AuthenticationType } from \"../models/types\";\n\ntype LoginHook = {\n  isAuthenticated: boolean,\n  authenticationTypes: Array<AuthenticationType>,\n  errorMessage: ?string,\n  resetErrors: () => ResetAuthErrorsAction,\n  login: (username: string, password: string) => void,\n  redirectLogin: (authenticationType: AuthenticationType) => void,\n};\ntype LogoutHook = {\n  isAuthenticated: boolean,\n  authenticationTypes: Array<AuthenticationType>,\n  logout: () => void,\n  logoutUrl: string,\n};\n\n/**\n */\nexport const useLogin = (): LoginHook => {\n  Cache.setItem(\"isRedirectLogin\", false);\n\n  const dispatch = useDispatch();\n\n  const application = useSelector(getApplication);\n  const auth = useSelector((state) => state.auth);\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n\n  return {\n    isAuthenticated,\n    authenticationTypes: application?.authenticationTypes ?? [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ],\n    errorMessage: auth.error,\n    resetErrors: () => dispatch(resetAuthErrors()),\n    login: (username: string, password: string) =>\n      dispatch(login(username, password)),\n    redirectLogin: (authenticationType: AuthenticationType) => {\n      if (Cache.getItem(\"isRedirectLogin\")) {\n        // prevent endless loop in redirects when authentication type can't be redirected\n        throw new IllegalStateException(\n          `Could not redirect to '${\n            authenticationType.authentication\n          }' using url: '${authenticationType.redirectUri ?? \"\"}'`,\n        );\n      }\n\n      if (!isAuthenticated) {\n        Cache.setItem(\"isRedirectLogin\", true);\n        window.location.assign(\n          `${getBasePathServer()}${authenticationType.redirectUri ?? \"\"}`,\n        );\n      }\n    },\n  };\n};\n\n/**\n */\nexport const useLogout = (): LogoutHook => {\n  const dispatch = useDispatch();\n  const application = useSelector(getApplication);\n\n  const LOGOUT_PATH = logoutPath();\n  const BASE_PATH = getBasePathServer();\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n  return {\n    isAuthenticated,\n    authenticationTypes: application?.authenticationTypes ?? [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ],\n    logout: () => {\n      const type = loginType();\n      if (type === INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {\n        Authenticate.redirectToLogout();\n      } else if (Cache.getItem(\"isRedirectLogin\")) {\n        const origin = window.location.origin;\n        const url = `${origin}${BASE_PATH}/logout?url=${origin}${BASE_PATH}${LOGOUT_PATH}`;\n        Cache.setItem(\"isRedirectLogin\", false);\n        window.location.assign(url);\n      } else {\n        return dispatch(logout());\n      }\n    },\n    logoutUrl: Authenticate.getLogoutUrl(),\n  };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useAuthentication.js","names":["useSelector","useDispatch","getApplication","login","logout","resetAuthErrors","Cache","DEFAULT_AUTHENTICATION_TYPE","getBasePathServer","INTERNAL_LOGIN_TYPE","logoutPath","IllegalStateException","Authenticate","useLogin","setItem","dispatch","application","auth","state","isAuthenticated","isLoggedIn","authenticationTypes","errorMessage","error","resetErrors","username","password","redirectLogin","authenticationType","getItem","authentication","redirectUri","window","location","assign","useLogout","LOGOUT_PATH","BASE_PATH","authenticate","type","PAC4J_INDIRECT","redirectToLogout","origin","url","logoutUrl","getLogoutUrl"],"sources":["../../src/hooks/useAuthentication.js"],"sourcesContent":["// @flow\nimport { useSelector, useDispatch } from \"react-redux\";\n\nimport { getApplication } from \"../redux/_modularui/ModularUISelectors\";\nimport { login, logout, resetAuthErrors } from \"../redux/actions\";\n\nimport Cache from \"../utils/browser/Cache\";\nimport {\n  DEFAULT_AUTHENTICATION_TYPE,\n  getBasePathServer,\n  INTERNAL_LOGIN_TYPE,\n  logoutPath,\n} from \"../constants\";\nimport { IllegalStateException } from \"../exceptions\";\nimport { Authenticate } from \"../modularui\";\n\nimport type { ResetAuthErrorsAction } from \"../redux/types\";\nimport type { AuthenticationType } from \"../models/types\";\n\ntype LoginHook = {\n  isAuthenticated: boolean,\n  authenticationTypes: Array<AuthenticationType>,\n  errorMessage: ?string,\n  resetErrors: () => ResetAuthErrorsAction,\n  login: (username: string, password: string) => void,\n  redirectLogin: (authenticationType: AuthenticationType) => void,\n};\ntype LogoutHook = {\n  isAuthenticated: boolean,\n  authenticationTypes: Array<AuthenticationType>,\n  logout: () => void,\n  logoutUrl: string,\n};\n\n/**\n */\nexport const useLogin = (): LoginHook => {\n  Cache.setItem(\"isRedirectLogin\", false);\n\n  const dispatch = useDispatch();\n\n  const application = useSelector(getApplication);\n  const auth = useSelector((state) => state.auth);\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n\n  return {\n    isAuthenticated,\n    authenticationTypes: application?.authenticationTypes ?? [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ],\n    errorMessage: auth.error,\n    resetErrors: () => dispatch(resetAuthErrors()),\n    login: (username: string, password: string) =>\n      dispatch(login(username, password)),\n    redirectLogin: (authenticationType: AuthenticationType) => {\n      if (Cache.getItem(\"isRedirectLogin\")) {\n        // prevent endless loop in redirects when authentication type can't be redirected\n        throw new IllegalStateException(\n          `Could not redirect to '${\n            authenticationType.authentication\n          }' using url: '${authenticationType.redirectUri ?? \"\"}'`,\n        );\n      }\n\n      if (!isAuthenticated) {\n        Cache.setItem(\"isRedirectLogin\", true);\n        window.location.assign(\n          `${getBasePathServer()}${authenticationType.redirectUri ?? \"\"}`,\n        );\n      }\n    },\n  };\n};\n\n/**\n */\nexport const useLogout = (): LogoutHook => {\n  const dispatch = useDispatch();\n  const application = useSelector(getApplication);\n\n  const LOGOUT_PATH = logoutPath();\n  const BASE_PATH = getBasePathServer();\n\n  const authenticate = new Authenticate();\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n  return {\n    isAuthenticated,\n    authenticationTypes: application?.authenticationTypes ?? [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ],\n    logout: () => {\n      const type = authenticate.authenticationType;\n      if (type === INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {\n        authenticate.redirectToLogout();\n      } else if (Cache.getItem(\"isRedirectLogin\")) {\n        const origin = window.location.origin;\n        const url = `${origin}${BASE_PATH}/logout?url=${origin}${BASE_PATH}${LOGOUT_PATH}`;\n        Cache.setItem(\"isRedirectLogin\", false);\n        window.location.assign(url);\n      } else {\n        return dispatch(logout());\n      }\n    },\n    logoutUrl: authenticate.getLogoutUrl(),\n  };\n};\n"],"mappings":"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","ignoreList":[]}

package/esm/modularui/Authenticate.js

@@ -26,7 +26,7 @@ class Authenticate {
     }
     if (_includesInstanceProperty(type).call(type, "FormClient")) {
       return INTERNAL_LOGIN_TYPE.PAC4J_FORM;
-    } else if (_includesInstanceProperty(type).call(type, "BasicClient")) {
+    } else if (_includesInstanceProperty(type).call(type, "IndirectBasicClient")) {
       return INTERNAL_LOGIN_TYPE.PAC4J_BASIC;
     }
     return INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT;
@@ -115,8 +115,10 @@ class Authenticate {
       case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:
       case INTERNAL_LOGIN_TYPE.PAC4J_FORM:
         return `${loginUsernameField()}=${encodedUsername}&${loginPasswordField()}=${encodedPassword}`;
-      default:
+      case INTERNAL_LOGIN_TYPE.JAAS:
         return `j_username=${encodedUsername}&j_password=${encodedPassword}`;
+      default:
+        return "";
     }
   }
 
@@ -157,7 +159,7 @@ class Authenticate {
 
   /**
    */
-  static getLogoutUrl() {
+  getLogoutUrl() {
     const type = loginType();
     if (!type || type === INTERNAL_LOGIN_TYPE.JAAS) {
       return `${getBasePath()}/Logoff`;
@@ -168,9 +170,10 @@ class Authenticate {
   /**
    * Browser redirect to the logout url. (no xmlhttp)
    */
-  static redirectToLogout() {
+  redirectToLogout(postRedirectUrl) {
     Cache.clear();
-    window.location.assign(Authenticate.getLogoutUrl());
+    const redirectUrl = postRedirectUrl || getBasePath();
+    window.location.assign(this.getLogoutUrl() + "?url=" + redirectUrl);
   }
 
   /**
@@ -178,7 +181,7 @@ class Authenticate {
    */
   logout() {
     return universalFetch({
-      url: Authenticate.getLogoutUrl()
+      url: this.getLogoutUrl()
     }).then(response => {
       // clear cache because of cached contributions
       Cache.clear();

package/esm/modularui/Authenticate.js.flow

@@ -37,7 +37,7 @@ class Authenticate {
 
     if (type.includes("FormClient")) {
       return INTERNAL_LOGIN_TYPE.PAC4J_FORM;
-    } else if (type.includes("BasicClient")) {
+    } else if (type.includes("IndirectBasicClient")) {
       return INTERNAL_LOGIN_TYPE.PAC4J_BASIC;
     }
     return INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT;
@@ -132,8 +132,10 @@ class Authenticate {
       case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:
       case INTERNAL_LOGIN_TYPE.PAC4J_FORM:
         return `${loginUsernameField()}=${encodedUsername}&${loginPasswordField()}=${encodedPassword}`;
-      default:
+      case INTERNAL_LOGIN_TYPE.JAAS:
         return `j_username=${encodedUsername}&j_password=${encodedPassword}`;
+      default:
+        return "";
     }
   }
 
@@ -174,7 +176,7 @@ class Authenticate {
 
   /**
    */
-  static getLogoutUrl(): string {
+  getLogoutUrl(): string {
     const type = loginType();
 
     if (!type || type === INTERNAL_LOGIN_TYPE.JAAS) {
@@ -187,9 +189,12 @@ class Authenticate {
   /**
    * Browser redirect to the logout url. (no xmlhttp)
    */
-  static redirectToLogout(): void {
+  redirectToLogout(postRedirectUrl?: string): void {
     Cache.clear();
-    window.location.assign(Authenticate.getLogoutUrl());
+
+    const redirectUrl = postRedirectUrl || getBasePath();
+
+    window.location.assign(this.getLogoutUrl() + "?url=" + redirectUrl);
   }
 
   /**
@@ -197,7 +202,7 @@ class Authenticate {
    */
   logout(): Promise<any> {
     return universalFetch({
-      url: Authenticate.getLogoutUrl(),
+      url: this.getLogoutUrl(),
     }).then((response) => {
       // clear cache because of cached contributions
       Cache.clear();

package/esm/modularui/Authenticate.js.map

@@ -1 +1 @@
-{"version":3,"file":"Authenticate.js","names":["HTTP_METHODS","universalFetch","Cache","UnauthorizedException","INTERNAL_LOGIN_TYPE","loginType","loginPath","loginPasswordField","loginUsernameField","logoutPath","getBasePath","Authenticate","constructor","_defineProperty","_isBasic","authenticationType","type","JAAS","_includesInstanceProperty","call","PAC4J_FORM","PAC4J_BASIC","PAC4J_INDIRECT","isBasicAuthentication","requestLogin","url","method","GET","headers","Accept","initLogin","_Promise","resolve","catch","error","login","username","password","doFormLogin","doBasicAuthentication","doJaasAuthentication","getFormLoginUrl","getFormLoginData","encodedUsername","encodeURIComponent","encodedPassword","POST","data","addItem","btoa","then","removeItem","getLogoutUrl","redirectToLogout","clear","window","location","assign","logout","response"],"sources":["../../src/modularui/Authenticate.js"],"sourcesContent":["// @flow\nimport { HTTP_METHODS } from \"../constants/Constants\";\n\nimport universalFetch from \"../utils/fetch/universalFetch\";\nimport Cache from \"../utils/browser/Cache\";\n\nimport { UnauthorizedException } from \"../exceptions\";\nimport {\n  INTERNAL_LOGIN_TYPE,\n  loginType,\n  loginPath,\n  loginPasswordField,\n  loginUsernameField,\n  logoutPath,\n  getBasePath,\n} from \"../constants\";\n\n/**\n */\nclass Authenticate {\n  _isBasic: boolean;\n\n  /**\n   */\n  constructor() {\n    this._isBasic = false;\n  }\n\n  /**\n   */\n  get authenticationType(): $Keys<typeof INTERNAL_LOGIN_TYPE> {\n    const type = loginType();\n\n    if (!type || type === INTERNAL_LOGIN_TYPE.JAAS) {\n      return INTERNAL_LOGIN_TYPE.JAAS;\n    }\n\n    if (type.includes(\"FormClient\")) {\n      return INTERNAL_LOGIN_TYPE.PAC4J_FORM;\n    } else if (type.includes(\"BasicClient\")) {\n      return INTERNAL_LOGIN_TYPE.PAC4J_BASIC;\n    }\n    return INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT;\n  }\n\n  /**\n   */\n  get isBasicAuthentication(): boolean {\n    return (\n      this._isBasic ||\n      this.authenticationType === INTERNAL_LOGIN_TYPE.PAC4J_BASIC\n    );\n  }\n\n  /**\n   */\n  set isBasicAuthentication(isBasicAuthentication: boolean) {\n    this._isBasic = isBasicAuthentication;\n  }\n\n  /**\n   */\n  requestLogin(): Promise<any> {\n    return universalFetch({\n      url: `${getBasePath()}/login`,\n      method: HTTP_METHODS.GET,\n      headers: {\n        Accept: \"application/json\",\n        \"Content-Type\": \"application/x-www-form-urlencoded\",\n      },\n    });\n  }\n\n  /**\n   */\n  initLogin(initLogin: boolean): Promise<any> {\n    if (this.isBasicAuthentication || !initLogin) {\n      return Promise.resolve(true);\n    }\n\n    return this.requestLogin().catch((error) => {\n      // when an unauthorizedexception is received on a request to the login service,\n      // this indicates a basic authorization scenario\n      // in case of form based authentication other exceptions are thrown\n      if (error instanceof UnauthorizedException) {\n        this.isBasicAuthentication = true;\n      }\n\n      return Promise.resolve({});\n    });\n  }\n\n  /**\n   */\n  login(username: string, password: string): Promise<any> {\n    switch (this.authenticationType) {\n      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:\n        return this.doFormLogin(username, password);\n      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:\n        return this.doBasicAuthentication(username, password);\n      case INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT:\n        // pac4j should handle this\n        return Promise.resolve();\n      default:\n        return this.doJaasAuthentication(username, password);\n    }\n  }\n\n  /**\n   */\n  getFormLoginUrl(): string {\n    switch (this.authenticationType) {\n      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:\n        return `${getBasePath()}${loginPath(\"DirectBasicAuthClient\")}`;\n      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:\n        return `${getBasePath()}${loginPath(\"FormClient\")}`;\n      case INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT:\n        //pac4j should handle this\n        return \"\";\n      default:\n        return `${getBasePath()}/j_security_check`;\n    }\n  }\n\n  /**\n   */\n  getFormLoginData(username: string, password: string): string {\n    const encodedUsername = encodeURIComponent(username);\n    const encodedPassword = encodeURIComponent(password);\n\n    switch (this.authenticationType) {\n      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:\n      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:\n        return `${loginUsernameField()}=${encodedUsername}&${loginPasswordField()}=${encodedPassword}`;\n      default:\n        return `j_username=${encodedUsername}&j_password=${encodedPassword}`;\n    }\n  }\n\n  /**\n   */\n  doFormLogin(username: string, password: string): Promise<any> {\n    return universalFetch({\n      url: this.getFormLoginUrl(),\n      method: HTTP_METHODS.POST,\n      headers: {\n        Accept: \"application/json\",\n        \"Content-Type\": \"application/x-www-form-urlencoded\",\n      },\n      data: this.getFormLoginData(username, password),\n    });\n  }\n\n  /**\n   */\n  doBasicAuthentication(username: string, password: string): Promise<any> {\n    Cache.addItem(\"basic\", btoa(`${username}:${password}`));\n    return this.requestLogin();\n  }\n\n  /**\n   */\n  doJaasAuthentication(username: string, password: string): Promise<any> {\n    return this.initLogin(true).then(() => {\n      if (this.isBasicAuthentication) {\n        Cache.removeItem(\"basic-ok\");\n        return this.doBasicAuthentication(username, password).then(() => {\n          Cache.addItem(\"basic-ok\", true);\n        });\n      }\n      return this.doFormLogin(username, password);\n    });\n  }\n\n  /**\n   */\n  static getLogoutUrl(): string {\n    const type = loginType();\n\n    if (!type || type === INTERNAL_LOGIN_TYPE.JAAS) {\n      return `${getBasePath()}/Logoff`;\n    }\n\n    return `${getBasePath()}${logoutPath()}`;\n  }\n\n  /**\n   * Browser redirect to the logout url. (no xmlhttp)\n   */\n  static redirectToLogout(): void {\n    Cache.clear();\n    window.location.assign(Authenticate.getLogoutUrl());\n  }\n\n  /**\n   * Logout the user with xmlhttp\n   */\n  logout(): Promise<any> {\n    return universalFetch({\n      url: Authenticate.getLogoutUrl(),\n    }).then((response) => {\n      // clear cache because of cached contributions\n      Cache.clear();\n      return response;\n    });\n  }\n}\n\nexport default Authenticate;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Authenticate.js","names":["HTTP_METHODS","universalFetch","Cache","UnauthorizedException","INTERNAL_LOGIN_TYPE","loginType","loginPath","loginPasswordField","loginUsernameField","logoutPath","getBasePath","Authenticate","constructor","_defineProperty","_isBasic","authenticationType","type","JAAS","_includesInstanceProperty","call","PAC4J_FORM","PAC4J_BASIC","PAC4J_INDIRECT","isBasicAuthentication","requestLogin","url","method","GET","headers","Accept","initLogin","_Promise","resolve","catch","error","login","username","password","doFormLogin","doBasicAuthentication","doJaasAuthentication","getFormLoginUrl","getFormLoginData","encodedUsername","encodeURIComponent","encodedPassword","POST","data","addItem","btoa","then","removeItem","getLogoutUrl","redirectToLogout","postRedirectUrl","clear","redirectUrl","window","location","assign","logout","response"],"sources":["../../src/modularui/Authenticate.js"],"sourcesContent":["// @flow\nimport { HTTP_METHODS } from \"../constants/Constants\";\n\nimport universalFetch from \"../utils/fetch/universalFetch\";\nimport Cache from \"../utils/browser/Cache\";\n\nimport { UnauthorizedException } from \"../exceptions\";\nimport {\n  INTERNAL_LOGIN_TYPE,\n  loginType,\n  loginPath,\n  loginPasswordField,\n  loginUsernameField,\n  logoutPath,\n  getBasePath,\n} from \"../constants\";\n\n/**\n */\nclass Authenticate {\n  _isBasic: boolean;\n\n  /**\n   */\n  constructor() {\n    this._isBasic = false;\n  }\n\n  /**\n   */\n  get authenticationType(): $Keys<typeof INTERNAL_LOGIN_TYPE> {\n    const type = loginType();\n\n    if (!type || type === INTERNAL_LOGIN_TYPE.JAAS) {\n      return INTERNAL_LOGIN_TYPE.JAAS;\n    }\n\n    if (type.includes(\"FormClient\")) {\n      return INTERNAL_LOGIN_TYPE.PAC4J_FORM;\n    } else if (type.includes(\"IndirectBasicClient\")) {\n      return INTERNAL_LOGIN_TYPE.PAC4J_BASIC;\n    }\n    return INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT;\n  }\n\n  /**\n   */\n  get isBasicAuthentication(): boolean {\n    return (\n      this._isBasic ||\n      this.authenticationType === INTERNAL_LOGIN_TYPE.PAC4J_BASIC\n    );\n  }\n\n  /**\n   */\n  set isBasicAuthentication(isBasicAuthentication: boolean) {\n    this._isBasic = isBasicAuthentication;\n  }\n\n  /**\n   */\n  requestLogin(): Promise<any> {\n    return universalFetch({\n      url: `${getBasePath()}/login`,\n      method: HTTP_METHODS.GET,\n      headers: {\n        Accept: \"application/json\",\n        \"Content-Type\": \"application/x-www-form-urlencoded\",\n      },\n    });\n  }\n\n  /**\n   */\n  initLogin(initLogin: boolean): Promise<any> {\n    if (this.isBasicAuthentication || !initLogin) {\n      return Promise.resolve(true);\n    }\n\n    return this.requestLogin().catch((error) => {\n      // when an unauthorizedexception is received on a request to the login service,\n      // this indicates a basic authorization scenario\n      // in case of form based authentication other exceptions are thrown\n      if (error instanceof UnauthorizedException) {\n        this.isBasicAuthentication = true;\n      }\n\n      return Promise.resolve({});\n    });\n  }\n\n  /**\n   */\n  login(username: string, password: string): Promise<any> {\n    switch (this.authenticationType) {\n      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:\n        return this.doFormLogin(username, password);\n      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:\n        return this.doBasicAuthentication(username, password);\n      case INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT:\n        // pac4j should handle this\n        return Promise.resolve();\n      default:\n        return this.doJaasAuthentication(username, password);\n    }\n  }\n\n  /**\n   */\n  getFormLoginUrl(): string {\n    switch (this.authenticationType) {\n      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:\n        return `${getBasePath()}${loginPath(\"DirectBasicAuthClient\")}`;\n      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:\n        return `${getBasePath()}${loginPath(\"FormClient\")}`;\n      case INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT:\n        //pac4j should handle this\n        return \"\";\n      default:\n        return `${getBasePath()}/j_security_check`;\n    }\n  }\n\n  /**\n   */\n  getFormLoginData(username: string, password: string): string {\n    const encodedUsername = encodeURIComponent(username);\n    const encodedPassword = encodeURIComponent(password);\n\n    switch (this.authenticationType) {\n      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:\n      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:\n        return `${loginUsernameField()}=${encodedUsername}&${loginPasswordField()}=${encodedPassword}`;\n      case INTERNAL_LOGIN_TYPE.JAAS:\n        return `j_username=${encodedUsername}&j_password=${encodedPassword}`;\n      default:\n        return \"\";\n    }\n  }\n\n  /**\n   */\n  doFormLogin(username: string, password: string): Promise<any> {\n    return universalFetch({\n      url: this.getFormLoginUrl(),\n      method: HTTP_METHODS.POST,\n      headers: {\n        Accept: \"application/json\",\n        \"Content-Type\": \"application/x-www-form-urlencoded\",\n      },\n      data: this.getFormLoginData(username, password),\n    });\n  }\n\n  /**\n   */\n  doBasicAuthentication(username: string, password: string): Promise<any> {\n    Cache.addItem(\"basic\", btoa(`${username}:${password}`));\n    return this.requestLogin();\n  }\n\n  /**\n   */\n  doJaasAuthentication(username: string, password: string): Promise<any> {\n    return this.initLogin(true).then(() => {\n      if (this.isBasicAuthentication) {\n        Cache.removeItem(\"basic-ok\");\n        return this.doBasicAuthentication(username, password).then(() => {\n          Cache.addItem(\"basic-ok\", true);\n        });\n      }\n      return this.doFormLogin(username, password);\n    });\n  }\n\n  /**\n   */\n  getLogoutUrl(): string {\n    const type = loginType();\n\n    if (!type || type === INTERNAL_LOGIN_TYPE.JAAS) {\n      return `${getBasePath()}/Logoff`;\n    }\n\n    return `${getBasePath()}${logoutPath()}`;\n  }\n\n  /**\n   * Browser redirect to the logout url. (no xmlhttp)\n   */\n  redirectToLogout(postRedirectUrl?: string): void {\n    Cache.clear();\n\n    const redirectUrl = postRedirectUrl || getBasePath();\n\n    window.location.assign(this.getLogoutUrl() + \"?url=\" + redirectUrl);\n  }\n\n  /**\n   * Logout the user with xmlhttp\n   */\n  logout(): Promise<any> {\n    return universalFetch({\n      url: this.getLogoutUrl(),\n    }).then((response) => {\n      // clear cache because of cached contributions\n      Cache.clear();\n      return response;\n    });\n  }\n}\n\nexport default Authenticate;\n"],"mappings":"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","ignoreList":[]}

package/lib/constants/Settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"Settings.js","names":["_objects","require","_repositoryResource","_Constants","serverBase","__CONTEXT_PATH__","defaultSettings","CONTEXT_PATH","window","contextPath","CACHE_CONTRIBUTIONS","DEBUG_I18N_MESSAGE_NOT_FOUND","HIDE_NOTIFICATION_TIMEOUT","ALWAYS_COMMIT_FORM","RENDER_QUESTION_LABELS","RENDER_MANDATORY_ATTRIBUTE_INDICATION","RENDER_OPTIONAL_ATTRIBUTE_INDICATION","AVAILABLE_LIST_VIEWS","USE_CLIENTSIDE_VALIDATION","USE_INSTANT_SERVER_VALIDATION","ENABLED_LOCALES","RENDER_GLOBAL_LOGIN_PAGE","RENDER_GLOBAL_LOGOUT_PAGE","RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE","LOGIN_PATH","ADMINISTRATOR_LOGIN_PATH","LOGOUT_PATH","RENDER_FORMS_IN_MODAL","SHOW_SUBMIT_WAIT_TIMEOUT","SWIM_LANE_DIAGRAM_CONFIGURATION","BUSINESS_SCENARIO_CONCEPT_TYPE","BUSINESS_SCENARIO_STEP_CONCEPT_TYPE","BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE","BUSINESS_SCENARIO_SYSTEM_CONCEPT_TYPE","CALENDAR_WEEK_STARTS_ON","CALENDAR_FIRST_WEEK_CONTAINS_DATE","UI_PARAMETERS","ALLOW_HIDE_WHEN_EMPTY_ON_TABS","PAGE_RELOAD_ON_UNAUTHORIZED_ERROR","XHR_TIMEOUT_MS","XHR_ALWAYS_WITH_CREDENTIALS","HIDE_WHEN_EMPTY_IGNORE_TASKS","SHOW_AVATARS","COMPLETE_SOURCE","settings","setSettings","config","isPlainObject","_assign","default","exports","getSetting","key","defaultValue","has","undefined","Error","setSetting","value","allSettings","cacheContributions","getBasePath","getBasePathModularUI","getBasePathServer","getUploadPath","origin","UPLOAD_PATH","getCaptchaPath","CAPTCHA_PATH","hasAllContentInData","ALL_CONTENT_IN_DATA_SETTING","isIncludeTimeOffsetInDateTimes","INCLUDE_TIME_OFFSET","getEnabledLocales","loginType","LOGIN_TYPE","INTERNAL_LOGIN_TYPE","JAAS","loginPath","clientName","LOGIN_PATH_SETTING","loginUsernameField","LOGIN_USERNAME_SETTING","loginPasswordField","LOGIN_PASSWORD_SETTING","logoutPath","LOGOUT_PATH_SETTING","getSwimLaneDiagramConfiguration","configLocation","_startsWith","call","getRepositoryResourceUrl","setContextPath","BASE"],"sources":["../../src/constants/Settings.js"],"sourcesContent":["// @flow\nimport { isPlainObject, has } from \"../utils/helpers/objects\";\nimport { getRepositoryResourceUrl } from \"../utils/helpers/repositoryResource\";\nimport {\n  ALL_CONTENT_IN_DATA_SETTING,\n  INCLUDE_TIME_OFFSET,\n  INTERNAL_LOGIN_TYPE,\n  LOGIN_TYPE,\n  LOGIN_PATH_SETTING,\n  LOGIN_USERNAME_SETTING,\n  LOGIN_PASSWORD_SETTING,\n  LOGOUT_PATH_SETTING,\n  UPLOAD_PATH,\n  CAPTCHA_PATH,\n} from \"./Constants\";\n\ntype Setting = boolean | string | number | Array<string>;\n\nconst serverBase =\n  typeof __CONTEXT_PATH__ === \"undefined\" ? null : __CONTEXT_PATH__;\n\nconst defaultSettings: { [name: string]: Setting } = {\n  // This uses contextPath set from property from server\n  CONTEXT_PATH:\n    serverBase ??\n    (typeof window !== \"undefined\" && window.contextPath\n      ? window.contextPath\n      : \"/BeInformed\"),\n\n  // Indicates if contributions should be cached\n  CACHE_CONTRIBUTIONS: true,\n\n  // Debug missing i18n messages in layout\n  DEBUG_I18N_MESSAGE_NOT_FOUND: true,\n\n  // Time to show the notification bar\n  HIDE_NOTIFICATION_TIMEOUT: 5000,\n\n  // Always commit form, does not show result pages for instruments\n  ALWAYS_COMMIT_FORM: false,\n\n  // Render instrument and event question labels on forms (might result in duplicate labels)\n  RENDER_QUESTION_LABELS: true,\n\n  // Render mandatory indications on attributes\n  RENDER_MANDATORY_ATTRIBUTE_INDICATION: true,\n\n  // Render optional indications on attributes\n  RENDER_OPTIONAL_ATTRIBUTE_INDICATION: false,\n\n  // Renders a toggle with supported list views, options are ListView and TableView\n  AVAILABLE_LIST_VIEWS: [\"ListView\", \"TableView\"],\n\n  // Toggle client side validation\n  USE_CLIENTSIDE_VALIDATION: true,\n\n  // Indicates if server validation should be used when a form field is changed\n  USE_INSTANT_SERVER_VALIDATION: true,\n\n  // Indicates which locales are enabled\n  ENABLED_LOCALES: [\"en\", \"nl\"],\n\n  // Renders the global log in page\n  RENDER_GLOBAL_LOGIN_PAGE: false,\n\n  // Renders the global log out page\n  RENDER_GLOBAL_LOGOUT_PAGE: false,\n\n  // Renders the login variants as option on the global logout page\n  RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE: false,\n\n  // Path to login page / component\n  LOGIN_PATH: \"/signin\",\n\n  // Path to administrator login page / component\n  ADMINISTRATOR_LOGIN_PATH: \"\",\n\n  // Path to logout page / component\n  LOGOUT_PATH: \"/signout\",\n\n  // Render forms in a modal\n  RENDER_FORMS_IN_MODAL: true,\n\n  // Wait timeout before rendering submit wait icon\n  SHOW_SUBMIT_WAIT_TIMEOUT: 300,\n\n  // Swim lane diagram configuration file\n  SWIM_LANE_DIAGRAM_CONFIGURATION: \"/Library/Diagrams/Overviews.json\",\n\n  // Business scenario concept types\n  BUSINESS_SCENARIO_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/BusinessScenario\",\n  ],\n  BUSINESS_SCENARIO_STEP_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/ScenarioStep\",\n  ],\n  BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/Persona\",\n  ],\n  BUSINESS_SCENARIO_SYSTEM_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/System\",\n  ],\n\n  // indicates on what day the week starts (0 = Sunday)\n  CALENDAR_WEEK_STARTS_ON: 1,\n\n  // indicates which date indicates the first week of the year\n  CALENDAR_FIRST_WEEK_CONTAINS_DATE: 1,\n\n  // parameters that are added for the ui state, but should not be send to the modular ui\n  UI_PARAMETERS: [],\n\n  // disable hide-when-empty hint for layouts running on Be Informed versions older than 21.1\n  ALLOW_HIDE_WHEN_EMPTY_ON_TABS: true,\n\n  // reload the complete page on signout, usefull when third party authentication is in place\n  PAGE_RELOAD_ON_UNAUTHORIZED_ERROR: false,\n\n  XHR_TIMEOUT_MS: 300000,\n\n  XHR_ALWAYS_WITH_CREDENTIALS: false,\n\n  HIDE_WHEN_EMPTY_IGNORE_TASKS: false,\n\n  SHOW_AVATARS: true,\n\n  COMPLETE_SOURCE: false,\n};\n\nlet settings = defaultSettings;\n\n/**\n */\nexport const setSettings = (config: Object) => {\n  if (isPlainObject(config)) {\n    settings = Object.assign(defaultSettings, config);\n  }\n};\n\n/**\n */\nexport const getSetting = (key: string, defaultValue?: any): any => {\n  if (!has(settings, key) && defaultValue === undefined) {\n    throw new Error(\n      `Setting with name ${key} not found and no defaultValue given`,\n    );\n  }\n  return settings[key] ?? defaultValue;\n};\n\n/**\n */\nexport const setSetting = (key: string, value: any) => {\n  settings[key] = value;\n};\n\n/**\n */\nexport const allSettings = (): { [name: string]: Setting } => settings;\n\n/**\n * Indicates if contributions must be cached\n */\nexport const cacheContributions = (): boolean =>\n  getSetting(\"CACHE_CONTRIBUTIONS\", true);\n\n/**\n * The context path is retrieved on the server using the context path property as set in the runtime properties\n * This can be manually overriden by setting the UI setting 'CONTEXT_PATH'\n */\nexport const getBasePath = (): string =>\n  getSetting(\"CONTEXT_PATH\", \"/BeInformed\");\n\n/**\n * The context path to modular ui rest services\n */\nexport const getBasePathModularUI = (): string =>\n  getSetting(\"CONTEXT_PATH_SERVER\", getBasePath());\n\n/**\n * Used to link the css and js files in the server templates\n */\nexport const getBasePathServer = (): string =>\n  getSetting(\"CONTEXT_PATH_SERVER\", getBasePath());\n\n/**\n * Path to upload service\n */\nexport const getUploadPath = (\n  contextPath: string = getBasePathModularUI(),\n  origin: string = \"\",\n): string => `${origin}${contextPath}${UPLOAD_PATH}`;\n\n/**\n * Path to captcha service\n */\nexport const getCaptchaPath = (\n  contextPath: string = getBasePathModularUI(),\n  origin: string = \"\",\n): string => `${origin}${contextPath}${CAPTCHA_PATH}`;\n\n/**\n */\nexport const hasAllContentInData = (): boolean =>\n  getSetting(ALL_CONTENT_IN_DATA_SETTING, true);\n\n/**\n */\nexport const isIncludeTimeOffsetInDateTimes = (): boolean =>\n  getSetting(INCLUDE_TIME_OFFSET, false);\n\n/**\n */\nexport const getEnabledLocales = (): Array<string> =>\n  getSetting(\"ENABLED_LOCALES\", [\"en\"]);\n\n/**\n * Login type\n */\nexport const loginType = (): string =>\n  getSetting(LOGIN_TYPE, INTERNAL_LOGIN_TYPE.JAAS);\n\n/**\n */\nexport const loginPath = (clientName: string = \"FormClient\"): string =>\n  getSetting(LOGIN_PATH_SETTING, `/callback?client_name=${clientName}`);\n/**\n */\nexport const loginUsernameField = (): string =>\n  getSetting(LOGIN_USERNAME_SETTING, \"j_username\");\n/**\n */\nexport const loginPasswordField = (): string =>\n  getSetting(LOGIN_PASSWORD_SETTING, \"j_password\");\n/**\n */\nexport const logoutPath = (): string =>\n  getSetting(LOGOUT_PATH_SETTING, \"/logout\");\n\nexport const LOGIN_PATH: string = loginPath();\nexport const LOGOUT_PATH: string = logoutPath();\n\n/**\n * Model overview swim lane configuration\n */\nexport const getSwimLaneDiagramConfiguration: Object = () => {\n  let configLocation = getSetting(\n    \"SWIM_LANE_DIAGRAM_CONFIGURATION\",\n    \"/Library/Diagrams/Overviews.json\",\n  );\n  if (!configLocation.startsWith(\"/\")) {\n    configLocation = `/${configLocation}`;\n  }\n  return getRepositoryResourceUrl(configLocation);\n};\n\n/**\n * Set the context path for requests to be informed\n */\nexport const setContextPath = (contextPath: string) => {\n  setSetting(\"CONTEXT_PATH\", contextPath);\n};\n\n/**\n * Backwards compatible export of BASE constant\n */\nexport const BASE: string = getBasePath();\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Settings.js","names":["_objects","require","_repositoryResource","_Constants","serverBase","__CONTEXT_PATH__","defaultSettings","CONTEXT_PATH","window","contextPath","CACHE_CONTRIBUTIONS","DEBUG_I18N_MESSAGE_NOT_FOUND","HIDE_NOTIFICATION_TIMEOUT","ALWAYS_COMMIT_FORM","RENDER_QUESTION_LABELS","RENDER_MANDATORY_ATTRIBUTE_INDICATION","RENDER_OPTIONAL_ATTRIBUTE_INDICATION","AVAILABLE_LIST_VIEWS","USE_CLIENTSIDE_VALIDATION","USE_INSTANT_SERVER_VALIDATION","ENABLED_LOCALES","RENDER_GLOBAL_LOGIN_PAGE","RENDER_GLOBAL_LOGOUT_PAGE","RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE","LOGIN_PATH","ADMINISTRATOR_LOGIN_PATH","LOGOUT_PATH","RENDER_FORMS_IN_MODAL","SHOW_SUBMIT_WAIT_TIMEOUT","SWIM_LANE_DIAGRAM_CONFIGURATION","BUSINESS_SCENARIO_CONCEPT_TYPE","BUSINESS_SCENARIO_STEP_CONCEPT_TYPE","BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE","BUSINESS_SCENARIO_SYSTEM_CONCEPT_TYPE","CALENDAR_WEEK_STARTS_ON","CALENDAR_FIRST_WEEK_CONTAINS_DATE","UI_PARAMETERS","ALLOW_HIDE_WHEN_EMPTY_ON_TABS","PAGE_RELOAD_ON_UNAUTHORIZED_ERROR","XHR_TIMEOUT_MS","XHR_ALWAYS_WITH_CREDENTIALS","HIDE_WHEN_EMPTY_IGNORE_TASKS","SHOW_AVATARS","COMPLETE_SOURCE","settings","setSettings","config","isPlainObject","_assign","default","exports","getSetting","key","defaultValue","has","undefined","Error","setSetting","value","allSettings","cacheContributions","getBasePath","getBasePathModularUI","getBasePathServer","getUploadPath","origin","UPLOAD_PATH","getCaptchaPath","CAPTCHA_PATH","hasAllContentInData","ALL_CONTENT_IN_DATA_SETTING","isIncludeTimeOffsetInDateTimes","INCLUDE_TIME_OFFSET","getEnabledLocales","loginType","LOGIN_TYPE","INTERNAL_LOGIN_TYPE","JAAS","loginPath","clientName","LOGIN_PATH_SETTING","loginUsernameField","LOGIN_USERNAME_SETTING","loginPasswordField","LOGIN_PASSWORD_SETTING","logoutPath","LOGOUT_PATH_SETTING","getSwimLaneDiagramConfiguration","configLocation","_startsWith","call","getRepositoryResourceUrl","setContextPath","BASE"],"sources":["../../src/constants/Settings.js"],"sourcesContent":["// @flow\nimport { isPlainObject, has } from \"../utils/helpers/objects\";\nimport { getRepositoryResourceUrl } from \"../utils/helpers/repositoryResource\";\nimport {\n  ALL_CONTENT_IN_DATA_SETTING,\n  INCLUDE_TIME_OFFSET,\n  INTERNAL_LOGIN_TYPE,\n  LOGIN_TYPE,\n  LOGIN_PATH_SETTING,\n  LOGIN_USERNAME_SETTING,\n  LOGIN_PASSWORD_SETTING,\n  LOGOUT_PATH_SETTING,\n  UPLOAD_PATH,\n  CAPTCHA_PATH,\n} from \"./Constants\";\n\ntype Setting = boolean | string | number | Array<string>;\n\nconst serverBase =\n  typeof __CONTEXT_PATH__ === \"undefined\" ? null : __CONTEXT_PATH__;\n\nconst defaultSettings: { [name: string]: Setting } = {\n  // This uses contextPath set from property from server\n  CONTEXT_PATH:\n    serverBase ??\n    (typeof window !== \"undefined\" && window.contextPath\n      ? window.contextPath\n      : \"/BeInformed\"),\n\n  // Indicates if contributions should be cached\n  CACHE_CONTRIBUTIONS: true,\n\n  // Debug missing i18n messages in layout\n  DEBUG_I18N_MESSAGE_NOT_FOUND: true,\n\n  // Time to show the notification bar\n  HIDE_NOTIFICATION_TIMEOUT: 5000,\n\n  // Always commit form, does not show result pages for instruments\n  ALWAYS_COMMIT_FORM: false,\n\n  // Render instrument and event question labels on forms (might result in duplicate labels)\n  RENDER_QUESTION_LABELS: true,\n\n  // Render mandatory indications on attributes\n  RENDER_MANDATORY_ATTRIBUTE_INDICATION: true,\n\n  // Render optional indications on attributes\n  RENDER_OPTIONAL_ATTRIBUTE_INDICATION: false,\n\n  // Renders a toggle with supported list views, options are ListView and TableView\n  AVAILABLE_LIST_VIEWS: [\"ListView\", \"TableView\"],\n\n  // Toggle client side validation\n  USE_CLIENTSIDE_VALIDATION: true,\n\n  // Indicates if server validation should be used when a form field is changed\n  USE_INSTANT_SERVER_VALIDATION: true,\n\n  // Indicates which locales are enabled\n  ENABLED_LOCALES: [\"en\", \"nl\"],\n\n  // Renders the global log in page\n  RENDER_GLOBAL_LOGIN_PAGE: false,\n\n  // Renders the global log out page\n  RENDER_GLOBAL_LOGOUT_PAGE: false,\n\n  // Renders the login variants as option on the global logout page\n  RENDER_MULTI_LOGIN_ON_GLOBAL_LOGOUT_PAGE: false,\n\n  // Path to login page / component\n  LOGIN_PATH: \"/signin\",\n\n  // Path to administrator login page / component\n  ADMINISTRATOR_LOGIN_PATH: \"\",\n\n  // Path to logout page / component\n  LOGOUT_PATH: \"/signout\",\n\n  // Render forms in a modal\n  RENDER_FORMS_IN_MODAL: true,\n\n  // Wait timeout before rendering submit wait icon\n  SHOW_SUBMIT_WAIT_TIMEOUT: 300,\n\n  // Swim lane diagram configuration file\n  SWIM_LANE_DIAGRAM_CONFIGURATION: \"/Library/Diagrams/Overviews.json\",\n\n  // Business scenario concept types\n  BUSINESS_SCENARIO_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/BusinessScenario\",\n  ],\n  BUSINESS_SCENARIO_STEP_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/ScenarioStep\",\n  ],\n  BUSINESS_SCENARIO_PERSONA_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/Persona\",\n  ],\n  BUSINESS_SCENARIO_SYSTEM_CONCEPT_TYPE: [\n    \"/Library/KMTs/Business scenarios.bixml/System\",\n  ],\n\n  // indicates on what day the week starts (0 = Sunday)\n  CALENDAR_WEEK_STARTS_ON: 1,\n\n  // indicates which date indicates the first week of the year\n  CALENDAR_FIRST_WEEK_CONTAINS_DATE: 1,\n\n  // parameters that are added for the ui state, but should not be send to the modular ui\n  UI_PARAMETERS: [],\n\n  // disable hide-when-empty hint for layouts running on Be Informed versions older than 21.1\n  ALLOW_HIDE_WHEN_EMPTY_ON_TABS: true,\n\n  // reload the complete page on signout, usefull when third party authentication is in place\n  PAGE_RELOAD_ON_UNAUTHORIZED_ERROR: false,\n\n  XHR_TIMEOUT_MS: 300000,\n\n  XHR_ALWAYS_WITH_CREDENTIALS: false,\n\n  HIDE_WHEN_EMPTY_IGNORE_TASKS: false,\n\n  SHOW_AVATARS: true,\n\n  COMPLETE_SOURCE: false,\n};\n\nlet settings = defaultSettings;\n\n/**\n */\nexport const setSettings = (config: Object) => {\n  if (isPlainObject(config)) {\n    settings = Object.assign(defaultSettings, config);\n  }\n};\n\n/**\n */\nexport const getSetting = (key: string, defaultValue?: any): any => {\n  if (!has(settings, key) && defaultValue === undefined) {\n    throw new Error(\n      `Setting with name ${key} not found and no defaultValue given`,\n    );\n  }\n  return settings[key] ?? defaultValue;\n};\n\n/**\n */\nexport const setSetting = (key: string, value: any) => {\n  settings[key] = value;\n};\n\n/**\n */\nexport const allSettings = (): { [name: string]: Setting } => settings;\n\n/**\n * Indicates if contributions must be cached\n */\nexport const cacheContributions = (): boolean =>\n  getSetting(\"CACHE_CONTRIBUTIONS\", true);\n\n/**\n * The context path is retrieved on the server using the context path property as set in the runtime properties\n * This can be manually overriden by setting the UI setting 'CONTEXT_PATH'\n */\nexport const getBasePath = (): string =>\n  getSetting(\"CONTEXT_PATH\", \"/BeInformed\");\n\n/**\n * The context path to modular ui rest services\n */\nexport const getBasePathModularUI = (): string =>\n  getSetting(\"CONTEXT_PATH_SERVER\", getBasePath());\n\n/**\n * Used to link the css and js files in the server templates\n */\nexport const getBasePathServer = (): string =>\n  getSetting(\"CONTEXT_PATH_SERVER\", getBasePath());\n\n/**\n * Path to upload service\n */\nexport const getUploadPath = (\n  contextPath: string = getBasePathModularUI(),\n  origin: string = \"\",\n): string => `${origin}${contextPath}${UPLOAD_PATH}`;\n\n/**\n * Path to captcha service\n */\nexport const getCaptchaPath = (\n  contextPath: string = getBasePathModularUI(),\n  origin: string = \"\",\n): string => `${origin}${contextPath}${CAPTCHA_PATH}`;\n\n/**\n */\nexport const hasAllContentInData = (): boolean =>\n  getSetting(ALL_CONTENT_IN_DATA_SETTING, true);\n\n/**\n */\nexport const isIncludeTimeOffsetInDateTimes = (): boolean =>\n  getSetting(INCLUDE_TIME_OFFSET, false);\n\n/**\n */\nexport const getEnabledLocales = (): Array<string> =>\n  getSetting(\"ENABLED_LOCALES\", [\"en\"]);\n\n/**\n * Login type\n */\nexport const loginType = (): string | Array<string> =>\n  getSetting(LOGIN_TYPE, INTERNAL_LOGIN_TYPE.JAAS);\n\n/**\n */\nexport const loginPath = (clientName: string = \"FormClient\"): string =>\n  getSetting(LOGIN_PATH_SETTING, `/callback?client_name=${clientName}`);\n/**\n */\nexport const loginUsernameField = (): string =>\n  getSetting(LOGIN_USERNAME_SETTING, \"j_username\");\n/**\n */\nexport const loginPasswordField = (): string =>\n  getSetting(LOGIN_PASSWORD_SETTING, \"j_password\");\n/**\n */\nexport const logoutPath = (): string =>\n  getSetting(LOGOUT_PATH_SETTING, \"/logout\");\n\nexport const LOGIN_PATH: string = loginPath();\nexport const LOGOUT_PATH: string = logoutPath();\n\n/**\n * Model overview swim lane configuration\n */\nexport const getSwimLaneDiagramConfiguration: Object = () => {\n  let configLocation = getSetting(\n    \"SWIM_LANE_DIAGRAM_CONFIGURATION\",\n    \"/Library/Diagrams/Overviews.json\",\n  );\n  if (!configLocation.startsWith(\"/\")) {\n    configLocation = `/${configLocation}`;\n  }\n  return getRepositoryResourceUrl(configLocation);\n};\n\n/**\n * Set the context path for requests to be informed\n */\nexport const setContextPath = (contextPath: string) => {\n  setSetting(\"CONTEXT_PATH\", contextPath);\n};\n\n/**\n * Backwards compatible export of BASE constant\n */\nexport const BASE: string = getBasePath();\n"],"mappings":"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","ignoreList":[]}

package/lib/hooks/useAuthentication.js

@@ -47,14 +47,15 @@ const useLogout = () => {
   const application = (0, _reactRedux.useSelector)(_ModularUISelectors.getApplication);
   const LOGOUT_PATH = (0, _constants.logoutPath)();
   const BASE_PATH = (0, _constants.getBasePathServer)();
+  const authenticate = new _modularui.Authenticate();
   const isAuthenticated = application?.isLoggedIn ?? false;
   return {
     isAuthenticated,
     authenticationTypes: application?.authenticationTypes ?? [_constants.DEFAULT_AUTHENTICATION_TYPE],
     logout: () => {
-      const type = (0, _constants.loginType)();
+      const type = authenticate.authenticationType;
       if (type === _constants.INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {
-        _modularui.Authenticate.redirectToLogout();
+        authenticate.redirectToLogout();
       } else if (_Cache.default.getItem("isRedirectLogin")) {
         const origin = window.location.origin;
         const url = `${origin}${BASE_PATH}/logout?url=${origin}${BASE_PATH}${LOGOUT_PATH}`;
@@ -64,7 +65,7 @@ const useLogout = () => {
         return dispatch((0, _actions.logout)());
       }
     },
-    logoutUrl: _modularui.Authenticate.getLogoutUrl()
+    logoutUrl: authenticate.getLogoutUrl()
   };
 };
 exports.useLogout = useLogout;

package/lib/hooks/useAuthentication.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAuthentication.js","names":["_reactRedux","require","_ModularUISelectors","_actions","_Cache","_interopRequireDefault","_constants","_exceptions","_modularui","useLogin","Cache","setItem","dispatch","useDispatch","application","useSelector","getApplication","auth","state","isAuthenticated","isLoggedIn","authenticationTypes","DEFAULT_AUTHENTICATION_TYPE","errorMessage","error","resetErrors","resetAuthErrors","login","username","password","redirectLogin","authenticationType","getItem","IllegalStateException","authentication","redirectUri","window","location","assign","getBasePathServer","exports","useLogout","LOGOUT_PATH","logoutPath","BASE_PATH","logout","type","loginType","INTERNAL_LOGIN_TYPE","PAC4J_INDIRECT","Authenticate","redirectToLogout","origin","url","logoutUrl","getLogoutUrl"],"sources":["../../src/hooks/useAuthentication.js"],"sourcesContent":["// @flow\nimport { useSelector, useDispatch } from \"react-redux\";\n\nimport { getApplication } from \"../redux/_modularui/ModularUISelectors\";\nimport { login, logout, resetAuthErrors } from \"../redux/actions\";\n\nimport Cache from \"../utils/browser/Cache\";\nimport {\n  DEFAULT_AUTHENTICATION_TYPE,\n  getBasePathServer,\n  INTERNAL_LOGIN_TYPE,\n  loginType,\n  logoutPath,\n} from \"../constants\";\nimport { IllegalStateException } from \"../exceptions\";\nimport { Authenticate } from \"../modularui\";\n\nimport type { ResetAuthErrorsAction } from \"../redux/types\";\nimport type { AuthenticationType } from \"../models/types\";\n\ntype LoginHook = {\n  isAuthenticated: boolean,\n  authenticationTypes: Array<AuthenticationType>,\n  errorMessage: ?string,\n  resetErrors: () => ResetAuthErrorsAction,\n  login: (username: string, password: string) => void,\n  redirectLogin: (authenticationType: AuthenticationType) => void,\n};\ntype LogoutHook = {\n  isAuthenticated: boolean,\n  authenticationTypes: Array<AuthenticationType>,\n  logout: () => void,\n  logoutUrl: string,\n};\n\n/**\n */\nexport const useLogin = (): LoginHook => {\n  Cache.setItem(\"isRedirectLogin\", false);\n\n  const dispatch = useDispatch();\n\n  const application = useSelector(getApplication);\n  const auth = useSelector((state) => state.auth);\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n\n  return {\n    isAuthenticated,\n    authenticationTypes: application?.authenticationTypes ?? [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ],\n    errorMessage: auth.error,\n    resetErrors: () => dispatch(resetAuthErrors()),\n    login: (username: string, password: string) =>\n      dispatch(login(username, password)),\n    redirectLogin: (authenticationType: AuthenticationType) => {\n      if (Cache.getItem(\"isRedirectLogin\")) {\n        // prevent endless loop in redirects when authentication type can't be redirected\n        throw new IllegalStateException(\n          `Could not redirect to '${\n            authenticationType.authentication\n          }' using url: '${authenticationType.redirectUri ?? \"\"}'`,\n        );\n      }\n\n      if (!isAuthenticated) {\n        Cache.setItem(\"isRedirectLogin\", true);\n        window.location.assign(\n          `${getBasePathServer()}${authenticationType.redirectUri ?? \"\"}`,\n        );\n      }\n    },\n  };\n};\n\n/**\n */\nexport const useLogout = (): LogoutHook => {\n  const dispatch = useDispatch();\n  const application = useSelector(getApplication);\n\n  const LOGOUT_PATH = logoutPath();\n  const BASE_PATH = getBasePathServer();\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n  return {\n    isAuthenticated,\n    authenticationTypes: application?.authenticationTypes ?? [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ],\n    logout: () => {\n      const type = loginType();\n      if (type === INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {\n        Authenticate.redirectToLogout();\n      } else if (Cache.getItem(\"isRedirectLogin\")) {\n        const origin = window.location.origin;\n        const url = `${origin}${BASE_PATH}/logout?url=${origin}${BASE_PATH}${LOGOUT_PATH}`;\n        Cache.setItem(\"isRedirectLogin\", false);\n        window.location.assign(url);\n      } else {\n        return dispatch(logout());\n      }\n    },\n    logoutUrl: Authenticate.getLogoutUrl(),\n  };\n};\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"useAuthentication.js","names":["_reactRedux","require","_ModularUISelectors","_actions","_Cache","_interopRequireDefault","_constants","_exceptions","_modularui","useLogin","Cache","setItem","dispatch","useDispatch","application","useSelector","getApplication","auth","state","isAuthenticated","isLoggedIn","authenticationTypes","DEFAULT_AUTHENTICATION_TYPE","errorMessage","error","resetErrors","resetAuthErrors","login","username","password","redirectLogin","authenticationType","getItem","IllegalStateException","authentication","redirectUri","window","location","assign","getBasePathServer","exports","useLogout","LOGOUT_PATH","logoutPath","BASE_PATH","authenticate","Authenticate","logout","type","INTERNAL_LOGIN_TYPE","PAC4J_INDIRECT","redirectToLogout","origin","url","logoutUrl","getLogoutUrl"],"sources":["../../src/hooks/useAuthentication.js"],"sourcesContent":["// @flow\nimport { useSelector, useDispatch } from \"react-redux\";\n\nimport { getApplication } from \"../redux/_modularui/ModularUISelectors\";\nimport { login, logout, resetAuthErrors } from \"../redux/actions\";\n\nimport Cache from \"../utils/browser/Cache\";\nimport {\n  DEFAULT_AUTHENTICATION_TYPE,\n  getBasePathServer,\n  INTERNAL_LOGIN_TYPE,\n  logoutPath,\n} from \"../constants\";\nimport { IllegalStateException } from \"../exceptions\";\nimport { Authenticate } from \"../modularui\";\n\nimport type { ResetAuthErrorsAction } from \"../redux/types\";\nimport type { AuthenticationType } from \"../models/types\";\n\ntype LoginHook = {\n  isAuthenticated: boolean,\n  authenticationTypes: Array<AuthenticationType>,\n  errorMessage: ?string,\n  resetErrors: () => ResetAuthErrorsAction,\n  login: (username: string, password: string) => void,\n  redirectLogin: (authenticationType: AuthenticationType) => void,\n};\ntype LogoutHook = {\n  isAuthenticated: boolean,\n  authenticationTypes: Array<AuthenticationType>,\n  logout: () => void,\n  logoutUrl: string,\n};\n\n/**\n */\nexport const useLogin = (): LoginHook => {\n  Cache.setItem(\"isRedirectLogin\", false);\n\n  const dispatch = useDispatch();\n\n  const application = useSelector(getApplication);\n  const auth = useSelector((state) => state.auth);\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n\n  return {\n    isAuthenticated,\n    authenticationTypes: application?.authenticationTypes ?? [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ],\n    errorMessage: auth.error,\n    resetErrors: () => dispatch(resetAuthErrors()),\n    login: (username: string, password: string) =>\n      dispatch(login(username, password)),\n    redirectLogin: (authenticationType: AuthenticationType) => {\n      if (Cache.getItem(\"isRedirectLogin\")) {\n        // prevent endless loop in redirects when authentication type can't be redirected\n        throw new IllegalStateException(\n          `Could not redirect to '${\n            authenticationType.authentication\n          }' using url: '${authenticationType.redirectUri ?? \"\"}'`,\n        );\n      }\n\n      if (!isAuthenticated) {\n        Cache.setItem(\"isRedirectLogin\", true);\n        window.location.assign(\n          `${getBasePathServer()}${authenticationType.redirectUri ?? \"\"}`,\n        );\n      }\n    },\n  };\n};\n\n/**\n */\nexport const useLogout = (): LogoutHook => {\n  const dispatch = useDispatch();\n  const application = useSelector(getApplication);\n\n  const LOGOUT_PATH = logoutPath();\n  const BASE_PATH = getBasePathServer();\n\n  const authenticate = new Authenticate();\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n  return {\n    isAuthenticated,\n    authenticationTypes: application?.authenticationTypes ?? [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ],\n    logout: () => {\n      const type = authenticate.authenticationType;\n      if (type === INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {\n        authenticate.redirectToLogout();\n      } else if (Cache.getItem(\"isRedirectLogin\")) {\n        const origin = window.location.origin;\n        const url = `${origin}${BASE_PATH}/logout?url=${origin}${BASE_PATH}${LOGOUT_PATH}`;\n        Cache.setItem(\"isRedirectLogin\", false);\n        window.location.assign(url);\n      } else {\n        return dispatch(logout());\n      }\n    },\n    logoutUrl: authenticate.getLogoutUrl(),\n  };\n};\n"],"mappings":"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","ignoreList":[]}

package/lib/modularui/Authenticate.js

@@ -32,7 +32,7 @@ class Authenticate {
     }
     if ((0, _includes.default)(type).call(type, "FormClient")) {
       return _constants.INTERNAL_LOGIN_TYPE.PAC4J_FORM;
-    } else if ((0, _includes.default)(type).call(type, "BasicClient")) {
+    } else if ((0, _includes.default)(type).call(type, "IndirectBasicClient")) {
       return _constants.INTERNAL_LOGIN_TYPE.PAC4J_BASIC;
     }
     return _constants.INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT;
@@ -121,8 +121,10 @@ class Authenticate {
       case _constants.INTERNAL_LOGIN_TYPE.PAC4J_BASIC:
       case _constants.INTERNAL_LOGIN_TYPE.PAC4J_FORM:
         return `${(0, _constants.loginUsernameField)()}=${encodedUsername}&${(0, _constants.loginPasswordField)()}=${encodedPassword}`;
-      default:
+      case _constants.INTERNAL_LOGIN_TYPE.JAAS:
         return `j_username=${encodedUsername}&j_password=${encodedPassword}`;
+      default:
+        return "";
     }
   }
 
@@ -163,7 +165,7 @@ class Authenticate {
 
   /**
    */
-  static getLogoutUrl() {
+  getLogoutUrl() {
     const type = (0, _constants.loginType)();
     if (!type || type === _constants.INTERNAL_LOGIN_TYPE.JAAS) {
       return `${(0, _constants.getBasePath)()}/Logoff`;
@@ -174,9 +176,10 @@ class Authenticate {
   /**
    * Browser redirect to the logout url. (no xmlhttp)
    */
-  static redirectToLogout() {
+  redirectToLogout(postRedirectUrl) {
     _Cache.default.clear();
-    window.location.assign(Authenticate.getLogoutUrl());
+    const redirectUrl = postRedirectUrl || (0, _constants.getBasePath)();
+    window.location.assign(this.getLogoutUrl() + "?url=" + redirectUrl);
   }
 
   /**
@@ -184,7 +187,7 @@ class Authenticate {
    */
   logout() {
     return (0, _universalFetch.default)({
-      url: Authenticate.getLogoutUrl()
+      url: this.getLogoutUrl()
     }).then(response => {
       // clear cache because of cached contributions
       _Cache.default.clear();

package/lib/modularui/Authenticate.js.map

@@ -1 +1 @@
-{"version":3,"file":"Authenticate.js","names":["_Constants","require","_universalFetch","_interopRequireDefault","_Cache","_exceptions","_constants","Authenticate","constructor","_defineProperty2","default","_isBasic","authenticationType","type","loginType","INTERNAL_LOGIN_TYPE","JAAS","_includes","call","PAC4J_FORM","PAC4J_BASIC","PAC4J_INDIRECT","isBasicAuthentication","requestLogin","universalFetch","url","getBasePath","method","HTTP_METHODS","GET","headers","Accept","initLogin","_promise","resolve","catch","error","UnauthorizedException","login","username","password","doFormLogin","doBasicAuthentication","doJaasAuthentication","getFormLoginUrl","loginPath","getFormLoginData","encodedUsername","encodeURIComponent","encodedPassword","loginUsernameField","loginPasswordField","POST","data","Cache","addItem","btoa","then","removeItem","getLogoutUrl","logoutPath","redirectToLogout","clear","window","location","assign","logout","response","_default","exports"],"sources":["../../src/modularui/Authenticate.js"],"sourcesContent":["// @flow\nimport { HTTP_METHODS } from \"../constants/Constants\";\n\nimport universalFetch from \"../utils/fetch/universalFetch\";\nimport Cache from \"../utils/browser/Cache\";\n\nimport { UnauthorizedException } from \"../exceptions\";\nimport {\n  INTERNAL_LOGIN_TYPE,\n  loginType,\n  loginPath,\n  loginPasswordField,\n  loginUsernameField,\n  logoutPath,\n  getBasePath,\n} from \"../constants\";\n\n/**\n */\nclass Authenticate {\n  _isBasic: boolean;\n\n  /**\n   */\n  constructor() {\n    this._isBasic = false;\n  }\n\n  /**\n   */\n  get authenticationType(): $Keys<typeof INTERNAL_LOGIN_TYPE> {\n    const type = loginType();\n\n    if (!type || type === INTERNAL_LOGIN_TYPE.JAAS) {\n      return INTERNAL_LOGIN_TYPE.JAAS;\n    }\n\n    if (type.includes(\"FormClient\")) {\n      return INTERNAL_LOGIN_TYPE.PAC4J_FORM;\n    } else if (type.includes(\"BasicClient\")) {\n      return INTERNAL_LOGIN_TYPE.PAC4J_BASIC;\n    }\n    return INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT;\n  }\n\n  /**\n   */\n  get isBasicAuthentication(): boolean {\n    return (\n      this._isBasic ||\n      this.authenticationType === INTERNAL_LOGIN_TYPE.PAC4J_BASIC\n    );\n  }\n\n  /**\n   */\n  set isBasicAuthentication(isBasicAuthentication: boolean) {\n    this._isBasic = isBasicAuthentication;\n  }\n\n  /**\n   */\n  requestLogin(): Promise<any> {\n    return universalFetch({\n      url: `${getBasePath()}/login`,\n      method: HTTP_METHODS.GET,\n      headers: {\n        Accept: \"application/json\",\n        \"Content-Type\": \"application/x-www-form-urlencoded\",\n      },\n    });\n  }\n\n  /**\n   */\n  initLogin(initLogin: boolean): Promise<any> {\n    if (this.isBasicAuthentication || !initLogin) {\n      return Promise.resolve(true);\n    }\n\n    return this.requestLogin().catch((error) => {\n      // when an unauthorizedexception is received on a request to the login service,\n      // this indicates a basic authorization scenario\n      // in case of form based authentication other exceptions are thrown\n      if (error instanceof UnauthorizedException) {\n        this.isBasicAuthentication = true;\n      }\n\n      return Promise.resolve({});\n    });\n  }\n\n  /**\n   */\n  login(username: string, password: string): Promise<any> {\n    switch (this.authenticationType) {\n      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:\n        return this.doFormLogin(username, password);\n      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:\n        return this.doBasicAuthentication(username, password);\n      case INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT:\n        // pac4j should handle this\n        return Promise.resolve();\n      default:\n        return this.doJaasAuthentication(username, password);\n    }\n  }\n\n  /**\n   */\n  getFormLoginUrl(): string {\n    switch (this.authenticationType) {\n      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:\n        return `${getBasePath()}${loginPath(\"DirectBasicAuthClient\")}`;\n      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:\n        return `${getBasePath()}${loginPath(\"FormClient\")}`;\n      case INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT:\n        //pac4j should handle this\n        return \"\";\n      default:\n        return `${getBasePath()}/j_security_check`;\n    }\n  }\n\n  /**\n   */\n  getFormLoginData(username: string, password: string): string {\n    const encodedUsername = encodeURIComponent(username);\n    const encodedPassword = encodeURIComponent(password);\n\n    switch (this.authenticationType) {\n      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:\n      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:\n        return `${loginUsernameField()}=${encodedUsername}&${loginPasswordField()}=${encodedPassword}`;\n      default:\n        return `j_username=${encodedUsername}&j_password=${encodedPassword}`;\n    }\n  }\n\n  /**\n   */\n  doFormLogin(username: string, password: string): Promise<any> {\n    return universalFetch({\n      url: this.getFormLoginUrl(),\n      method: HTTP_METHODS.POST,\n      headers: {\n        Accept: \"application/json\",\n        \"Content-Type\": \"application/x-www-form-urlencoded\",\n      },\n      data: this.getFormLoginData(username, password),\n    });\n  }\n\n  /**\n   */\n  doBasicAuthentication(username: string, password: string): Promise<any> {\n    Cache.addItem(\"basic\", btoa(`${username}:${password}`));\n    return this.requestLogin();\n  }\n\n  /**\n   */\n  doJaasAuthentication(username: string, password: string): Promise<any> {\n    return this.initLogin(true).then(() => {\n      if (this.isBasicAuthentication) {\n        Cache.removeItem(\"basic-ok\");\n        return this.doBasicAuthentication(username, password).then(() => {\n          Cache.addItem(\"basic-ok\", true);\n        });\n      }\n      return this.doFormLogin(username, password);\n    });\n  }\n\n  /**\n   */\n  static getLogoutUrl(): string {\n    const type = loginType();\n\n    if (!type || type === INTERNAL_LOGIN_TYPE.JAAS) {\n      return `${getBasePath()}/Logoff`;\n    }\n\n    return `${getBasePath()}${logoutPath()}`;\n  }\n\n  /**\n   * Browser redirect to the logout url. (no xmlhttp)\n   */\n  static redirectToLogout(): void {\n    Cache.clear();\n    window.location.assign(Authenticate.getLogoutUrl());\n  }\n\n  /**\n   * Logout the user with xmlhttp\n   */\n  logout(): Promise<any> {\n    return universalFetch({\n      url: Authenticate.getLogoutUrl(),\n    }).then((response) => {\n      // clear cache because of cached contributions\n      Cache.clear();\n      return response;\n    });\n  }\n}\n\nexport default Authenticate;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"Authenticate.js","names":["_Constants","require","_universalFetch","_interopRequireDefault","_Cache","_exceptions","_constants","Authenticate","constructor","_defineProperty2","default","_isBasic","authenticationType","type","loginType","INTERNAL_LOGIN_TYPE","JAAS","_includes","call","PAC4J_FORM","PAC4J_BASIC","PAC4J_INDIRECT","isBasicAuthentication","requestLogin","universalFetch","url","getBasePath","method","HTTP_METHODS","GET","headers","Accept","initLogin","_promise","resolve","catch","error","UnauthorizedException","login","username","password","doFormLogin","doBasicAuthentication","doJaasAuthentication","getFormLoginUrl","loginPath","getFormLoginData","encodedUsername","encodeURIComponent","encodedPassword","loginUsernameField","loginPasswordField","POST","data","Cache","addItem","btoa","then","removeItem","getLogoutUrl","logoutPath","redirectToLogout","postRedirectUrl","clear","redirectUrl","window","location","assign","logout","response","_default","exports"],"sources":["../../src/modularui/Authenticate.js"],"sourcesContent":["// @flow\nimport { HTTP_METHODS } from \"../constants/Constants\";\n\nimport universalFetch from \"../utils/fetch/universalFetch\";\nimport Cache from \"../utils/browser/Cache\";\n\nimport { UnauthorizedException } from \"../exceptions\";\nimport {\n  INTERNAL_LOGIN_TYPE,\n  loginType,\n  loginPath,\n  loginPasswordField,\n  loginUsernameField,\n  logoutPath,\n  getBasePath,\n} from \"../constants\";\n\n/**\n */\nclass Authenticate {\n  _isBasic: boolean;\n\n  /**\n   */\n  constructor() {\n    this._isBasic = false;\n  }\n\n  /**\n   */\n  get authenticationType(): $Keys<typeof INTERNAL_LOGIN_TYPE> {\n    const type = loginType();\n\n    if (!type || type === INTERNAL_LOGIN_TYPE.JAAS) {\n      return INTERNAL_LOGIN_TYPE.JAAS;\n    }\n\n    if (type.includes(\"FormClient\")) {\n      return INTERNAL_LOGIN_TYPE.PAC4J_FORM;\n    } else if (type.includes(\"IndirectBasicClient\")) {\n      return INTERNAL_LOGIN_TYPE.PAC4J_BASIC;\n    }\n    return INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT;\n  }\n\n  /**\n   */\n  get isBasicAuthentication(): boolean {\n    return (\n      this._isBasic ||\n      this.authenticationType === INTERNAL_LOGIN_TYPE.PAC4J_BASIC\n    );\n  }\n\n  /**\n   */\n  set isBasicAuthentication(isBasicAuthentication: boolean) {\n    this._isBasic = isBasicAuthentication;\n  }\n\n  /**\n   */\n  requestLogin(): Promise<any> {\n    return universalFetch({\n      url: `${getBasePath()}/login`,\n      method: HTTP_METHODS.GET,\n      headers: {\n        Accept: \"application/json\",\n        \"Content-Type\": \"application/x-www-form-urlencoded\",\n      },\n    });\n  }\n\n  /**\n   */\n  initLogin(initLogin: boolean): Promise<any> {\n    if (this.isBasicAuthentication || !initLogin) {\n      return Promise.resolve(true);\n    }\n\n    return this.requestLogin().catch((error) => {\n      // when an unauthorizedexception is received on a request to the login service,\n      // this indicates a basic authorization scenario\n      // in case of form based authentication other exceptions are thrown\n      if (error instanceof UnauthorizedException) {\n        this.isBasicAuthentication = true;\n      }\n\n      return Promise.resolve({});\n    });\n  }\n\n  /**\n   */\n  login(username: string, password: string): Promise<any> {\n    switch (this.authenticationType) {\n      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:\n        return this.doFormLogin(username, password);\n      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:\n        return this.doBasicAuthentication(username, password);\n      case INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT:\n        // pac4j should handle this\n        return Promise.resolve();\n      default:\n        return this.doJaasAuthentication(username, password);\n    }\n  }\n\n  /**\n   */\n  getFormLoginUrl(): string {\n    switch (this.authenticationType) {\n      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:\n        return `${getBasePath()}${loginPath(\"DirectBasicAuthClient\")}`;\n      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:\n        return `${getBasePath()}${loginPath(\"FormClient\")}`;\n      case INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT:\n        //pac4j should handle this\n        return \"\";\n      default:\n        return `${getBasePath()}/j_security_check`;\n    }\n  }\n\n  /**\n   */\n  getFormLoginData(username: string, password: string): string {\n    const encodedUsername = encodeURIComponent(username);\n    const encodedPassword = encodeURIComponent(password);\n\n    switch (this.authenticationType) {\n      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:\n      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:\n        return `${loginUsernameField()}=${encodedUsername}&${loginPasswordField()}=${encodedPassword}`;\n      case INTERNAL_LOGIN_TYPE.JAAS:\n        return `j_username=${encodedUsername}&j_password=${encodedPassword}`;\n      default:\n        return \"\";\n    }\n  }\n\n  /**\n   */\n  doFormLogin(username: string, password: string): Promise<any> {\n    return universalFetch({\n      url: this.getFormLoginUrl(),\n      method: HTTP_METHODS.POST,\n      headers: {\n        Accept: \"application/json\",\n        \"Content-Type\": \"application/x-www-form-urlencoded\",\n      },\n      data: this.getFormLoginData(username, password),\n    });\n  }\n\n  /**\n   */\n  doBasicAuthentication(username: string, password: string): Promise<any> {\n    Cache.addItem(\"basic\", btoa(`${username}:${password}`));\n    return this.requestLogin();\n  }\n\n  /**\n   */\n  doJaasAuthentication(username: string, password: string): Promise<any> {\n    return this.initLogin(true).then(() => {\n      if (this.isBasicAuthentication) {\n        Cache.removeItem(\"basic-ok\");\n        return this.doBasicAuthentication(username, password).then(() => {\n          Cache.addItem(\"basic-ok\", true);\n        });\n      }\n      return this.doFormLogin(username, password);\n    });\n  }\n\n  /**\n   */\n  getLogoutUrl(): string {\n    const type = loginType();\n\n    if (!type || type === INTERNAL_LOGIN_TYPE.JAAS) {\n      return `${getBasePath()}/Logoff`;\n    }\n\n    return `${getBasePath()}${logoutPath()}`;\n  }\n\n  /**\n   * Browser redirect to the logout url. (no xmlhttp)\n   */\n  redirectToLogout(postRedirectUrl?: string): void {\n    Cache.clear();\n\n    const redirectUrl = postRedirectUrl || getBasePath();\n\n    window.location.assign(this.getLogoutUrl() + \"?url=\" + redirectUrl);\n  }\n\n  /**\n   * Logout the user with xmlhttp\n   */\n  logout(): Promise<any> {\n    return universalFetch({\n      url: this.getLogoutUrl(),\n    }).then((response) => {\n      // clear cache because of cached contributions\n      Cache.clear();\n      return response;\n    });\n  }\n}\n\nexport default Authenticate;\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.63.7",
+  "version": "1.63.9",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "https://support.beinformed.com",

package/src/constants/Settings.js

@@ -217,7 +217,7 @@ export const getEnabledLocales = (): Array<string> =>
 /**
  * Login type
  */
-export const loginType = (): string =>
+export const loginType = (): string | Array<string> =>
   getSetting(LOGIN_TYPE, INTERNAL_LOGIN_TYPE.JAAS);
 
 /**

package/src/hooks/useAuthentication.js

@@ -9,7 +9,6 @@ import {
   DEFAULT_AUTHENTICATION_TYPE,
   getBasePathServer,
   INTERNAL_LOGIN_TYPE,
-  loginType,
   logoutPath,
 } from "../constants";
 import { IllegalStateException } from "../exceptions";
@@ -83,6 +82,8 @@ export const useLogout = (): LogoutHook => {
   const LOGOUT_PATH = logoutPath();
   const BASE_PATH = getBasePathServer();
 
+  const authenticate = new Authenticate();
+
   const isAuthenticated = application?.isLoggedIn ?? false;
   return {
     isAuthenticated,
@@ -90,9 +91,9 @@ export const useLogout = (): LogoutHook => {
       DEFAULT_AUTHENTICATION_TYPE,
     ],
     logout: () => {
-      const type = loginType();
+      const type = authenticate.authenticationType;
       if (type === INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {
-        Authenticate.redirectToLogout();
+        authenticate.redirectToLogout();
       } else if (Cache.getItem("isRedirectLogin")) {
         const origin = window.location.origin;
         const url = `${origin}${BASE_PATH}/logout?url=${origin}${BASE_PATH}${LOGOUT_PATH}`;
@@ -102,6 +103,6 @@ export const useLogout = (): LogoutHook => {
         return dispatch(logout());
       }
     },
-    logoutUrl: Authenticate.getLogoutUrl(),
+    logoutUrl: authenticate.getLogoutUrl(),
   };
 };

package/src/modularui/Authenticate.js

@@ -37,7 +37,7 @@ class Authenticate {
 
     if (type.includes("FormClient")) {
       return INTERNAL_LOGIN_TYPE.PAC4J_FORM;
-    } else if (type.includes("BasicClient")) {
+    } else if (type.includes("IndirectBasicClient")) {
       return INTERNAL_LOGIN_TYPE.PAC4J_BASIC;
     }
     return INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT;
@@ -132,8 +132,10 @@ class Authenticate {
       case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:
       case INTERNAL_LOGIN_TYPE.PAC4J_FORM:
         return `${loginUsernameField()}=${encodedUsername}&${loginPasswordField()}=${encodedPassword}`;
-      default:
+      case INTERNAL_LOGIN_TYPE.JAAS:
         return `j_username=${encodedUsername}&j_password=${encodedPassword}`;
+      default:
+        return "";
     }
   }
 
@@ -174,7 +176,7 @@ class Authenticate {
 
   /**
    */
-  static getLogoutUrl(): string {
+  getLogoutUrl(): string {
     const type = loginType();
 
     if (!type || type === INTERNAL_LOGIN_TYPE.JAAS) {
@@ -187,9 +189,12 @@ class Authenticate {
   /**
    * Browser redirect to the logout url. (no xmlhttp)
    */
-  static redirectToLogout(): void {
+  redirectToLogout(postRedirectUrl?: string): void {
     Cache.clear();
-    window.location.assign(Authenticate.getLogoutUrl());
+
+    const redirectUrl = postRedirectUrl || getBasePath();
+
+    window.location.assign(this.getLogoutUrl() + "?url=" + redirectUrl);
   }
 
   /**
@@ -197,7 +202,7 @@ class Authenticate {
    */
   logout(): Promise<any> {
     return universalFetch({
-      url: Authenticate.getLogoutUrl(),
+      url: this.getLogoutUrl(),
     }).then((response) => {
       // clear cache because of cached contributions
       Cache.clear();