@beinformed/ui 1.63.6 → 1.63.7

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 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.7](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.63.6...v1.63.7) (2025-11-07)
+
+
+### Bug Fixes
+
+* **authenticate:** add redirectToLogout method and enhance PAC4J_INDIRECT logout handling ([69f0121](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/69f0121f707a527a47d9632dc712dec2024000cd))
+
 ## [1.63.6](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.63.5...v1.63.6) (2025-11-07)
 
 

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, logoutPath } from "../constants";
+import { DEFAULT_AUTHENTICATION_TYPE, getBasePathServer, INTERNAL_LOGIN_TYPE, loginType, logoutPath } from "../constants";
 import { IllegalStateException } from "../exceptions";
 import { Authenticate } from "../modularui";
 /**
@@ -44,7 +44,10 @@ export const useLogout = () => {
     isAuthenticated,
     authenticationTypes: application?.authenticationTypes ?? [DEFAULT_AUTHENTICATION_TYPE],
     logout: () => {
-      if (Cache.getItem("isRedirectLogin")) {
+      const type = loginType();
+      if (type === INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {
+        Authenticate.redirectToLogout();
+      } else if (Cache.getItem("isRedirectLogin")) {
         const origin = window.location.origin;
         const url = `${origin}${BASE_PATH}/logout?url=${origin}${BASE_PATH}${LOGOUT_PATH}`;
         Cache.setItem("isRedirectLogin", false);

package/esm/hooks/useAuthentication.js.flow

@@ -8,6 +8,8 @@ import Cache from "../utils/browser/Cache";
 import {
   DEFAULT_AUTHENTICATION_TYPE,
   getBasePathServer,
+  INTERNAL_LOGIN_TYPE,
+  loginType,
   logoutPath,
 } from "../constants";
 import { IllegalStateException } from "../exceptions";
@@ -88,7 +90,10 @@ export const useLogout = (): LogoutHook => {
       DEFAULT_AUTHENTICATION_TYPE,
     ],
     logout: () => {
-      if (Cache.getItem("isRedirectLogin")) {
+      const type = loginType();
+      if (type === INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {
+        Authenticate.redirectToLogout();
+      } else if (Cache.getItem("isRedirectLogin")) {
         const origin = window.location.origin;
         const url = `${origin}${BASE_PATH}/logout?url=${origin}${BASE_PATH}${LOGOUT_PATH}`;
         Cache.setItem("isRedirectLogin", false);

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","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","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  logoutPath,\n} from \"../constants\";\nimport { IllegalStateException } from \"../exceptions\";\nimport { Authenticate } from \"../modularui\";\n\nimport type { ResetAuthErrorsAction } from \"../redux/types\";\nimport type { AuthenticationType } from \"../models/types\";\n\ntype LoginHook = {\n  isAuthenticated: boolean,\n  authenticationTypes: Array<AuthenticationType>,\n  errorMessage: ?string,\n  resetErrors: () => ResetAuthErrorsAction,\n  login: (username: string, password: string) => void,\n  redirectLogin: (authenticationType: AuthenticationType) => void,\n};\ntype LogoutHook = {\n  isAuthenticated: boolean,\n  authenticationTypes: Array<AuthenticationType>,\n  logout: () => void,\n  logoutUrl: string,\n};\n\n/**\n */\nexport const useLogin = (): LoginHook => {\n  Cache.setItem(\"isRedirectLogin\", false);\n\n  const dispatch = useDispatch();\n\n  const application = useSelector(getApplication);\n  const auth = useSelector((state) => state.auth);\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n\n  return {\n    isAuthenticated,\n    authenticationTypes: application?.authenticationTypes ?? [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ],\n    errorMessage: auth.error,\n    resetErrors: () => dispatch(resetAuthErrors()),\n    login: (username: string, password: string) =>\n      dispatch(login(username, password)),\n    redirectLogin: (authenticationType: AuthenticationType) => {\n      if (Cache.getItem(\"isRedirectLogin\")) {\n        // prevent endless loop in redirects when authentication type can't be redirected\n        throw new IllegalStateException(\n          `Could not redirect to '${\n            authenticationType.authentication\n          }' using url: '${authenticationType.redirectUri ?? \"\"}'`,\n        );\n      }\n\n      if (!isAuthenticated) {\n        Cache.setItem(\"isRedirectLogin\", true);\n        window.location.assign(\n          `${getBasePathServer()}${authenticationType.redirectUri ?? \"\"}`,\n        );\n      }\n    },\n  };\n};\n\n/**\n */\nexport const useLogout = (): LogoutHook => {\n  const dispatch = useDispatch();\n  const application = useSelector(getApplication);\n\n  const LOGOUT_PATH = logoutPath();\n  const BASE_PATH = getBasePathServer();\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n  return {\n    isAuthenticated,\n    authenticationTypes: application?.authenticationTypes ?? [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ],\n    logout: () => {\n      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":"AACA,SAASA,WAAW,EAAEC,WAAW,QAAQ,aAAa;AAEtD,SAASC,cAAc,QAAQ,wCAAwC;AACvE,SAASC,KAAK,EAAEC,MAAM,EAAEC,eAAe,QAAQ,kBAAkB;AAEjE,OAAOC,KAAK,MAAM,wBAAwB;AAC1C,SACEC,2BAA2B,EAC3BC,iBAAiB,EACjBC,UAAU,QACL,cAAc;AACrB,SAASC,qBAAqB,QAAQ,eAAe;AACrD,SAASC,YAAY,QAAQ,cAAc;AAoB3C;AACA;AACA,OAAO,MAAMC,QAAQ,GAAGA,CAAA,KAAiB;EACvCN,KAAK,CAACO,OAAO,CAAC,iBAAiB,EAAE,KAAK,CAAC;EAEvC,MAAMC,QAAQ,GAAGb,WAAW,CAAC,CAAC;EAE9B,MAAMc,WAAW,GAAGf,WAAW,CAACE,cAAc,CAAC;EAC/C,MAAMc,IAAI,GAAGhB,WAAW,CAAEiB,KAAK,IAAKA,KAAK,CAACD,IAAI,CAAC;EAE/C,MAAME,eAAe,GAAGH,WAAW,EAAEI,UAAU,IAAI,KAAK;EAExD,OAAO;IACLD,eAAe;IACfE,mBAAmB,EAAEL,WAAW,EAAEK,mBAAmB,IAAI,CACvDb,2BAA2B,CAC5B;IACDc,YAAY,EAAEL,IAAI,CAACM,KAAK;IACxBC,WAAW,EAAEA,CAAA,KAAMT,QAAQ,CAACT,eAAe,CAAC,CAAC,CAAC;IAC9CF,KAAK,EAAEA,CAACqB,QAAgB,EAAEC,QAAgB,KACxCX,QAAQ,CAACX,KAAK,CAACqB,QAAQ,EAAEC,QAAQ,CAAC,CAAC;IACrCC,aAAa,EAAGC,kBAAsC,IAAK;MACzD,IAAIrB,KAAK,CAACsB,OAAO,CAAC,iBAAiB,CAAC,EAAE;QACpC;QACA,MAAM,IAAIlB,qBAAqB,CAC7B,0BACEiB,kBAAkB,CAACE,cAAc,iBAClBF,kBAAkB,CAACG,WAAW,IAAI,EAAE,GACvD,CAAC;MACH;MAEA,IAAI,CAACZ,eAAe,EAAE;QACpBZ,KAAK,CAACO,OAAO,CAAC,iBAAiB,EAAE,IAAI,CAAC;QACtCkB,MAAM,CAACC,QAAQ,CAACC,MAAM,CACpB,GAAGzB,iBAAiB,CAAC,CAAC,GAAGmB,kBAAkB,CAACG,WAAW,IAAI,EAAE,EAC/D,CAAC;MACH;IACF;EACF,CAAC;AACH,CAAC;;AAED;AACA;AACA,OAAO,MAAMI,SAAS,GAAGA,CAAA,KAAkB;EACzC,MAAMpB,QAAQ,GAAGb,WAAW,CAAC,CAAC;EAC9B,MAAMc,WAAW,GAAGf,WAAW,CAACE,cAAc,CAAC;EAE/C,MAAMiC,WAAW,GAAG1B,UAAU,CAAC,CAAC;EAChC,MAAM2B,SAAS,GAAG5B,iBAAiB,CAAC,CAAC;EAErC,MAAMU,eAAe,GAAGH,WAAW,EAAEI,UAAU,IAAI,KAAK;EACxD,OAAO;IACLD,eAAe;IACfE,mBAAmB,EAAEL,WAAW,EAAEK,mBAAmB,IAAI,CACvDb,2BAA2B,CAC5B;IACDH,MAAM,EAAEA,CAAA,KAAM;MACZ,IAAIE,KAAK,CAACsB,OAAO,CAAC,iBAAiB,CAAC,EAAE;QACpC,MAAMS,MAAM,GAAGN,MAAM,CAACC,QAAQ,CAACK,MAAM;QACrC,MAAMC,GAAG,GAAG,GAAGD,MAAM,GAAGD,SAAS,eAAeC,MAAM,GAAGD,SAAS,GAAGD,WAAW,EAAE;QAClF7B,KAAK,CAACO,OAAO,CAAC,iBAAiB,EAAE,KAAK,CAAC;QACvCkB,MAAM,CAACC,QAAQ,CAACC,MAAM,CAACK,GAAG,CAAC;MAC7B,CAAC,MAAM;QACL,OAAOxB,QAAQ,CAACV,MAAM,CAAC,CAAC,CAAC;MAC3B;IACF,CAAC;IACDmC,SAAS,EAAE5B,YAAY,CAAC6B,YAAY,CAAC;EACvC,CAAC;AACH,CAAC","ignoreList":[]}
+{"version":3,"file":"useAuthentication.js","names":["useSelector","useDispatch","getApplication","login","logout","resetAuthErrors","Cache","DEFAULT_AUTHENTICATION_TYPE","getBasePathServer","INTERNAL_LOGIN_TYPE","loginType","logoutPath","IllegalStateException","Authenticate","useLogin","setItem","dispatch","application","auth","state","isAuthenticated","isLoggedIn","authenticationTypes","errorMessage","error","resetErrors","username","password","redirectLogin","authenticationType","getItem","authentication","redirectUri","window","location","assign","useLogout","LOGOUT_PATH","BASE_PATH","type","PAC4J_INDIRECT","redirectToLogout","origin","url","logoutUrl","getLogoutUrl"],"sources":["../../src/hooks/useAuthentication.js"],"sourcesContent":["// @flow\nimport { useSelector, useDispatch } from \"react-redux\";\n\nimport { getApplication } from \"../redux/_modularui/ModularUISelectors\";\nimport { login, logout, resetAuthErrors } from \"../redux/actions\";\n\nimport Cache from \"../utils/browser/Cache\";\nimport {\n  DEFAULT_AUTHENTICATION_TYPE,\n  getBasePathServer,\n  INTERNAL_LOGIN_TYPE,\n  loginType,\n  logoutPath,\n} from \"../constants\";\nimport { IllegalStateException } from \"../exceptions\";\nimport { Authenticate } from \"../modularui\";\n\nimport type { ResetAuthErrorsAction } from \"../redux/types\";\nimport type { AuthenticationType } from \"../models/types\";\n\ntype LoginHook = {\n  isAuthenticated: boolean,\n  authenticationTypes: Array<AuthenticationType>,\n  errorMessage: ?string,\n  resetErrors: () => ResetAuthErrorsAction,\n  login: (username: string, password: string) => void,\n  redirectLogin: (authenticationType: AuthenticationType) => void,\n};\ntype LogoutHook = {\n  isAuthenticated: boolean,\n  authenticationTypes: Array<AuthenticationType>,\n  logout: () => void,\n  logoutUrl: string,\n};\n\n/**\n */\nexport const useLogin = (): LoginHook => {\n  Cache.setItem(\"isRedirectLogin\", false);\n\n  const dispatch = useDispatch();\n\n  const application = useSelector(getApplication);\n  const auth = useSelector((state) => state.auth);\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n\n  return {\n    isAuthenticated,\n    authenticationTypes: application?.authenticationTypes ?? [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ],\n    errorMessage: auth.error,\n    resetErrors: () => dispatch(resetAuthErrors()),\n    login: (username: string, password: string) =>\n      dispatch(login(username, password)),\n    redirectLogin: (authenticationType: AuthenticationType) => {\n      if (Cache.getItem(\"isRedirectLogin\")) {\n        // prevent endless loop in redirects when authentication type can't be redirected\n        throw new IllegalStateException(\n          `Could not redirect to '${\n            authenticationType.authentication\n          }' using url: '${authenticationType.redirectUri ?? \"\"}'`,\n        );\n      }\n\n      if (!isAuthenticated) {\n        Cache.setItem(\"isRedirectLogin\", true);\n        window.location.assign(\n          `${getBasePathServer()}${authenticationType.redirectUri ?? \"\"}`,\n        );\n      }\n    },\n  };\n};\n\n/**\n */\nexport const useLogout = (): LogoutHook => {\n  const dispatch = useDispatch();\n  const application = useSelector(getApplication);\n\n  const LOGOUT_PATH = logoutPath();\n  const BASE_PATH = getBasePathServer();\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n  return {\n    isAuthenticated,\n    authenticationTypes: application?.authenticationTypes ?? [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ],\n    logout: () => {\n      const type = loginType();\n      if (type === INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {\n        Authenticate.redirectToLogout();\n      } else if (Cache.getItem(\"isRedirectLogin\")) {\n        const origin = window.location.origin;\n        const url = `${origin}${BASE_PATH}/logout?url=${origin}${BASE_PATH}${LOGOUT_PATH}`;\n        Cache.setItem(\"isRedirectLogin\", false);\n        window.location.assign(url);\n      } else {\n        return dispatch(logout());\n      }\n    },\n    logoutUrl: Authenticate.getLogoutUrl(),\n  };\n};\n"],"mappings":"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","ignoreList":[]}

package/esm/modularui/Authenticate.js

@@ -166,6 +166,15 @@ class Authenticate {
   }
 
   /**
+   * Browser redirect to the logout url. (no xmlhttp)
+   */
+  static redirectToLogout() {
+    Cache.clear();
+    window.location.assign(Authenticate.getLogoutUrl());
+  }
+
+  /**
+   * Logout the user with xmlhttp
    */
   logout() {
     return universalFetch({

package/esm/modularui/Authenticate.js.flow

@@ -185,6 +185,15 @@ class Authenticate {
   }
 
   /**
+   * Browser redirect to the logout url. (no xmlhttp)
+   */
+  static redirectToLogout(): void {
+    Cache.clear();
+    window.location.assign(Authenticate.getLogoutUrl());
+  }
+
+  /**
+   * Logout the user with xmlhttp
    */
   logout(): Promise<any> {
     return universalFetch({

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

package/lib/hooks/useAuthentication.js

@@ -52,7 +52,10 @@ const useLogout = () => {
     isAuthenticated,
     authenticationTypes: application?.authenticationTypes ?? [_constants.DEFAULT_AUTHENTICATION_TYPE],
     logout: () => {
-      if (_Cache.default.getItem("isRedirectLogin")) {
+      const type = (0, _constants.loginType)();
+      if (type === _constants.INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {
+        _modularui.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}`;
         _Cache.default.setItem("isRedirectLogin", false);

package/lib/hooks/useAuthentication.js.map

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

package/lib/modularui/Authenticate.js

@@ -172,6 +172,15 @@ class Authenticate {
   }
 
   /**
+   * Browser redirect to the logout url. (no xmlhttp)
+   */
+  static redirectToLogout() {
+    _Cache.default.clear();
+    window.location.assign(Authenticate.getLogoutUrl());
+  }
+
+  /**
+   * Logout the user with xmlhttp
    */
   logout() {
     return (0, _universalFetch.default)({

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

package/package.json

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

package/src/hooks/useAuthentication.js

@@ -8,6 +8,8 @@ import Cache from "../utils/browser/Cache";
 import {
   DEFAULT_AUTHENTICATION_TYPE,
   getBasePathServer,
+  INTERNAL_LOGIN_TYPE,
+  loginType,
   logoutPath,
 } from "../constants";
 import { IllegalStateException } from "../exceptions";
@@ -88,7 +90,10 @@ export const useLogout = (): LogoutHook => {
       DEFAULT_AUTHENTICATION_TYPE,
     ],
     logout: () => {
-      if (Cache.getItem("isRedirectLogin")) {
+      const type = loginType();
+      if (type === INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {
+        Authenticate.redirectToLogout();
+      } else if (Cache.getItem("isRedirectLogin")) {
         const origin = window.location.origin;
         const url = `${origin}${BASE_PATH}/logout?url=${origin}${BASE_PATH}${LOGOUT_PATH}`;
         Cache.setItem("isRedirectLogin", false);

package/src/modularui/Authenticate.js

@@ -185,6 +185,15 @@ class Authenticate {
   }
 
   /**
+   * Browser redirect to the logout url. (no xmlhttp)
+   */
+  static redirectToLogout(): void {
+    Cache.clear();
+    window.location.assign(Authenticate.getLogoutUrl());
+  }
+
+  /**
+   * Logout the user with xmlhttp
    */
   logout(): Promise<any> {
     return universalFetch({