@beinformed/ui 1.63.9 → 1.63.11

package/CHANGELOG.md

@@ -2,6 +2,21 @@
 
 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.11](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.63.9...v1.63.11) (2025-11-27)
+
+
+### Bug Fixes
+
+* **list-detail:** handle given answers without attributes ([36e4ad1](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/36e4ad1932dc422ce7d03a9422a10c67e95e9a62))
+* **logout:** use absolute post logout redirect url ([4ddfee8](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/4ddfee88748ea97944c74b4d006638e71db89af1))
+
+## [1.63.10](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.63.9...v1.63.10) (2025-11-25)
+
+
+### Bug Fixes
+
+* **logout:** use absolute post logout redirect url ([4ddfee8](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/4ddfee88748ea97944c74b4d006638e71db89af1))
+
 ## [1.63.9](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.63.7...v1.63.9) (2025-11-24)
 
 

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, logoutPath } from "../constants";
+import { DEFAULT_AUTHENTICATION_TYPE, getBasePath, getBasePathServer, INTERNAL_LOGIN_TYPE } from "../constants";
 import { IllegalStateException } from "../exceptions";
 import { Authenticate } from "../modularui";
 /**
@@ -37,8 +37,7 @@ export const useLogin = () => {
 export const useLogout = () => {
   const dispatch = useDispatch();
   const application = useSelector(getApplication);
-  const LOGOUT_PATH = logoutPath();
-  const BASE_PATH = getBasePathServer();
+  const BASE_PATH = getBasePath();
   const authenticate = new Authenticate();
   const isAuthenticated = application?.isLoggedIn ?? false;
   return {
@@ -50,7 +49,7 @@ export const useLogout = () => {
         authenticate.redirectToLogout();
       } else if (Cache.getItem("isRedirectLogin")) {
         const origin = window.location.origin;
-        const url = `${origin}${BASE_PATH}/logout?url=${origin}${BASE_PATH}${LOGOUT_PATH}`;
+        const url = `${authenticate.getLogoutUrl()}?url=${origin}${BASE_PATH}`;
         Cache.setItem("isRedirectLogin", false);
         window.location.assign(url);
       } else {

package/esm/hooks/useAuthentication.js.flow

@@ -7,9 +7,9 @@ import { login, logout, resetAuthErrors } from "../redux/actions";
 import Cache from "../utils/browser/Cache";
 import {
   DEFAULT_AUTHENTICATION_TYPE,
+  getBasePath,
   getBasePathServer,
   INTERNAL_LOGIN_TYPE,
-  logoutPath,
 } from "../constants";
 import { IllegalStateException } from "../exceptions";
 import { Authenticate } from "../modularui";
@@ -79,8 +79,7 @@ export const useLogout = (): LogoutHook => {
   const dispatch = useDispatch();
   const application = useSelector(getApplication);
 
-  const LOGOUT_PATH = logoutPath();
-  const BASE_PATH = getBasePathServer();
+  const BASE_PATH = getBasePath();
 
   const authenticate = new Authenticate();
 
@@ -96,7 +95,7 @@ export const useLogout = (): LogoutHook => {
         authenticate.redirectToLogout();
       } else if (Cache.getItem("isRedirectLogin")) {
         const origin = window.location.origin;
-        const url = `${origin}${BASE_PATH}/logout?url=${origin}${BASE_PATH}${LOGOUT_PATH}`;
+        const url = `${authenticate.getLogoutUrl()}?url=${origin}${BASE_PATH}`;
         Cache.setItem("isRedirectLogin", false);
         window.location.assign(url);
       } else {

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","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":[]}
+{"version":3,"file":"useAuthentication.js","names":["useSelector","useDispatch","getApplication","login","logout","resetAuthErrors","Cache","DEFAULT_AUTHENTICATION_TYPE","getBasePath","getBasePathServer","INTERNAL_LOGIN_TYPE","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","BASE_PATH","authenticate","type","PAC4J_INDIRECT","redirectToLogout","origin","url","getLogoutUrl","logoutUrl"],"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  getBasePath,\n  getBasePathServer,\n  INTERNAL_LOGIN_TYPE,\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 BASE_PATH = getBasePath();\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 = `${authenticate.getLogoutUrl()}?url=${origin}${BASE_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/models/list/ListDetailModel.js

@@ -174,13 +174,13 @@ export default class ListDetailModel extends DetailModel {
       var _context2;
       const givenAnswersData = this.data.resultSection.givenAnswers;
       const givenAnswersContributions = this.contributions.resultSection.givenAnswers;
-      const filteredContributions = {
+      const filteredContributions = givenAnswersContributions.children ? {
         ...givenAnswersContributions,
         children: _filterInstanceProperty(_context2 = givenAnswersContributions.children).call(_context2, child => {
           const childKey = _Object$keys(child)[0];
           return childKey in givenAnswersData;
         })
-      };
+      } : givenAnswersContributions;
       const givenAnswers = createAttribute("givenAnswers", {
         key: "givenAnswers",
         dynamicschema: this.data.dynamicschema,

package/esm/models/list/ListDetailModel.js.flow

@@ -219,13 +219,15 @@ export default class ListDetailModel extends DetailModel {
       const givenAnswersContributions =
         this.contributions.resultSection.givenAnswers;
 
-      const filteredContributions = {
-        ...givenAnswersContributions,
-        children: givenAnswersContributions.children.filter((child) => {
-          const childKey = Object.keys(child)[0];
-          return childKey in givenAnswersData;
-        }),
-      };
+      const filteredContributions = givenAnswersContributions.children
+        ? {
+            ...givenAnswersContributions,
+            children: givenAnswersContributions.children.filter((child) => {
+              const childKey = Object.keys(child)[0];
+              return childKey in givenAnswersData;
+            }),
+          }
+        : givenAnswersContributions;
 
       const givenAnswers = createAttribute(
         "givenAnswers",

package/esm/models/list/ListDetailModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"ListDetailModel.js","names":["has","ActionCollection","DetailModel","ContentConfiguration","AttributeSetModel","createAttribute","CompositeAttributeModel","ListDetailModel","constructor","modularUIResponse","_defineProperty","_actionCollection","_contentConfiguration","contributions","content","setResultSection","setEventData","getInitialChildModelLinks","listitemPanels","listitem","links","getLinksByGroup","all","hasResults","results","push","givenAnswers","setChildModels","models","errors","_attributeCollection","type","modelName","isApplicableModel","data","resourcetype","toLowerCase","_endsWithInstanceProperty","call","_listitem","actionCollection","panelLinks","contentConfiguration","configuration","introtext","_content","text","message","Array","isArray","texts","setResults","setGivenAnswers","resultsData","resultSection","resultsContributions","_context","children","_filterInstanceProperty","child","childKey","_Object$keys","key","dynamicschema","isResult","indicateContentConfiguration","_results","_context2","givenAnswersData","givenAnswersContributions","filteredContributions","_givenAnswers","hasEventData","eventdata","addAttributes","eventData","eventContributions","_eventdata","modelOptions","forEach","eventDataContribution","eventDataData","i"],"sources":["../../../src/models/list/ListDetailModel.js"],"sourcesContent":["// @flow\nimport { has } from \"../../utils/helpers/objects\";\n\nimport ActionCollection from \"../actions/ActionCollection\";\nimport DetailModel from \"../detail/DetailModel\";\nimport ContentConfiguration from \"../contentconfiguration/ContentConfiguration\";\nimport AttributeSetModel from \"../attributes/AttributeSetModel\";\n\nimport createAttribute from \"../attributes/_createAttribute\";\nimport CompositeAttributeModel from \"../attributes/CompositeAttributeModel\";\n\nimport type { ModularUIModel } from \"../types\";\nimport type { ModularUIResponse } from \"../../modularui\";\nimport type LinkCollection from \"../links/LinkCollection\";\nimport type ListItemModel from \"../list/ListItemModel\";\nimport type LinkModel from \"../links/LinkModel\";\nimport type ErrorResponse from \"../error/ErrorResponse\";\n\n/**\n * Detail of a list item\n */\nexport default class ListDetailModel extends DetailModel {\n  _contentConfiguration: ContentConfiguration;\n  _listitem: ListItemModel;\n  _givenAnswers: ?CompositeAttributeModel;\n  _results: ?CompositeAttributeModel;\n  _eventdata: Array<AttributeSetModel>;\n\n  /**\n   * Construct\n   */\n  constructor(modularUIResponse: ModularUIResponse) {\n    super(modularUIResponse);\n\n    this._actionCollection = new ActionCollection();\n\n    this._contentConfiguration = new ContentConfiguration(\n      this.contributions ? this.contributions.content : {},\n    );\n\n    this.setResultSection();\n    this.setEventData();\n  }\n\n  /**\n   * Add links to expand on initialization of this model\n   */\n  getInitialChildModelLinks(): Array<LinkModel> {\n    const listitemPanels = this.listitem\n      ? this.listitem.links.getLinksByGroup(\"panel\").all\n      : [];\n\n    const links = [...super.getInitialChildModelLinks(), ...listitemPanels];\n\n    if (this.hasResults) {\n      if (this.results) {\n        links.push(...this.results.getInitialChildModelLinks());\n      }\n      if (this.givenAnswers) {\n        links.push(...this.givenAnswers.getInitialChildModelLinks());\n      }\n    }\n\n    return links;\n  }\n\n  /**\n   */\n  setChildModels(models: Array<ModularUIModel>, errors: Array<ErrorResponse>) {\n    this._attributeCollection.setChildModels(models, errors);\n\n    if (this.results) {\n      this.results.setChildModels(models, errors);\n    }\n\n    if (this.givenAnswers) {\n      this.givenAnswers.setChildModels(models, errors);\n    }\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"ListDetail\";\n  }\n\n  /**\n   */\n  static get modelName(): string {\n    return \"ListDetailModel\";\n  }\n\n  /**\n   */\n  static isApplicableModel(data: ModularUIResponse): boolean {\n    let resourcetype = data.contributions?.resourcetype ?? \"unknown\";\n    resourcetype = resourcetype.toLowerCase();\n\n    return (\n      resourcetype.endsWith(\"listdetail\") ||\n      resourcetype.endsWith(\"listpaneldetail\") ||\n      resourcetype.endsWith(\"datastorepaneldetail\")\n    );\n  }\n\n  /**\n   * Set listitem of this listdetail and transfer listitem actions to listdetail actions\n   */\n  set listitem(listitem: ListItemModel) {\n    this._listitem = listitem;\n\n    // transfer listitem actions to _actions\n    this._actionCollection = listitem.actionCollection;\n  }\n\n  /**\n   * Get listitem\n   */\n  get listitem(): ListItemModel {\n    return this._listitem;\n  }\n\n  /**\n   * Getting panel links\n   */\n  get panelLinks(): LinkCollection {\n    return this.listitem.links.getLinksByGroup(\"panel\");\n  }\n\n  /**\n   * Getting the contentConfiguration\n   */\n  get contentConfiguration(): ContentConfiguration {\n    return this._contentConfiguration;\n  }\n\n  /**\n   */\n  set contentConfiguration(configuration: ContentConfiguration) {\n    this._contentConfiguration = configuration;\n  }\n\n  /**\n   * Getting the introduction text configured on the case view\n   */\n  get introtext(): string {\n    if (this.data._content) {\n      return this.data._content.text.message;\n    }\n\n    if (this.contributions.text) {\n      return this.contributions.text.message ?? this.contributions.text;\n    }\n\n    if (Array.isArray(this.contributions.texts)) {\n      return this.contributions.texts[0].text;\n    }\n\n    return \"\";\n  }\n\n  /**\n   */\n  setResultSection() {\n    if (\n      has(this.contributions, \"resultSection\") &&\n      has(this.data, \"resultSection\")\n    ) {\n      this.setResults();\n      this.setGivenAnswers();\n    }\n  }\n\n  /**\n   */\n  setResults() {\n    if (\n      has(this.data, \"resultSection.results\") &&\n      has(this.contributions, \"resultSection.results\")\n    ) {\n      const resultsData = this.data.resultSection.results;\n      const resultsContributions = this.contributions.resultSection.results;\n      if (resultsContributions.type === \"composite\") {\n        resultsContributions.children = resultsContributions.children.filter(\n          (child) => {\n            const childKey = Object.keys(child)[0];\n            return childKey in resultsData;\n          },\n        );\n      }\n\n      const results = createAttribute(\n        \"results\",\n        {\n          key: \"results\",\n          dynamicschema: this.data.dynamicschema,\n          content: this.data.content?.results,\n          ...this.data.resultSection,\n        },\n        resultsContributions,\n      );\n\n      if (results instanceof CompositeAttributeModel) {\n        results.isResult = true;\n        results.indicateContentConfiguration(this.contentConfiguration);\n        this._results = results;\n      }\n    }\n  }\n\n  /**\n   */\n  setGivenAnswers() {\n    if (\n      has(this.data, \"resultSection.givenAnswers\") &&\n      has(this.contributions, \"resultSection.givenAnswers\")\n    ) {\n      const givenAnswersData = this.data.resultSection.givenAnswers;\n      const givenAnswersContributions =\n        this.contributions.resultSection.givenAnswers;\n\n      const filteredContributions = {\n        ...givenAnswersContributions,\n        children: givenAnswersContributions.children.filter((child) => {\n          const childKey = Object.keys(child)[0];\n          return childKey in givenAnswersData;\n        }),\n      };\n\n      const givenAnswers = createAttribute(\n        \"givenAnswers\",\n        {\n          key: \"givenAnswers\",\n          dynamicschema: this.data.dynamicschema,\n          content: this.data.content?.givenAnswers,\n          ...this.data.resultSection,\n        },\n        filteredContributions,\n      );\n\n      if (givenAnswers instanceof CompositeAttributeModel) {\n        givenAnswers.isResult = true;\n        this._givenAnswers = givenAnswers;\n      }\n    }\n  }\n\n  /**\n   */\n  get givenAnswers(): ?CompositeAttributeModel {\n    return this._givenAnswers;\n  }\n\n  /**\n   */\n  get hasResults(): boolean {\n    return has(this.contributions, \"resultSection\");\n  }\n\n  /**\n   */\n  get results(): ?CompositeAttributeModel {\n    return this._results;\n  }\n\n  /**\n   */\n  get hasEventData(): boolean {\n    return (\n      has(this.contributions, \"eventdata\") &&\n      has(this.data, \"eventdata\") &&\n      this.data.eventdata != null &&\n      this.contributions.eventdata != null\n    );\n  }\n\n  /**\n   */\n  addAttributes(key: string, eventData: Object, eventContributions: Object) {\n    this._eventdata.push(\n      new AttributeSetModel(\n        key,\n        eventData,\n        eventContributions,\n        this.modelOptions,\n      ),\n    );\n  }\n\n  /**\n   */\n  setEventData() {\n    if (this.hasEventData) {\n      this._eventdata = [];\n\n      this.contributions.eventdata.forEach((eventDataContribution) => {\n        const [key] = Object.keys(eventDataContribution);\n        if (key in this.data.eventdata) {\n          if (Array.isArray(this.data.eventdata[key])) {\n            this.data.eventdata[key].forEach((eventDataData, i) => {\n              this.addAttributes(\n                `${key}-${i + 1}`,\n                {\n                  ...eventDataData,\n                  dynamicschema: this.data.dynamicschema,\n                },\n                eventDataContribution[key],\n              );\n            });\n          } else {\n            this.addAttributes(\n              key,\n              {\n                ...this.data.eventdata[key],\n                dynamicschema: this.data.dynamicschema,\n              },\n              eventDataContribution[key],\n            );\n          }\n        }\n      });\n    }\n  }\n\n  /**\n   */\n  get eventdata(): Array<AttributeSetModel> {\n    return this._eventdata;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ListDetailModel.js","names":["has","ActionCollection","DetailModel","ContentConfiguration","AttributeSetModel","createAttribute","CompositeAttributeModel","ListDetailModel","constructor","modularUIResponse","_defineProperty","_actionCollection","_contentConfiguration","contributions","content","setResultSection","setEventData","getInitialChildModelLinks","listitemPanels","listitem","links","getLinksByGroup","all","hasResults","results","push","givenAnswers","setChildModels","models","errors","_attributeCollection","type","modelName","isApplicableModel","data","resourcetype","toLowerCase","_endsWithInstanceProperty","call","_listitem","actionCollection","panelLinks","contentConfiguration","configuration","introtext","_content","text","message","Array","isArray","texts","setResults","setGivenAnswers","resultsData","resultSection","resultsContributions","_context","children","_filterInstanceProperty","child","childKey","_Object$keys","key","dynamicschema","isResult","indicateContentConfiguration","_results","_context2","givenAnswersData","givenAnswersContributions","filteredContributions","_givenAnswers","hasEventData","eventdata","addAttributes","eventData","eventContributions","_eventdata","modelOptions","forEach","eventDataContribution","eventDataData","i"],"sources":["../../../src/models/list/ListDetailModel.js"],"sourcesContent":["// @flow\nimport { has } from \"../../utils/helpers/objects\";\n\nimport ActionCollection from \"../actions/ActionCollection\";\nimport DetailModel from \"../detail/DetailModel\";\nimport ContentConfiguration from \"../contentconfiguration/ContentConfiguration\";\nimport AttributeSetModel from \"../attributes/AttributeSetModel\";\n\nimport createAttribute from \"../attributes/_createAttribute\";\nimport CompositeAttributeModel from \"../attributes/CompositeAttributeModel\";\n\nimport type { ModularUIModel } from \"../types\";\nimport type { ModularUIResponse } from \"../../modularui\";\nimport type LinkCollection from \"../links/LinkCollection\";\nimport type ListItemModel from \"../list/ListItemModel\";\nimport type LinkModel from \"../links/LinkModel\";\nimport type ErrorResponse from \"../error/ErrorResponse\";\n\n/**\n * Detail of a list item\n */\nexport default class ListDetailModel extends DetailModel {\n  _contentConfiguration: ContentConfiguration;\n  _listitem: ListItemModel;\n  _givenAnswers: ?CompositeAttributeModel;\n  _results: ?CompositeAttributeModel;\n  _eventdata: Array<AttributeSetModel>;\n\n  /**\n   * Construct\n   */\n  constructor(modularUIResponse: ModularUIResponse) {\n    super(modularUIResponse);\n\n    this._actionCollection = new ActionCollection();\n\n    this._contentConfiguration = new ContentConfiguration(\n      this.contributions ? this.contributions.content : {},\n    );\n\n    this.setResultSection();\n    this.setEventData();\n  }\n\n  /**\n   * Add links to expand on initialization of this model\n   */\n  getInitialChildModelLinks(): Array<LinkModel> {\n    const listitemPanels = this.listitem\n      ? this.listitem.links.getLinksByGroup(\"panel\").all\n      : [];\n\n    const links = [...super.getInitialChildModelLinks(), ...listitemPanels];\n\n    if (this.hasResults) {\n      if (this.results) {\n        links.push(...this.results.getInitialChildModelLinks());\n      }\n      if (this.givenAnswers) {\n        links.push(...this.givenAnswers.getInitialChildModelLinks());\n      }\n    }\n\n    return links;\n  }\n\n  /**\n   */\n  setChildModels(models: Array<ModularUIModel>, errors: Array<ErrorResponse>) {\n    this._attributeCollection.setChildModels(models, errors);\n\n    if (this.results) {\n      this.results.setChildModels(models, errors);\n    }\n\n    if (this.givenAnswers) {\n      this.givenAnswers.setChildModels(models, errors);\n    }\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"ListDetail\";\n  }\n\n  /**\n   */\n  static get modelName(): string {\n    return \"ListDetailModel\";\n  }\n\n  /**\n   */\n  static isApplicableModel(data: ModularUIResponse): boolean {\n    let resourcetype = data.contributions?.resourcetype ?? \"unknown\";\n    resourcetype = resourcetype.toLowerCase();\n\n    return (\n      resourcetype.endsWith(\"listdetail\") ||\n      resourcetype.endsWith(\"listpaneldetail\") ||\n      resourcetype.endsWith(\"datastorepaneldetail\")\n    );\n  }\n\n  /**\n   * Set listitem of this listdetail and transfer listitem actions to listdetail actions\n   */\n  set listitem(listitem: ListItemModel) {\n    this._listitem = listitem;\n\n    // transfer listitem actions to _actions\n    this._actionCollection = listitem.actionCollection;\n  }\n\n  /**\n   * Get listitem\n   */\n  get listitem(): ListItemModel {\n    return this._listitem;\n  }\n\n  /**\n   * Getting panel links\n   */\n  get panelLinks(): LinkCollection {\n    return this.listitem.links.getLinksByGroup(\"panel\");\n  }\n\n  /**\n   * Getting the contentConfiguration\n   */\n  get contentConfiguration(): ContentConfiguration {\n    return this._contentConfiguration;\n  }\n\n  /**\n   */\n  set contentConfiguration(configuration: ContentConfiguration) {\n    this._contentConfiguration = configuration;\n  }\n\n  /**\n   * Getting the introduction text configured on the case view\n   */\n  get introtext(): string {\n    if (this.data._content) {\n      return this.data._content.text.message;\n    }\n\n    if (this.contributions.text) {\n      return this.contributions.text.message ?? this.contributions.text;\n    }\n\n    if (Array.isArray(this.contributions.texts)) {\n      return this.contributions.texts[0].text;\n    }\n\n    return \"\";\n  }\n\n  /**\n   */\n  setResultSection() {\n    if (\n      has(this.contributions, \"resultSection\") &&\n      has(this.data, \"resultSection\")\n    ) {\n      this.setResults();\n      this.setGivenAnswers();\n    }\n  }\n\n  /**\n   */\n  setResults() {\n    if (\n      has(this.data, \"resultSection.results\") &&\n      has(this.contributions, \"resultSection.results\")\n    ) {\n      const resultsData = this.data.resultSection.results;\n      const resultsContributions = this.contributions.resultSection.results;\n      if (resultsContributions.type === \"composite\") {\n        resultsContributions.children = resultsContributions.children.filter(\n          (child) => {\n            const childKey = Object.keys(child)[0];\n            return childKey in resultsData;\n          },\n        );\n      }\n\n      const results = createAttribute(\n        \"results\",\n        {\n          key: \"results\",\n          dynamicschema: this.data.dynamicschema,\n          content: this.data.content?.results,\n          ...this.data.resultSection,\n        },\n        resultsContributions,\n      );\n\n      if (results instanceof CompositeAttributeModel) {\n        results.isResult = true;\n        results.indicateContentConfiguration(this.contentConfiguration);\n        this._results = results;\n      }\n    }\n  }\n\n  /**\n   */\n  setGivenAnswers() {\n    if (\n      has(this.data, \"resultSection.givenAnswers\") &&\n      has(this.contributions, \"resultSection.givenAnswers\")\n    ) {\n      const givenAnswersData = this.data.resultSection.givenAnswers;\n      const givenAnswersContributions =\n        this.contributions.resultSection.givenAnswers;\n\n      const filteredContributions = givenAnswersContributions.children\n        ? {\n            ...givenAnswersContributions,\n            children: givenAnswersContributions.children.filter((child) => {\n              const childKey = Object.keys(child)[0];\n              return childKey in givenAnswersData;\n            }),\n          }\n        : givenAnswersContributions;\n\n      const givenAnswers = createAttribute(\n        \"givenAnswers\",\n        {\n          key: \"givenAnswers\",\n          dynamicschema: this.data.dynamicschema,\n          content: this.data.content?.givenAnswers,\n          ...this.data.resultSection,\n        },\n        filteredContributions,\n      );\n\n      if (givenAnswers instanceof CompositeAttributeModel) {\n        givenAnswers.isResult = true;\n        this._givenAnswers = givenAnswers;\n      }\n    }\n  }\n\n  /**\n   */\n  get givenAnswers(): ?CompositeAttributeModel {\n    return this._givenAnswers;\n  }\n\n  /**\n   */\n  get hasResults(): boolean {\n    return has(this.contributions, \"resultSection\");\n  }\n\n  /**\n   */\n  get results(): ?CompositeAttributeModel {\n    return this._results;\n  }\n\n  /**\n   */\n  get hasEventData(): boolean {\n    return (\n      has(this.contributions, \"eventdata\") &&\n      has(this.data, \"eventdata\") &&\n      this.data.eventdata != null &&\n      this.contributions.eventdata != null\n    );\n  }\n\n  /**\n   */\n  addAttributes(key: string, eventData: Object, eventContributions: Object) {\n    this._eventdata.push(\n      new AttributeSetModel(\n        key,\n        eventData,\n        eventContributions,\n        this.modelOptions,\n      ),\n    );\n  }\n\n  /**\n   */\n  setEventData() {\n    if (this.hasEventData) {\n      this._eventdata = [];\n\n      this.contributions.eventdata.forEach((eventDataContribution) => {\n        const [key] = Object.keys(eventDataContribution);\n        if (key in this.data.eventdata) {\n          if (Array.isArray(this.data.eventdata[key])) {\n            this.data.eventdata[key].forEach((eventDataData, i) => {\n              this.addAttributes(\n                `${key}-${i + 1}`,\n                {\n                  ...eventDataData,\n                  dynamicschema: this.data.dynamicschema,\n                },\n                eventDataContribution[key],\n              );\n            });\n          } else {\n            this.addAttributes(\n              key,\n              {\n                ...this.data.eventdata[key],\n                dynamicschema: this.data.dynamicschema,\n              },\n              eventDataContribution[key],\n            );\n          }\n        }\n      });\n    }\n  }\n\n  /**\n   */\n  get eventdata(): Array<AttributeSetModel> {\n    return this._eventdata;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/esm/modularui/Authenticate.js

@@ -1,6 +1,7 @@
 import _defineProperty from "@babel/runtime-corejs3/helpers/esm/defineProperty";
 import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
+import _startsWithInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/starts-with";
 import { HTTP_METHODS } from "../constants/Constants";
 import universalFetch from "../utils/fetch/universalFetch";
 import Cache from "../utils/browser/Cache";
@@ -170,9 +171,11 @@ class Authenticate {
   /**
    * Browser redirect to the logout url. (no xmlhttp)
    */
-  redirectToLogout(postRedirectUrl) {
+  redirectToLogout(postRedirectUrl = "") {
+    var _context;
     Cache.clear();
-    const redirectUrl = postRedirectUrl || getBasePath();
+    const origin = window.location.origin;
+    const redirectUrl = ((_context = postRedirectUrl) == null ? void 0 : Function.call.bind(_startsWithInstanceProperty(_context), _context))?.("http") ? postRedirectUrl : `${origin}${getBasePath()}`;
     window.location.assign(this.getLogoutUrl() + "?url=" + redirectUrl);
   }
 

package/esm/modularui/Authenticate.js.flow

@@ -189,10 +189,13 @@ class Authenticate {
   /**
    * Browser redirect to the logout url. (no xmlhttp)
    */
-  redirectToLogout(postRedirectUrl?: string): void {
+  redirectToLogout(postRedirectUrl: string = ""): void {
     Cache.clear();
 
-    const redirectUrl = postRedirectUrl || getBasePath();
+    const origin = window.location.origin;
+    const redirectUrl = postRedirectUrl?.startsWith("http")
+      ? postRedirectUrl
+      : `${origin}${getBasePath()}`;
 
     window.location.assign(this.getLogoutUrl() + "?url=" + redirectUrl);
   }

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","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":[]}
+{"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","_context","clear","origin","window","location","redirectUrl","Function","bind","_startsWithInstanceProperty","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 origin = window.location.origin;\n    const redirectUrl = postRedirectUrl?.startsWith(\"http\")\n      ? postRedirectUrl\n      : `${origin}${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":";;;;AACA,SAASA,YAAY,QAAQ,wBAAwB;AAErD,OAAOC,cAAc,MAAM,+BAA+B;AAC1D,OAAOC,KAAK,MAAM,wBAAwB;AAE1C,SAASC,qBAAqB,QAAQ,eAAe;AACrD,SACEC,mBAAmB,EACnBC,SAAS,EACTC,SAAS,EACTC,kBAAkB,EAClBC,kBAAkB,EAClBC,UAAU,EACVC,WAAW,QACN,cAAc;;AAErB;AACA;AACA,MAAMC,YAAY,CAAC;EAGjB;AACF;EACEC,WAAWA,CAAA,EAAG;IAAAC,eAAA;IACZ,IAAI,CAACC,QAAQ,GAAG,KAAK;EACvB;;EAEA;AACF;EACE,IAAIC,kBAAkBA,CAAA,EAAsC;IAC1D,MAAMC,IAAI,GAAGX,SAAS,CAAC,CAAC;IAExB,IAAI,CAACW,IAAI,IAAIA,IAAI,KAAKZ,mBAAmB,CAACa,IAAI,EAAE;MAC9C,OAAOb,mBAAmB,CAACa,IAAI;IACjC;IAEA,IAAIC,yBAAA,CAAAF,IAAI,EAAAG,IAAA,CAAJH,IAAI,EAAU,YAAY,CAAC,EAAE;MAC/B,OAAOZ,mBAAmB,CAACgB,UAAU;IACvC,CAAC,MAAM,IAAIF,yBAAA,CAAAF,IAAI,EAAAG,IAAA,CAAJH,IAAI,EAAU,qBAAqB,CAAC,EAAE;MAC/C,OAAOZ,mBAAmB,CAACiB,WAAW;IACxC;IACA,OAAOjB,mBAAmB,CAACkB,cAAc;EAC3C;;EAEA;AACF;EACE,IAAIC,qBAAqBA,CAAA,EAAY;IACnC,OACE,IAAI,CAACT,QAAQ,IACb,IAAI,CAACC,kBAAkB,KAAKX,mBAAmB,CAACiB,WAAW;EAE/D;;EAEA;AACF;EACE,IAAIE,qBAAqBA,CAACA,qBAA8B,EAAE;IACxD,IAAI,CAACT,QAAQ,GAAGS,qBAAqB;EACvC;;EAEA;AACF;EACEC,YAAYA,CAAA,EAAiB;IAC3B,OAAOvB,cAAc,CAAC;MACpBwB,GAAG,EAAE,GAAGf,WAAW,CAAC,CAAC,QAAQ;MAC7BgB,MAAM,EAAE1B,YAAY,CAAC2B,GAAG;MACxBC,OAAO,EAAE;QACPC,MAAM,EAAE,kBAAkB;QAC1B,cAAc,EAAE;MAClB;IACF,CAAC,CAAC;EACJ;;EAEA;AACF;EACEC,SAASA,CAACA,SAAkB,EAAgB;IAC1C,IAAI,IAAI,CAACP,qBAAqB,IAAI,CAACO,SAAS,EAAE;MAC5C,OAAOC,QAAA,CAAQC,OAAO,CAAC,IAAI,CAAC;IAC9B;IAEA,OAAO,IAAI,CAACR,YAAY,CAAC,CAAC,CAACS,KAAK,CAAEC,KAAK,IAAK;MAC1C;MACA;MACA;MACA,IAAIA,KAAK,YAAY/B,qBAAqB,EAAE;QAC1C,IAAI,CAACoB,qBAAqB,GAAG,IAAI;MACnC;MAEA,OAAOQ,QAAA,CAAQC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC5B,CAAC,CAAC;EACJ;;EAEA;AACF;EACEG,KAAKA,CAACC,QAAgB,EAAEC,QAAgB,EAAgB;IACtD,QAAQ,IAAI,CAACtB,kBAAkB;MAC7B,KAAKX,mBAAmB,CAACgB,UAAU;QACjC,OAAO,IAAI,CAACkB,WAAW,CAACF,QAAQ,EAAEC,QAAQ,CAAC;MAC7C,KAAKjC,mBAAmB,CAACiB,WAAW;QAClC,OAAO,IAAI,CAACkB,qBAAqB,CAACH,QAAQ,EAAEC,QAAQ,CAAC;MACvD,KAAKjC,mBAAmB,CAACkB,cAAc;QACrC;QACA,OAAOS,QAAA,CAAQC,OAAO,CAAC,CAAC;MAC1B;QACE,OAAO,IAAI,CAACQ,oBAAoB,CAACJ,QAAQ,EAAEC,QAAQ,CAAC;IACxD;EACF;;EAEA;AACF;EACEI,eAAeA,CAAA,EAAW;IACxB,QAAQ,IAAI,CAAC1B,kBAAkB;MAC7B,KAAKX,mBAAmB,CAACiB,WAAW;QAClC,OAAO,GAAGX,WAAW,CAAC,CAAC,GAAGJ,SAAS,CAAC,uBAAuB,CAAC,EAAE;MAChE,KAAKF,mBAAmB,CAACgB,UAAU;QACjC,OAAO,GAAGV,WAAW,CAAC,CAAC,GAAGJ,SAAS,CAAC,YAAY,CAAC,EAAE;MACrD,KAAKF,mBAAmB,CAACkB,cAAc;QACrC;QACA,OAAO,EAAE;MACX;QACE,OAAO,GAAGZ,WAAW,CAAC,CAAC,mBAAmB;IAC9C;EACF;;EAEA;AACF;EACEgC,gBAAgBA,CAACN,QAAgB,EAAEC,QAAgB,EAAU;IAC3D,MAAMM,eAAe,GAAGC,kBAAkB,CAACR,QAAQ,CAAC;IACpD,MAAMS,eAAe,GAAGD,kBAAkB,CAACP,QAAQ,CAAC;IAEpD,QAAQ,IAAI,CAACtB,kBAAkB;MAC7B,KAAKX,mBAAmB,CAACiB,WAAW;MACpC,KAAKjB,mBAAmB,CAACgB,UAAU;QACjC,OAAO,GAAGZ,kBAAkB,CAAC,CAAC,IAAImC,eAAe,IAAIpC,kBAAkB,CAAC,CAAC,IAAIsC,eAAe,EAAE;MAChG,KAAKzC,mBAAmB,CAACa,IAAI;QAC3B,OAAO,cAAc0B,eAAe,eAAeE,eAAe,EAAE;MACtE;QACE,OAAO,EAAE;IACb;EACF;;EAEA;AACF;EACEP,WAAWA,CAACF,QAAgB,EAAEC,QAAgB,EAAgB;IAC5D,OAAOpC,cAAc,CAAC;MACpBwB,GAAG,EAAE,IAAI,CAACgB,eAAe,CAAC,CAAC;MAC3Bf,MAAM,EAAE1B,YAAY,CAAC8C,IAAI;MACzBlB,OAAO,EAAE;QACPC,MAAM,EAAE,kBAAkB;QAC1B,cAAc,EAAE;MAClB,CAAC;MACDkB,IAAI,EAAE,IAAI,CAACL,gBAAgB,CAACN,QAAQ,EAAEC,QAAQ;IAChD,CAAC,CAAC;EACJ;;EAEA;AACF;EACEE,qBAAqBA,CAACH,QAAgB,EAAEC,QAAgB,EAAgB;IACtEnC,KAAK,CAAC8C,OAAO,CAAC,OAAO,EAAEC,IAAI,CAAC,GAAGb,QAAQ,IAAIC,QAAQ,EAAE,CAAC,CAAC;IACvD,OAAO,IAAI,CAACb,YAAY,CAAC,CAAC;EAC5B;;EAEA;AACF;EACEgB,oBAAoBA,CAACJ,QAAgB,EAAEC,QAAgB,EAAgB;IACrE,OAAO,IAAI,CAACP,SAAS,CAAC,IAAI,CAAC,CAACoB,IAAI,CAAC,MAAM;MACrC,IAAI,IAAI,CAAC3B,qBAAqB,EAAE;QAC9BrB,KAAK,CAACiD,UAAU,CAAC,UAAU,CAAC;QAC5B,OAAO,IAAI,CAACZ,qBAAqB,CAACH,QAAQ,EAAEC,QAAQ,CAAC,CAACa,IAAI,CAAC,MAAM;UAC/DhD,KAAK,CAAC8C,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC;QACjC,CAAC,CAAC;MACJ;MACA,OAAO,IAAI,CAACV,WAAW,CAACF,QAAQ,EAAEC,QAAQ,CAAC;IAC7C,CAAC,CAAC;EACJ;;EAEA;AACF;EACEe,YAAYA,CAAA,EAAW;IACrB,MAAMpC,IAAI,GAAGX,SAAS,CAAC,CAAC;IAExB,IAAI,CAACW,IAAI,IAAIA,IAAI,KAAKZ,mBAAmB,CAACa,IAAI,EAAE;MAC9C,OAAO,GAAGP,WAAW,CAAC,CAAC,SAAS;IAClC;IAEA,OAAO,GAAGA,WAAW,CAAC,CAAC,GAAGD,UAAU,CAAC,CAAC,EAAE;EAC1C;;EAEA;AACF;AACA;EACE4C,gBAAgBA,CAACC,eAAuB,GAAG,EAAE,EAAQ;IAAA,IAAAC,QAAA;IACnDrD,KAAK,CAACsD,KAAK,CAAC,CAAC;IAEb,MAAMC,MAAM,GAAGC,MAAM,CAACC,QAAQ,CAACF,MAAM;IACrC,MAAMG,WAAW,GAAG,EAAAL,QAAA,GAAAD,eAAe,qBAAAO,QAAA,CAAA1C,IAAA,CAAA2C,IAAA,CAAAC,2BAAA,CAAAR,QAAA,GAAAA,QAAA,KAAa,MAAM,CAAC,GACnDD,eAAe,GACf,GAAGG,MAAM,GAAG/C,WAAW,CAAC,CAAC,EAAE;IAE/BgD,MAAM,CAACC,QAAQ,CAACK,MAAM,CAAC,IAAI,CAACZ,YAAY,CAAC,CAAC,GAAG,OAAO,GAAGQ,WAAW,CAAC;EACrE;;EAEA;AACF;AACA;EACEK,MAAMA,CAAA,EAAiB;IACrB,OAAOhE,cAAc,CAAC;MACpBwB,GAAG,EAAE,IAAI,CAAC2B,YAAY,CAAC;IACzB,CAAC,CAAC,CAACF,IAAI,CAAEgB,QAAQ,IAAK;MACpB;MACAhE,KAAK,CAACsD,KAAK,CAAC,CAAC;MACb,OAAOU,QAAQ;IACjB,CAAC,CAAC;EACJ;AACF;AAEA,eAAevD,YAAY","ignoreList":[]}

package/lib/hooks/useAuthentication.js

@@ -45,8 +45,7 @@ exports.useLogin = useLogin;
 const useLogout = () => {
   const dispatch = (0, _reactRedux.useDispatch)();
   const application = (0, _reactRedux.useSelector)(_ModularUISelectors.getApplication);
-  const LOGOUT_PATH = (0, _constants.logoutPath)();
-  const BASE_PATH = (0, _constants.getBasePathServer)();
+  const BASE_PATH = (0, _constants.getBasePath)();
   const authenticate = new _modularui.Authenticate();
   const isAuthenticated = application?.isLoggedIn ?? false;
   return {
@@ -58,7 +57,7 @@ const useLogout = () => {
         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}`;
+        const url = `${authenticate.getLogoutUrl()}?url=${origin}${BASE_PATH}`;
         _Cache.default.setItem("isRedirectLogin", false);
         window.location.assign(url);
       } else {

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","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":[]}
+{"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","BASE_PATH","getBasePath","authenticate","Authenticate","logout","type","INTERNAL_LOGIN_TYPE","PAC4J_INDIRECT","redirectToLogout","origin","url","getLogoutUrl","logoutUrl"],"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  getBasePath,\n  getBasePathServer,\n  INTERNAL_LOGIN_TYPE,\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 BASE_PATH = getBasePath();\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 = `${authenticate.getLogoutUrl()}?url=${origin}${BASE_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/models/list/ListDetailModel.js

@@ -181,13 +181,13 @@ class ListDetailModel extends _DetailModel.default {
       var _context2;
       const givenAnswersData = this.data.resultSection.givenAnswers;
       const givenAnswersContributions = this.contributions.resultSection.givenAnswers;
-      const filteredContributions = {
+      const filteredContributions = givenAnswersContributions.children ? {
         ...givenAnswersContributions,
         children: (0, _filter.default)(_context2 = givenAnswersContributions.children).call(_context2, child => {
           const childKey = (0, _keys.default)(child)[0];
           return childKey in givenAnswersData;
         })
-      };
+      } : givenAnswersContributions;
       const givenAnswers = (0, _createAttribute.default)("givenAnswers", {
         key: "givenAnswers",
         dynamicschema: this.data.dynamicschema,

package/lib/models/list/ListDetailModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"ListDetailModel.js","names":["_objects","require","_ActionCollection","_interopRequireDefault","_DetailModel","_ContentConfiguration","_AttributeSetModel","_createAttribute","_CompositeAttributeModel","ListDetailModel","DetailModel","constructor","modularUIResponse","_defineProperty2","default","_actionCollection","ActionCollection","_contentConfiguration","ContentConfiguration","contributions","content","setResultSection","setEventData","getInitialChildModelLinks","listitemPanels","listitem","links","getLinksByGroup","all","hasResults","results","push","givenAnswers","setChildModels","models","errors","_attributeCollection","type","modelName","isApplicableModel","data","resourcetype","toLowerCase","_endsWith","call","_listitem","actionCollection","panelLinks","contentConfiguration","configuration","introtext","_content","text","message","Array","isArray","texts","has","setResults","setGivenAnswers","resultsData","resultSection","resultsContributions","_context","children","_filter","child","childKey","_keys","createAttribute","key","dynamicschema","CompositeAttributeModel","isResult","indicateContentConfiguration","_results","_context2","givenAnswersData","givenAnswersContributions","filteredContributions","_givenAnswers","hasEventData","eventdata","addAttributes","eventData","eventContributions","_eventdata","AttributeSetModel","modelOptions","forEach","eventDataContribution","eventDataData","i","exports"],"sources":["../../../src/models/list/ListDetailModel.js"],"sourcesContent":["// @flow\nimport { has } from \"../../utils/helpers/objects\";\n\nimport ActionCollection from \"../actions/ActionCollection\";\nimport DetailModel from \"../detail/DetailModel\";\nimport ContentConfiguration from \"../contentconfiguration/ContentConfiguration\";\nimport AttributeSetModel from \"../attributes/AttributeSetModel\";\n\nimport createAttribute from \"../attributes/_createAttribute\";\nimport CompositeAttributeModel from \"../attributes/CompositeAttributeModel\";\n\nimport type { ModularUIModel } from \"../types\";\nimport type { ModularUIResponse } from \"../../modularui\";\nimport type LinkCollection from \"../links/LinkCollection\";\nimport type ListItemModel from \"../list/ListItemModel\";\nimport type LinkModel from \"../links/LinkModel\";\nimport type ErrorResponse from \"../error/ErrorResponse\";\n\n/**\n * Detail of a list item\n */\nexport default class ListDetailModel extends DetailModel {\n  _contentConfiguration: ContentConfiguration;\n  _listitem: ListItemModel;\n  _givenAnswers: ?CompositeAttributeModel;\n  _results: ?CompositeAttributeModel;\n  _eventdata: Array<AttributeSetModel>;\n\n  /**\n   * Construct\n   */\n  constructor(modularUIResponse: ModularUIResponse) {\n    super(modularUIResponse);\n\n    this._actionCollection = new ActionCollection();\n\n    this._contentConfiguration = new ContentConfiguration(\n      this.contributions ? this.contributions.content : {},\n    );\n\n    this.setResultSection();\n    this.setEventData();\n  }\n\n  /**\n   * Add links to expand on initialization of this model\n   */\n  getInitialChildModelLinks(): Array<LinkModel> {\n    const listitemPanels = this.listitem\n      ? this.listitem.links.getLinksByGroup(\"panel\").all\n      : [];\n\n    const links = [...super.getInitialChildModelLinks(), ...listitemPanels];\n\n    if (this.hasResults) {\n      if (this.results) {\n        links.push(...this.results.getInitialChildModelLinks());\n      }\n      if (this.givenAnswers) {\n        links.push(...this.givenAnswers.getInitialChildModelLinks());\n      }\n    }\n\n    return links;\n  }\n\n  /**\n   */\n  setChildModels(models: Array<ModularUIModel>, errors: Array<ErrorResponse>) {\n    this._attributeCollection.setChildModels(models, errors);\n\n    if (this.results) {\n      this.results.setChildModels(models, errors);\n    }\n\n    if (this.givenAnswers) {\n      this.givenAnswers.setChildModels(models, errors);\n    }\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"ListDetail\";\n  }\n\n  /**\n   */\n  static get modelName(): string {\n    return \"ListDetailModel\";\n  }\n\n  /**\n   */\n  static isApplicableModel(data: ModularUIResponse): boolean {\n    let resourcetype = data.contributions?.resourcetype ?? \"unknown\";\n    resourcetype = resourcetype.toLowerCase();\n\n    return (\n      resourcetype.endsWith(\"listdetail\") ||\n      resourcetype.endsWith(\"listpaneldetail\") ||\n      resourcetype.endsWith(\"datastorepaneldetail\")\n    );\n  }\n\n  /**\n   * Set listitem of this listdetail and transfer listitem actions to listdetail actions\n   */\n  set listitem(listitem: ListItemModel) {\n    this._listitem = listitem;\n\n    // transfer listitem actions to _actions\n    this._actionCollection = listitem.actionCollection;\n  }\n\n  /**\n   * Get listitem\n   */\n  get listitem(): ListItemModel {\n    return this._listitem;\n  }\n\n  /**\n   * Getting panel links\n   */\n  get panelLinks(): LinkCollection {\n    return this.listitem.links.getLinksByGroup(\"panel\");\n  }\n\n  /**\n   * Getting the contentConfiguration\n   */\n  get contentConfiguration(): ContentConfiguration {\n    return this._contentConfiguration;\n  }\n\n  /**\n   */\n  set contentConfiguration(configuration: ContentConfiguration) {\n    this._contentConfiguration = configuration;\n  }\n\n  /**\n   * Getting the introduction text configured on the case view\n   */\n  get introtext(): string {\n    if (this.data._content) {\n      return this.data._content.text.message;\n    }\n\n    if (this.contributions.text) {\n      return this.contributions.text.message ?? this.contributions.text;\n    }\n\n    if (Array.isArray(this.contributions.texts)) {\n      return this.contributions.texts[0].text;\n    }\n\n    return \"\";\n  }\n\n  /**\n   */\n  setResultSection() {\n    if (\n      has(this.contributions, \"resultSection\") &&\n      has(this.data, \"resultSection\")\n    ) {\n      this.setResults();\n      this.setGivenAnswers();\n    }\n  }\n\n  /**\n   */\n  setResults() {\n    if (\n      has(this.data, \"resultSection.results\") &&\n      has(this.contributions, \"resultSection.results\")\n    ) {\n      const resultsData = this.data.resultSection.results;\n      const resultsContributions = this.contributions.resultSection.results;\n      if (resultsContributions.type === \"composite\") {\n        resultsContributions.children = resultsContributions.children.filter(\n          (child) => {\n            const childKey = Object.keys(child)[0];\n            return childKey in resultsData;\n          },\n        );\n      }\n\n      const results = createAttribute(\n        \"results\",\n        {\n          key: \"results\",\n          dynamicschema: this.data.dynamicschema,\n          content: this.data.content?.results,\n          ...this.data.resultSection,\n        },\n        resultsContributions,\n      );\n\n      if (results instanceof CompositeAttributeModel) {\n        results.isResult = true;\n        results.indicateContentConfiguration(this.contentConfiguration);\n        this._results = results;\n      }\n    }\n  }\n\n  /**\n   */\n  setGivenAnswers() {\n    if (\n      has(this.data, \"resultSection.givenAnswers\") &&\n      has(this.contributions, \"resultSection.givenAnswers\")\n    ) {\n      const givenAnswersData = this.data.resultSection.givenAnswers;\n      const givenAnswersContributions =\n        this.contributions.resultSection.givenAnswers;\n\n      const filteredContributions = {\n        ...givenAnswersContributions,\n        children: givenAnswersContributions.children.filter((child) => {\n          const childKey = Object.keys(child)[0];\n          return childKey in givenAnswersData;\n        }),\n      };\n\n      const givenAnswers = createAttribute(\n        \"givenAnswers\",\n        {\n          key: \"givenAnswers\",\n          dynamicschema: this.data.dynamicschema,\n          content: this.data.content?.givenAnswers,\n          ...this.data.resultSection,\n        },\n        filteredContributions,\n      );\n\n      if (givenAnswers instanceof CompositeAttributeModel) {\n        givenAnswers.isResult = true;\n        this._givenAnswers = givenAnswers;\n      }\n    }\n  }\n\n  /**\n   */\n  get givenAnswers(): ?CompositeAttributeModel {\n    return this._givenAnswers;\n  }\n\n  /**\n   */\n  get hasResults(): boolean {\n    return has(this.contributions, \"resultSection\");\n  }\n\n  /**\n   */\n  get results(): ?CompositeAttributeModel {\n    return this._results;\n  }\n\n  /**\n   */\n  get hasEventData(): boolean {\n    return (\n      has(this.contributions, \"eventdata\") &&\n      has(this.data, \"eventdata\") &&\n      this.data.eventdata != null &&\n      this.contributions.eventdata != null\n    );\n  }\n\n  /**\n   */\n  addAttributes(key: string, eventData: Object, eventContributions: Object) {\n    this._eventdata.push(\n      new AttributeSetModel(\n        key,\n        eventData,\n        eventContributions,\n        this.modelOptions,\n      ),\n    );\n  }\n\n  /**\n   */\n  setEventData() {\n    if (this.hasEventData) {\n      this._eventdata = [];\n\n      this.contributions.eventdata.forEach((eventDataContribution) => {\n        const [key] = Object.keys(eventDataContribution);\n        if (key in this.data.eventdata) {\n          if (Array.isArray(this.data.eventdata[key])) {\n            this.data.eventdata[key].forEach((eventDataData, i) => {\n              this.addAttributes(\n                `${key}-${i + 1}`,\n                {\n                  ...eventDataData,\n                  dynamicschema: this.data.dynamicschema,\n                },\n                eventDataContribution[key],\n              );\n            });\n          } else {\n            this.addAttributes(\n              key,\n              {\n                ...this.data.eventdata[key],\n                dynamicschema: this.data.dynamicschema,\n              },\n              eventDataContribution[key],\n            );\n          }\n        }\n      });\n    }\n  }\n\n  /**\n   */\n  get eventdata(): Array<AttributeSetModel> {\n    return this._eventdata;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ListDetailModel.js","names":["_objects","require","_ActionCollection","_interopRequireDefault","_DetailModel","_ContentConfiguration","_AttributeSetModel","_createAttribute","_CompositeAttributeModel","ListDetailModel","DetailModel","constructor","modularUIResponse","_defineProperty2","default","_actionCollection","ActionCollection","_contentConfiguration","ContentConfiguration","contributions","content","setResultSection","setEventData","getInitialChildModelLinks","listitemPanels","listitem","links","getLinksByGroup","all","hasResults","results","push","givenAnswers","setChildModels","models","errors","_attributeCollection","type","modelName","isApplicableModel","data","resourcetype","toLowerCase","_endsWith","call","_listitem","actionCollection","panelLinks","contentConfiguration","configuration","introtext","_content","text","message","Array","isArray","texts","has","setResults","setGivenAnswers","resultsData","resultSection","resultsContributions","_context","children","_filter","child","childKey","_keys","createAttribute","key","dynamicschema","CompositeAttributeModel","isResult","indicateContentConfiguration","_results","_context2","givenAnswersData","givenAnswersContributions","filteredContributions","_givenAnswers","hasEventData","eventdata","addAttributes","eventData","eventContributions","_eventdata","AttributeSetModel","modelOptions","forEach","eventDataContribution","eventDataData","i","exports"],"sources":["../../../src/models/list/ListDetailModel.js"],"sourcesContent":["// @flow\nimport { has } from \"../../utils/helpers/objects\";\n\nimport ActionCollection from \"../actions/ActionCollection\";\nimport DetailModel from \"../detail/DetailModel\";\nimport ContentConfiguration from \"../contentconfiguration/ContentConfiguration\";\nimport AttributeSetModel from \"../attributes/AttributeSetModel\";\n\nimport createAttribute from \"../attributes/_createAttribute\";\nimport CompositeAttributeModel from \"../attributes/CompositeAttributeModel\";\n\nimport type { ModularUIModel } from \"../types\";\nimport type { ModularUIResponse } from \"../../modularui\";\nimport type LinkCollection from \"../links/LinkCollection\";\nimport type ListItemModel from \"../list/ListItemModel\";\nimport type LinkModel from \"../links/LinkModel\";\nimport type ErrorResponse from \"../error/ErrorResponse\";\n\n/**\n * Detail of a list item\n */\nexport default class ListDetailModel extends DetailModel {\n  _contentConfiguration: ContentConfiguration;\n  _listitem: ListItemModel;\n  _givenAnswers: ?CompositeAttributeModel;\n  _results: ?CompositeAttributeModel;\n  _eventdata: Array<AttributeSetModel>;\n\n  /**\n   * Construct\n   */\n  constructor(modularUIResponse: ModularUIResponse) {\n    super(modularUIResponse);\n\n    this._actionCollection = new ActionCollection();\n\n    this._contentConfiguration = new ContentConfiguration(\n      this.contributions ? this.contributions.content : {},\n    );\n\n    this.setResultSection();\n    this.setEventData();\n  }\n\n  /**\n   * Add links to expand on initialization of this model\n   */\n  getInitialChildModelLinks(): Array<LinkModel> {\n    const listitemPanels = this.listitem\n      ? this.listitem.links.getLinksByGroup(\"panel\").all\n      : [];\n\n    const links = [...super.getInitialChildModelLinks(), ...listitemPanels];\n\n    if (this.hasResults) {\n      if (this.results) {\n        links.push(...this.results.getInitialChildModelLinks());\n      }\n      if (this.givenAnswers) {\n        links.push(...this.givenAnswers.getInitialChildModelLinks());\n      }\n    }\n\n    return links;\n  }\n\n  /**\n   */\n  setChildModels(models: Array<ModularUIModel>, errors: Array<ErrorResponse>) {\n    this._attributeCollection.setChildModels(models, errors);\n\n    if (this.results) {\n      this.results.setChildModels(models, errors);\n    }\n\n    if (this.givenAnswers) {\n      this.givenAnswers.setChildModels(models, errors);\n    }\n  }\n\n  /**\n   */\n  get type(): string {\n    return \"ListDetail\";\n  }\n\n  /**\n   */\n  static get modelName(): string {\n    return \"ListDetailModel\";\n  }\n\n  /**\n   */\n  static isApplicableModel(data: ModularUIResponse): boolean {\n    let resourcetype = data.contributions?.resourcetype ?? \"unknown\";\n    resourcetype = resourcetype.toLowerCase();\n\n    return (\n      resourcetype.endsWith(\"listdetail\") ||\n      resourcetype.endsWith(\"listpaneldetail\") ||\n      resourcetype.endsWith(\"datastorepaneldetail\")\n    );\n  }\n\n  /**\n   * Set listitem of this listdetail and transfer listitem actions to listdetail actions\n   */\n  set listitem(listitem: ListItemModel) {\n    this._listitem = listitem;\n\n    // transfer listitem actions to _actions\n    this._actionCollection = listitem.actionCollection;\n  }\n\n  /**\n   * Get listitem\n   */\n  get listitem(): ListItemModel {\n    return this._listitem;\n  }\n\n  /**\n   * Getting panel links\n   */\n  get panelLinks(): LinkCollection {\n    return this.listitem.links.getLinksByGroup(\"panel\");\n  }\n\n  /**\n   * Getting the contentConfiguration\n   */\n  get contentConfiguration(): ContentConfiguration {\n    return this._contentConfiguration;\n  }\n\n  /**\n   */\n  set contentConfiguration(configuration: ContentConfiguration) {\n    this._contentConfiguration = configuration;\n  }\n\n  /**\n   * Getting the introduction text configured on the case view\n   */\n  get introtext(): string {\n    if (this.data._content) {\n      return this.data._content.text.message;\n    }\n\n    if (this.contributions.text) {\n      return this.contributions.text.message ?? this.contributions.text;\n    }\n\n    if (Array.isArray(this.contributions.texts)) {\n      return this.contributions.texts[0].text;\n    }\n\n    return \"\";\n  }\n\n  /**\n   */\n  setResultSection() {\n    if (\n      has(this.contributions, \"resultSection\") &&\n      has(this.data, \"resultSection\")\n    ) {\n      this.setResults();\n      this.setGivenAnswers();\n    }\n  }\n\n  /**\n   */\n  setResults() {\n    if (\n      has(this.data, \"resultSection.results\") &&\n      has(this.contributions, \"resultSection.results\")\n    ) {\n      const resultsData = this.data.resultSection.results;\n      const resultsContributions = this.contributions.resultSection.results;\n      if (resultsContributions.type === \"composite\") {\n        resultsContributions.children = resultsContributions.children.filter(\n          (child) => {\n            const childKey = Object.keys(child)[0];\n            return childKey in resultsData;\n          },\n        );\n      }\n\n      const results = createAttribute(\n        \"results\",\n        {\n          key: \"results\",\n          dynamicschema: this.data.dynamicschema,\n          content: this.data.content?.results,\n          ...this.data.resultSection,\n        },\n        resultsContributions,\n      );\n\n      if (results instanceof CompositeAttributeModel) {\n        results.isResult = true;\n        results.indicateContentConfiguration(this.contentConfiguration);\n        this._results = results;\n      }\n    }\n  }\n\n  /**\n   */\n  setGivenAnswers() {\n    if (\n      has(this.data, \"resultSection.givenAnswers\") &&\n      has(this.contributions, \"resultSection.givenAnswers\")\n    ) {\n      const givenAnswersData = this.data.resultSection.givenAnswers;\n      const givenAnswersContributions =\n        this.contributions.resultSection.givenAnswers;\n\n      const filteredContributions = givenAnswersContributions.children\n        ? {\n            ...givenAnswersContributions,\n            children: givenAnswersContributions.children.filter((child) => {\n              const childKey = Object.keys(child)[0];\n              return childKey in givenAnswersData;\n            }),\n          }\n        : givenAnswersContributions;\n\n      const givenAnswers = createAttribute(\n        \"givenAnswers\",\n        {\n          key: \"givenAnswers\",\n          dynamicschema: this.data.dynamicschema,\n          content: this.data.content?.givenAnswers,\n          ...this.data.resultSection,\n        },\n        filteredContributions,\n      );\n\n      if (givenAnswers instanceof CompositeAttributeModel) {\n        givenAnswers.isResult = true;\n        this._givenAnswers = givenAnswers;\n      }\n    }\n  }\n\n  /**\n   */\n  get givenAnswers(): ?CompositeAttributeModel {\n    return this._givenAnswers;\n  }\n\n  /**\n   */\n  get hasResults(): boolean {\n    return has(this.contributions, \"resultSection\");\n  }\n\n  /**\n   */\n  get results(): ?CompositeAttributeModel {\n    return this._results;\n  }\n\n  /**\n   */\n  get hasEventData(): boolean {\n    return (\n      has(this.contributions, \"eventdata\") &&\n      has(this.data, \"eventdata\") &&\n      this.data.eventdata != null &&\n      this.contributions.eventdata != null\n    );\n  }\n\n  /**\n   */\n  addAttributes(key: string, eventData: Object, eventContributions: Object) {\n    this._eventdata.push(\n      new AttributeSetModel(\n        key,\n        eventData,\n        eventContributions,\n        this.modelOptions,\n      ),\n    );\n  }\n\n  /**\n   */\n  setEventData() {\n    if (this.hasEventData) {\n      this._eventdata = [];\n\n      this.contributions.eventdata.forEach((eventDataContribution) => {\n        const [key] = Object.keys(eventDataContribution);\n        if (key in this.data.eventdata) {\n          if (Array.isArray(this.data.eventdata[key])) {\n            this.data.eventdata[key].forEach((eventDataData, i) => {\n              this.addAttributes(\n                `${key}-${i + 1}`,\n                {\n                  ...eventDataData,\n                  dynamicschema: this.data.dynamicschema,\n                },\n                eventDataContribution[key],\n              );\n            });\n          } else {\n            this.addAttributes(\n              key,\n              {\n                ...this.data.eventdata[key],\n                dynamicschema: this.data.dynamicschema,\n              },\n              eventDataContribution[key],\n            );\n          }\n        }\n      });\n    }\n  }\n\n  /**\n   */\n  get eventdata(): Array<AttributeSetModel> {\n    return this._eventdata;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/modularui/Authenticate.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _includes = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/includes"));
 var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/promise"));
+var _startsWith = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/starts-with"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
 var _Constants = require("../constants/Constants");
 var _universalFetch = _interopRequireDefault(require("../utils/fetch/universalFetch"));
@@ -176,9 +177,11 @@ class Authenticate {
   /**
    * Browser redirect to the logout url. (no xmlhttp)
    */
-  redirectToLogout(postRedirectUrl) {
+  redirectToLogout(postRedirectUrl = "") {
+    var _context;
     _Cache.default.clear();
-    const redirectUrl = postRedirectUrl || (0, _constants.getBasePath)();
+    const origin = window.location.origin;
+    const redirectUrl = ((_context = postRedirectUrl) == null ? void 0 : Function.call.bind((0, _startsWith.default)(_context), _context))?.("http") ? postRedirectUrl : `${origin}${(0, _constants.getBasePath)()}`;
     window.location.assign(this.getLogoutUrl() + "?url=" + redirectUrl);
   }
 

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","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":[]}
+{"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","_context","clear","origin","window","location","redirectUrl","Function","bind","_startsWith","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 origin = window.location.origin;\n    const redirectUrl = postRedirectUrl?.startsWith(\"http\")\n      ? postRedirectUrl\n      : `${origin}${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.9",
+  "version": "1.63.11",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "https://support.beinformed.com",

package/src/hooks/useAuthentication.js

@@ -7,9 +7,9 @@ import { login, logout, resetAuthErrors } from "../redux/actions";
 import Cache from "../utils/browser/Cache";
 import {
   DEFAULT_AUTHENTICATION_TYPE,
+  getBasePath,
   getBasePathServer,
   INTERNAL_LOGIN_TYPE,
-  logoutPath,
 } from "../constants";
 import { IllegalStateException } from "../exceptions";
 import { Authenticate } from "../modularui";
@@ -79,8 +79,7 @@ export const useLogout = (): LogoutHook => {
   const dispatch = useDispatch();
   const application = useSelector(getApplication);
 
-  const LOGOUT_PATH = logoutPath();
-  const BASE_PATH = getBasePathServer();
+  const BASE_PATH = getBasePath();
 
   const authenticate = new Authenticate();
 
@@ -96,7 +95,7 @@ export const useLogout = (): LogoutHook => {
         authenticate.redirectToLogout();
       } else if (Cache.getItem("isRedirectLogin")) {
         const origin = window.location.origin;
-        const url = `${origin}${BASE_PATH}/logout?url=${origin}${BASE_PATH}${LOGOUT_PATH}`;
+        const url = `${authenticate.getLogoutUrl()}?url=${origin}${BASE_PATH}`;
         Cache.setItem("isRedirectLogin", false);
         window.location.assign(url);
       } else {

package/src/models/list/ListDetailModel.js

@@ -219,13 +219,15 @@ export default class ListDetailModel extends DetailModel {
       const givenAnswersContributions =
         this.contributions.resultSection.givenAnswers;
 
-      const filteredContributions = {
-        ...givenAnswersContributions,
-        children: givenAnswersContributions.children.filter((child) => {
-          const childKey = Object.keys(child)[0];
-          return childKey in givenAnswersData;
-        }),
-      };
+      const filteredContributions = givenAnswersContributions.children
+        ? {
+            ...givenAnswersContributions,
+            children: givenAnswersContributions.children.filter((child) => {
+              const childKey = Object.keys(child)[0];
+              return childKey in givenAnswersData;
+            }),
+          }
+        : givenAnswersContributions;
 
       const givenAnswers = createAttribute(
         "givenAnswers",

package/src/modularui/Authenticate.js

@@ -189,10 +189,13 @@ class Authenticate {
   /**
    * Browser redirect to the logout url. (no xmlhttp)
    */
-  redirectToLogout(postRedirectUrl?: string): void {
+  redirectToLogout(postRedirectUrl: string = ""): void {
     Cache.clear();
 
-    const redirectUrl = postRedirectUrl || getBasePath();
+    const origin = window.location.origin;
+    const redirectUrl = postRedirectUrl?.startsWith("http")
+      ? postRedirectUrl
+      : `${origin}${getBasePath()}`;
 
     window.location.assign(this.getLogoutUrl() + "?url=" + redirectUrl);
   }