@beinformed/ui 1.63.8 → 1.63.9

package/CHANGELOG.md

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

package/esm/modularui/Authenticate.js

@@ -170,9 +170,10 @@ class Authenticate {
   /**
    * Browser redirect to the logout url. (no xmlhttp)
    */
-  redirectToLogout() {
+  redirectToLogout(postRedirectUrl) {
     Cache.clear();
-    window.location.assign(this.getLogoutUrl());
+    const redirectUrl = postRedirectUrl || getBasePath();
+    window.location.assign(this.getLogoutUrl() + "?url=" + redirectUrl);
   }
 
   /**

package/esm/modularui/Authenticate.js.flow

@@ -189,9 +189,12 @@ class Authenticate {
   /**
    * Browser redirect to the logout url. (no xmlhttp)
    */
-  redirectToLogout(): void {
+  redirectToLogout(postRedirectUrl?: string): void {
     Cache.clear();
-    window.location.assign(this.getLogoutUrl());
+
+    const redirectUrl = postRedirectUrl || 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","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(\"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(): void {\n    Cache.clear();\n    window.location.assign(this.getLogoutUrl());\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","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":";;;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,eAAwB,EAAQ;IAC/CpD,KAAK,CAACqD,KAAK,CAAC,CAAC;IAEb,MAAMC,WAAW,GAAGF,eAAe,IAAI5C,WAAW,CAAC,CAAC;IAEpD+C,MAAM,CAACC,QAAQ,CAACC,MAAM,CAAC,IAAI,CAACP,YAAY,CAAC,CAAC,GAAG,OAAO,GAAGI,WAAW,CAAC;EACrE;;EAEA;AACF;AACA;EACEI,MAAMA,CAAA,EAAiB;IACrB,OAAO3D,cAAc,CAAC;MACpBwB,GAAG,EAAE,IAAI,CAAC2B,YAAY,CAAC;IACzB,CAAC,CAAC,CAACF,IAAI,CAAEW,QAAQ,IAAK;MACpB;MACA3D,KAAK,CAACqD,KAAK,CAAC,CAAC;MACb,OAAOM,QAAQ;IACjB,CAAC,CAAC;EACJ;AACF;AAEA,eAAelD,YAAY","ignoreList":[]}

package/lib/modularui/Authenticate.js

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

package/package.json

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

package/src/modularui/Authenticate.js

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