@beinformed/ui 1.63.12 → 1.63.14

package/CHANGELOG.md

@@ -2,6 +2,20 @@
 
 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.14](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.63.13...v1.63.14) (2025-12-15)
+
+
+### Bug Fixes
+
+* **authentication:** handle errors during sign-in process ([b4e8c67](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/b4e8c6710b5e2e6e10bb55d7836dba9560fb6e6e))
+
+## [1.63.13](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.63.12...v1.63.13) (2025-12-09)
+
+
+### Bug Fixes
+
+* **authentication:** cache `primaryAuthenticationType` for use in session ([158e7e8](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/commit/158e7e8b810ad257653ae23489cfded365e6784c))
+
 ## [1.63.12](https://git.beinformed.com/public/nl.beinformed.bi.layout.lib.ui/compare/v1.63.11...v1.63.12) (2025-12-08)
 
 

package/esm/hooks/__tests__/useAuthentication.spec.js.flow

@@ -115,7 +115,12 @@ describe("authentication hooks", () => {
       return res.status(200).body({ data: "ok" });
     });
 
-    const store = mockStore({ auth: {}, i18n: { locale: "en" } });
+    const store = mockStore({
+      auth: {},
+      modularui: {},
+      router: { location: {} },
+      i18n: { locale: "en" },
+    });
 
     /**
      */
@@ -135,6 +140,14 @@ describe("authentication hooks", () => {
 
     expect(store.getActions()).toStrictEqual([
       { type: "START_PROGRESS" },
+      expect.objectContaining({
+        type: "MODULARUI/FETCH",
+        payload: expect.objectContaining({
+          key: "application(/)(en)",
+        }),
+      }),
+      { type: "START_PROGRESS" },
+      { type: "FINISH_PROGRESS" },
       { type: "MODULARUI/RESET" },
       { type: "START_PROGRESS" },
       expect.objectContaining({

package/esm/hooks/useAuthentication.js

@@ -1,8 +1,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, getBasePath, getBasePathServer, INTERNAL_LOGIN_TYPE } from "../constants";
+import { getBasePath, getBasePathServer, INTERNAL_LOGIN_TYPE } from "../constants";
 import { IllegalStateException } from "../exceptions";
 import { Authenticate } from "../modularui";
 import { useApplication } from "./useModularUIModel";
@@ -14,9 +13,11 @@ export const useLogin = () => {
   const application = useApplication();
   const auth = useSelector(state => state.auth);
   const isAuthenticated = application?.isLoggedIn ?? false;
+  const primaryAuthenticationType = Cache.getItem("primaryAuthenticationType");
   return {
     isAuthenticated,
-    authenticationTypes: application?.authenticationTypes ?? [DEFAULT_AUTHENTICATION_TYPE],
+    primaryAuthenticationType: primaryAuthenticationType ?? application?.authenticationTypes[0],
+    authenticationTypes: application?.authenticationTypes ?? [],
     errorMessage: auth.error,
     resetErrors: () => dispatch(resetAuthErrors()),
     login: (username, password) => dispatch(login(username, password)),
@@ -37,13 +38,15 @@ export const useLogin = () => {
  */
 export const useLogout = () => {
   const dispatch = useDispatch();
-  const application = useSelector(getApplication);
+  const application = useApplication();
   const BASE_PATH = getBasePath();
   const authenticate = new Authenticate();
+  const primaryAuthenticationType = Cache.getItem("primaryAuthenticationType");
   const isAuthenticated = application?.isLoggedIn ?? false;
   return {
     isAuthenticated,
-    authenticationTypes: application?.authenticationTypes ?? [DEFAULT_AUTHENTICATION_TYPE],
+    primaryAuthenticationType: primaryAuthenticationType ?? application?.authenticationTypes[0],
+    authenticationTypes: application?.authenticationTypes ?? [],
     logout: () => {
       const type = authenticate.authenticationType;
       if (type === INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {

package/esm/hooks/useAuthentication.js.flow

@@ -1,12 +1,10 @@
 // @flow
 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,
   getBasePath,
   getBasePathServer,
   INTERNAL_LOGIN_TYPE,
@@ -20,6 +18,7 @@ import type { AuthenticationType } from "../models/types";
 
 type LoginHook = {
   isAuthenticated: boolean,
+  primaryAuthenticationType: AuthenticationType,
   authenticationTypes: Array<AuthenticationType>,
   errorMessage: ?string,
   resetErrors: () => ResetAuthErrorsAction,
@@ -28,6 +27,7 @@ type LoginHook = {
 };
 type LogoutHook = {
   isAuthenticated: boolean,
+  primaryAuthenticationType: AuthenticationType,
   authenticationTypes: Array<AuthenticationType>,
   logout: () => void,
   logoutUrl: string,
@@ -45,11 +45,13 @@ export const useLogin = (): LoginHook => {
 
   const isAuthenticated = application?.isLoggedIn ?? false;
 
+  const primaryAuthenticationType = Cache.getItem("primaryAuthenticationType");
+
   return {
     isAuthenticated,
-    authenticationTypes: application?.authenticationTypes ?? [
-      DEFAULT_AUTHENTICATION_TYPE,
-    ],
+    primaryAuthenticationType:
+      primaryAuthenticationType ?? application?.authenticationTypes[0],
+    authenticationTypes: application?.authenticationTypes ?? [],
     errorMessage: auth.error,
     resetErrors: () => dispatch(resetAuthErrors()),
     login: (username: string, password: string) =>
@@ -78,18 +80,21 @@ export const useLogin = (): LoginHook => {
  */
 export const useLogout = (): LogoutHook => {
   const dispatch = useDispatch();
-  const application = useSelector(getApplication);
+
+  const application = useApplication();
 
   const BASE_PATH = getBasePath();
 
   const authenticate = new Authenticate();
 
+  const primaryAuthenticationType = Cache.getItem("primaryAuthenticationType");
+
   const isAuthenticated = application?.isLoggedIn ?? false;
   return {
     isAuthenticated,
-    authenticationTypes: application?.authenticationTypes ?? [
-      DEFAULT_AUTHENTICATION_TYPE,
-    ],
+    primaryAuthenticationType:
+      primaryAuthenticationType ?? application?.authenticationTypes[0],
+    authenticationTypes: application?.authenticationTypes ?? [],
     logout: () => {
       const type = authenticate.authenticationType;
       if (type === INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {

package/esm/hooks/useAuthentication.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAuthentication.js","names":["useSelector","useDispatch","getApplication","login","logout","resetAuthErrors","Cache","DEFAULT_AUTHENTICATION_TYPE","getBasePath","getBasePathServer","INTERNAL_LOGIN_TYPE","IllegalStateException","Authenticate","useApplication","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\";\nimport { useApplication } from \"./useModularUIModel\";\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 = useApplication();\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":[]}
+{"version":3,"file":"useAuthentication.js","names":["useSelector","useDispatch","login","logout","resetAuthErrors","Cache","getBasePath","getBasePathServer","INTERNAL_LOGIN_TYPE","IllegalStateException","Authenticate","useApplication","useLogin","setItem","dispatch","application","auth","state","isAuthenticated","isLoggedIn","primaryAuthenticationType","getItem","authenticationTypes","errorMessage","error","resetErrors","username","password","redirectLogin","authenticationType","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 { login, logout, resetAuthErrors } from \"../redux/actions\";\n\nimport Cache from \"../utils/browser/Cache\";\nimport {\n  getBasePath,\n  getBasePathServer,\n  INTERNAL_LOGIN_TYPE,\n} from \"../constants\";\nimport { IllegalStateException } from \"../exceptions\";\nimport { Authenticate } from \"../modularui\";\nimport { useApplication } from \"./useModularUIModel\";\n\nimport type { ResetAuthErrorsAction } from \"../redux/types\";\nimport type { AuthenticationType } from \"../models/types\";\n\ntype LoginHook = {\n  isAuthenticated: boolean,\n  primaryAuthenticationType: AuthenticationType,\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  primaryAuthenticationType: AuthenticationType,\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 = useApplication();\n  const auth = useSelector((state) => state.auth);\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n\n  const primaryAuthenticationType = Cache.getItem(\"primaryAuthenticationType\");\n\n  return {\n    isAuthenticated,\n    primaryAuthenticationType:\n      primaryAuthenticationType ?? application?.authenticationTypes[0],\n    authenticationTypes: application?.authenticationTypes ?? [],\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\n  const application = useApplication();\n\n  const BASE_PATH = getBasePath();\n\n  const authenticate = new Authenticate();\n\n  const primaryAuthenticationType = Cache.getItem(\"primaryAuthenticationType\");\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n  return {\n    isAuthenticated,\n    primaryAuthenticationType:\n      primaryAuthenticationType ?? application?.authenticationTypes[0],\n    authenticationTypes: application?.authenticationTypes ?? [],\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/application/ApplicationModel.js

@@ -6,14 +6,19 @@ import LinkModel from "../links/LinkModel";
 import UserServicesModel from "../user/UserServicesModel";
 import { NotAllowedUriException } from "../../exceptions";
 import { DEFAULT_AUTHENTICATION_TYPE } from "../../constants";
+import Cache from "../../utils/browser/Cache";
 /**
  * The Application model
  */
 export default class ApplicationModel extends ResourceModel {
-  constructor(...args) {
-    super(...args);
+  constructor(modularuiResponse) {
+    super(modularuiResponse);
+
+    // store authentication type in session cache, to make it available when application is no longer available (when not permitted for example)
     _defineProperty(this, "_userServices", void 0);
+    Cache.setItem("primaryAuthenticationType", this.primaryAuthenticationType);
   }
+
   /**
    * Retrieve type of model
    */
@@ -72,6 +77,14 @@ export default class ApplicationModel extends ResourceModel {
     return [DEFAULT_AUTHENTICATION_TYPE];
   }
 
+  /**
+   * Returns the primary authentication type
+   * @returns {AuthenticationType}
+   */
+  get primaryAuthenticationType() {
+    return this.authenticationTypes[0];
+  }
+
   /**
    * Getting the tab links
    */

package/esm/models/application/ApplicationModel.js.flow

@@ -7,6 +7,8 @@ import { NotAllowedUriException } from "../../exceptions";
 
 import { DEFAULT_AUTHENTICATION_TYPE } from "../../constants";
 
+import Cache from "../../utils/browser/Cache";
+
 import type { ModularUIModel, AuthenticationType } from "../types";
 import type { ModularUIResponse } from "../../modularui";
 import type LinkCollection from "../links/LinkCollection";
@@ -18,6 +20,13 @@ import type Href from "../href/Href";
 export default class ApplicationModel extends ResourceModel {
   _userServices: ?UserServicesModel;
 
+  constructor(modularuiResponse: ModularUIResponse) {
+    super(modularuiResponse);
+
+    // store authentication type in session cache, to make it available when application is no longer available (when not permitted for example)
+    Cache.setItem("primaryAuthenticationType", this.primaryAuthenticationType);
+  }
+
   /**
    * Retrieve type of model
    */
@@ -91,6 +100,14 @@ export default class ApplicationModel extends ResourceModel {
     return [DEFAULT_AUTHENTICATION_TYPE];
   }
 
+  /**
+   * Returns the primary authentication type
+   * @returns {AuthenticationType}
+   */
+  get primaryAuthenticationType(): AuthenticationType {
+    return this.authenticationTypes[0];
+  }
+
   /**
    * Getting the tab links
    */

package/esm/models/application/ApplicationModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"ApplicationModel.js","names":["ResourceModel","LinkModel","UserServicesModel","NotAllowedUriException","DEFAULT_AUTHENTICATION_TYPE","ApplicationModel","constructor","args","_defineProperty","type","modelName","isApplicableModel","data","contributions","resourcetype","getInitialChildModelLinks","userService","links","getLinkByKey","href","path","setChildModels","models","userServiceModel","_findInstanceProperty","call","model","userServices","label","getContribution","authenticationTypes","_context","Function","bind","_sortInstanceProperty","a","b","isPrimary","tabs","getLinksByGroup","modelcatalog","create","modelOptions","_userServices","isLoggedIn","userHref","userLink","userMustChangePassword","mustChangePassword"],"sources":["../../../src/models/application/ApplicationModel.js"],"sourcesContent":["// @flow\nimport ResourceModel from \"../base/ResourceModel\";\nimport LinkModel from \"../links/LinkModel\";\nimport UserServicesModel from \"../user/UserServicesModel\";\n\nimport { NotAllowedUriException } from \"../../exceptions\";\n\nimport { DEFAULT_AUTHENTICATION_TYPE } from \"../../constants\";\n\nimport type { ModularUIModel, AuthenticationType } from \"../types\";\nimport type { ModularUIResponse } from \"../../modularui\";\nimport type LinkCollection from \"../links/LinkCollection\";\nimport type Href from \"../href/Href\";\n\n/**\n * The Application model\n */\nexport default class ApplicationModel extends ResourceModel {\n  _userServices: ?UserServicesModel;\n\n  /**\n   * Retrieve type of model\n   */\n  get type(): string {\n    return \"Application\";\n  }\n\n  /**\n   */\n  static get modelName(): string {\n    return \"ApplicationModel\";\n  }\n\n  /**\n   */\n  static isApplicableModel(data: ModularUIResponse): boolean {\n    return (\n      data.contributions.resourcetype &&\n      data.contributions.resourcetype === \"Application\"\n    );\n  }\n\n  /**\n   */\n  getInitialChildModelLinks(): Array<LinkModel> {\n    const userService = this.links.getLinkByKey(\"UserServices\");\n    if (userService && userService.href.path === \"/login\") {\n      throw new NotAllowedUriException(\n        \"The user service (Login panel) should not have the uri '/login', use a different URI because this uri matches the login service.\",\n      );\n    }\n\n    return userService ? [userService] : [];\n  }\n\n  /**\n   */\n  setChildModels(models: Array<ModularUIModel>) {\n    const userServiceModel = models.find(\n      (model) => model.type === \"UserServices\",\n    );\n\n    if (userServiceModel) {\n      this.userServices = userServiceModel;\n    }\n  }\n\n  /**\n   * Getting the label of the application\n   */\n  get label(): string {\n    return this.getContribution(\"label\", \"\");\n  }\n\n  /**\n   * Getting the authentication types of the application\n   */\n  get authenticationTypes(): Array<AuthenticationType> {\n    const authenticationTypes = this.getContribution(\"security\", [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ]);\n\n    if (authenticationTypes) {\n      //put primary first\n      return authenticationTypes?.sort(\n        (a: AuthenticationType, b: AuthenticationType) =>\n          a.isPrimary === b.isPrimary ? 0 : a.isPrimary ? -1 : 1,\n      );\n    }\n\n    return [DEFAULT_AUTHENTICATION_TYPE];\n  }\n\n  /**\n   * Getting the tab links\n   */\n  get tabs(): LinkCollection {\n    return this.links.getLinksByGroup(\"tab\");\n  }\n\n  /**\n   * Get modelcatalog link\n   */\n  get modelcatalog(): LinkModel {\n    return LinkModel.create(\n      \"modelcatalog\",\n      \"/modelcatalog\",\n      \"Model catalog\",\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * Set the userservices for this application\n   */\n  set userServices(model: ?ModularUIModel) {\n    this._userServices = model instanceof UserServicesModel ? model : null;\n  }\n\n  /**\n   * returns the userservices configured for this application\n   */\n  get userServices(): ?UserServicesModel {\n    return this._userServices ? this._userServices : null;\n  }\n\n  /**\n   * Indicates if the user is logged in\n   */\n  get isLoggedIn(): boolean {\n    return this.userServices?.isLoggedIn ?? false;\n  }\n\n  /**\n   * Retrieve link to the user information,\n   * only available when the user services are available\n   */\n  get userHref(): Href | null {\n    if (this.userServices?.userLink) {\n      return this.userServices.userLink.href;\n    }\n\n    return null;\n  }\n\n  /**\n   */\n  get userMustChangePassword(): boolean {\n    return this.userServices?.mustChangePassword ?? false;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ApplicationModel.js","names":["ResourceModel","LinkModel","UserServicesModel","NotAllowedUriException","DEFAULT_AUTHENTICATION_TYPE","Cache","ApplicationModel","constructor","modularuiResponse","_defineProperty","setItem","primaryAuthenticationType","type","modelName","isApplicableModel","data","contributions","resourcetype","getInitialChildModelLinks","userService","links","getLinkByKey","href","path","setChildModels","models","userServiceModel","_findInstanceProperty","call","model","userServices","label","getContribution","authenticationTypes","_context","Function","bind","_sortInstanceProperty","a","b","isPrimary","tabs","getLinksByGroup","modelcatalog","create","modelOptions","_userServices","isLoggedIn","userHref","userLink","userMustChangePassword","mustChangePassword"],"sources":["../../../src/models/application/ApplicationModel.js"],"sourcesContent":["// @flow\nimport ResourceModel from \"../base/ResourceModel\";\nimport LinkModel from \"../links/LinkModel\";\nimport UserServicesModel from \"../user/UserServicesModel\";\n\nimport { NotAllowedUriException } from \"../../exceptions\";\n\nimport { DEFAULT_AUTHENTICATION_TYPE } from \"../../constants\";\n\nimport Cache from \"../../utils/browser/Cache\";\n\nimport type { ModularUIModel, AuthenticationType } from \"../types\";\nimport type { ModularUIResponse } from \"../../modularui\";\nimport type LinkCollection from \"../links/LinkCollection\";\nimport type Href from \"../href/Href\";\n\n/**\n * The Application model\n */\nexport default class ApplicationModel extends ResourceModel {\n  _userServices: ?UserServicesModel;\n\n  constructor(modularuiResponse: ModularUIResponse) {\n    super(modularuiResponse);\n\n    // store authentication type in session cache, to make it available when application is no longer available (when not permitted for example)\n    Cache.setItem(\"primaryAuthenticationType\", this.primaryAuthenticationType);\n  }\n\n  /**\n   * Retrieve type of model\n   */\n  get type(): string {\n    return \"Application\";\n  }\n\n  /**\n   */\n  static get modelName(): string {\n    return \"ApplicationModel\";\n  }\n\n  /**\n   */\n  static isApplicableModel(data: ModularUIResponse): boolean {\n    return (\n      data.contributions.resourcetype &&\n      data.contributions.resourcetype === \"Application\"\n    );\n  }\n\n  /**\n   */\n  getInitialChildModelLinks(): Array<LinkModel> {\n    const userService = this.links.getLinkByKey(\"UserServices\");\n    if (userService && userService.href.path === \"/login\") {\n      throw new NotAllowedUriException(\n        \"The user service (Login panel) should not have the uri '/login', use a different URI because this uri matches the login service.\",\n      );\n    }\n\n    return userService ? [userService] : [];\n  }\n\n  /**\n   */\n  setChildModels(models: Array<ModularUIModel>) {\n    const userServiceModel = models.find(\n      (model) => model.type === \"UserServices\",\n    );\n\n    if (userServiceModel) {\n      this.userServices = userServiceModel;\n    }\n  }\n\n  /**\n   * Getting the label of the application\n   */\n  get label(): string {\n    return this.getContribution(\"label\", \"\");\n  }\n\n  /**\n   * Getting the authentication types of the application\n   */\n  get authenticationTypes(): Array<AuthenticationType> {\n    const authenticationTypes = this.getContribution(\"security\", [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ]);\n\n    if (authenticationTypes) {\n      //put primary first\n      return authenticationTypes?.sort(\n        (a: AuthenticationType, b: AuthenticationType) =>\n          a.isPrimary === b.isPrimary ? 0 : a.isPrimary ? -1 : 1,\n      );\n    }\n\n    return [DEFAULT_AUTHENTICATION_TYPE];\n  }\n\n  /**\n   * Returns the primary authentication type\n   * @returns {AuthenticationType}\n   */\n  get primaryAuthenticationType(): AuthenticationType {\n    return this.authenticationTypes[0];\n  }\n\n  /**\n   * Getting the tab links\n   */\n  get tabs(): LinkCollection {\n    return this.links.getLinksByGroup(\"tab\");\n  }\n\n  /**\n   * Get modelcatalog link\n   */\n  get modelcatalog(): LinkModel {\n    return LinkModel.create(\n      \"modelcatalog\",\n      \"/modelcatalog\",\n      \"Model catalog\",\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * Set the userservices for this application\n   */\n  set userServices(model: ?ModularUIModel) {\n    this._userServices = model instanceof UserServicesModel ? model : null;\n  }\n\n  /**\n   * returns the userservices configured for this application\n   */\n  get userServices(): ?UserServicesModel {\n    return this._userServices ? this._userServices : null;\n  }\n\n  /**\n   * Indicates if the user is logged in\n   */\n  get isLoggedIn(): boolean {\n    return this.userServices?.isLoggedIn ?? false;\n  }\n\n  /**\n   * Retrieve link to the user information,\n   * only available when the user services are available\n   */\n  get userHref(): Href | null {\n    if (this.userServices?.userLink) {\n      return this.userServices.userLink.href;\n    }\n\n    return null;\n  }\n\n  /**\n   */\n  get userMustChangePassword(): boolean {\n    return this.userServices?.mustChangePassword ?? false;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/esm/redux/actions/SignIn.js

@@ -2,6 +2,7 @@ import _Promise from "@babel/runtime-corejs3/core-js-stable/promise";
 import Cache from "../../utils/browser/Cache";
 import Authenticate from "../../modularui/Authenticate";
 import { getApplication } from "../_modularui/ModularUISelectors";
+import { handleError } from "./Error";
 import { reloadApplication } from "./Application";
 import { startProgress, finishProgress } from "./ProgressIndicator";
 import { push } from "../_router/RouterActions";
@@ -71,7 +72,7 @@ export const login = (username, password) => (dispatch, getState) => {
       });
     }
     dispatch(loginFailed(error.id));
-    return dispatch(finishProgress());
+    return dispatch(handleError(error));
   });
 };
 //# sourceMappingURL=SignIn.js.map

package/esm/redux/actions/SignIn.js.flow

@@ -3,9 +3,10 @@ import Cache from "../../utils/browser/Cache";
 import Authenticate from "../../modularui/Authenticate";
 import { getApplication } from "../_modularui/ModularUISelectors";
 
+import { handleError } from "./Error";
 import { reloadApplication } from "./Application";
-
 import { startProgress, finishProgress } from "./ProgressIndicator";
+
 import { push } from "../_router/RouterActions";
 import { CHANGEPASSWORD_PATH } from "../../constants/Constants";
 
@@ -97,6 +98,6 @@ export const login =
         }
 
         dispatch(loginFailed(error.id));
-        return dispatch(finishProgress());
+        return dispatch(handleError(error));
       });
   };

package/esm/redux/actions/SignIn.js.map

@@ -1 +1 @@
-{"version":3,"file":"SignIn.js","names":["Cache","Authenticate","getApplication","reloadApplication","startProgress","finishProgress","push","CHANGEPASSWORD_PATH","loginFailed","errorMessage","sendAuthenticationError","type","payload","resetAuthErrors","loginSuccess","changePassword","dispatch","getState","isModal","router","location","state","modal","locationFrom","from","login","username","password","then","addItem","application","userMustChangePassword","catch","error","id","dispatchedReloadApplication","_Promise","resolve"],"sources":["../../../src/redux/actions/SignIn.js"],"sourcesContent":["// @flow\nimport Cache from \"../../utils/browser/Cache\";\nimport Authenticate from \"../../modularui/Authenticate\";\nimport { getApplication } from \"../_modularui/ModularUISelectors\";\n\nimport { reloadApplication } from \"./Application\";\n\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\nimport { push } from \"../_router/RouterActions\";\nimport { CHANGEPASSWORD_PATH } from \"../../constants/Constants\";\n\nimport type {\n  SendAuthenticationErrorAction,\n  ResetAuthErrorsAction,\n  LoginSuccessAction,\n  ThunkAction,\n} from \"../types\";\n\n/**\n * Send login failed action\n */\nexport const loginFailed = (\n  errorMessage: string,\n): SendAuthenticationErrorAction => sendAuthenticationError(errorMessage);\n\n/**\n * Send authentication error action\n */\nexport const sendAuthenticationError = (\n  errorMessage: string,\n): SendAuthenticationErrorAction => ({\n  type: \"AUTHENTICATION_ERROR\",\n  payload: errorMessage,\n});\n\n/**\n * Resets any authentication errors\n */\nexport const resetAuthErrors = (): ResetAuthErrorsAction => ({\n  type: \"AUTHENTICATION_RESET_ERRORS\",\n});\n\n/**\n * Send login success action\n */\nexport const loginSuccess = (): LoginSuccessAction => ({\n  type: \"AUTHENTICATION_SUCCESS\",\n});\n\n/**\n * Send change password action\n */\nexport const changePassword = (): ThunkAction => (dispatch, getState) => {\n  dispatch({\n    type: \"CHANGE_PASSWORD\",\n  });\n\n  const isModal = getState().router.location?.state?.modal;\n  const locationFrom = getState().router.location?.state?.from;\n  return dispatch(\n    push(CHANGEPASSWORD_PATH, {\n      from: locationFrom ? locationFrom : getState().router.location,\n      modal: isModal,\n    }),\n  );\n};\n\n/**\n */\nexport const login =\n  (username: string, password: string): ThunkAction =>\n  (dispatch, getState) => {\n    dispatch(startProgress());\n\n    return new Authenticate()\n      .login(username, password)\n      .then(() => dispatch(reloadApplication()))\n      .then(() => {\n        Cache.addItem(\"auth\", true);\n        const application = getApplication(getState());\n        if (application?.userMustChangePassword) {\n          dispatch(changePassword());\n        } else {\n          dispatch(loginSuccess());\n        }\n        return dispatch(finishProgress());\n      })\n      .catch((error) => {\n        if (error.id === \"Error.ChangePasswordRequired\") {\n          const dispatchedReloadApplication = dispatch(reloadApplication());\n\n          return Promise.resolve(dispatchedReloadApplication).then(() => {\n            Cache.addItem(\"auth\", true);\n            dispatch(changePassword());\n            return dispatch(finishProgress());\n          });\n        }\n\n        dispatch(loginFailed(error.id));\n        return dispatch(finishProgress());\n      });\n  };\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"SignIn.js","names":["Cache","Authenticate","getApplication","handleError","reloadApplication","startProgress","finishProgress","push","CHANGEPASSWORD_PATH","loginFailed","errorMessage","sendAuthenticationError","type","payload","resetAuthErrors","loginSuccess","changePassword","dispatch","getState","isModal","router","location","state","modal","locationFrom","from","login","username","password","then","addItem","application","userMustChangePassword","catch","error","id","dispatchedReloadApplication","_Promise","resolve"],"sources":["../../../src/redux/actions/SignIn.js"],"sourcesContent":["// @flow\nimport Cache from \"../../utils/browser/Cache\";\nimport Authenticate from \"../../modularui/Authenticate\";\nimport { getApplication } from \"../_modularui/ModularUISelectors\";\n\nimport { handleError } from \"./Error\";\nimport { reloadApplication } from \"./Application\";\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\n\nimport { push } from \"../_router/RouterActions\";\nimport { CHANGEPASSWORD_PATH } from \"../../constants/Constants\";\n\nimport type {\n  SendAuthenticationErrorAction,\n  ResetAuthErrorsAction,\n  LoginSuccessAction,\n  ThunkAction,\n} from \"../types\";\n\n/**\n * Send login failed action\n */\nexport const loginFailed = (\n  errorMessage: string,\n): SendAuthenticationErrorAction => sendAuthenticationError(errorMessage);\n\n/**\n * Send authentication error action\n */\nexport const sendAuthenticationError = (\n  errorMessage: string,\n): SendAuthenticationErrorAction => ({\n  type: \"AUTHENTICATION_ERROR\",\n  payload: errorMessage,\n});\n\n/**\n * Resets any authentication errors\n */\nexport const resetAuthErrors = (): ResetAuthErrorsAction => ({\n  type: \"AUTHENTICATION_RESET_ERRORS\",\n});\n\n/**\n * Send login success action\n */\nexport const loginSuccess = (): LoginSuccessAction => ({\n  type: \"AUTHENTICATION_SUCCESS\",\n});\n\n/**\n * Send change password action\n */\nexport const changePassword = (): ThunkAction => (dispatch, getState) => {\n  dispatch({\n    type: \"CHANGE_PASSWORD\",\n  });\n\n  const isModal = getState().router.location?.state?.modal;\n  const locationFrom = getState().router.location?.state?.from;\n  return dispatch(\n    push(CHANGEPASSWORD_PATH, {\n      from: locationFrom ? locationFrom : getState().router.location,\n      modal: isModal,\n    }),\n  );\n};\n\n/**\n */\nexport const login =\n  (username: string, password: string): ThunkAction =>\n  (dispatch, getState) => {\n    dispatch(startProgress());\n\n    return new Authenticate()\n      .login(username, password)\n      .then(() => dispatch(reloadApplication()))\n      .then(() => {\n        Cache.addItem(\"auth\", true);\n        const application = getApplication(getState());\n        if (application?.userMustChangePassword) {\n          dispatch(changePassword());\n        } else {\n          dispatch(loginSuccess());\n        }\n        return dispatch(finishProgress());\n      })\n      .catch((error) => {\n        if (error.id === \"Error.ChangePasswordRequired\") {\n          const dispatchedReloadApplication = dispatch(reloadApplication());\n\n          return Promise.resolve(dispatchedReloadApplication).then(() => {\n            Cache.addItem(\"auth\", true);\n            dispatch(changePassword());\n            return dispatch(finishProgress());\n          });\n        }\n\n        dispatch(loginFailed(error.id));\n        return dispatch(handleError(error));\n      });\n  };\n"],"mappings":"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","ignoreList":[]}

package/lib/hooks/useAuthentication.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useLogout = exports.useLogin = void 0;
 var _reactRedux = require("react-redux");
-var _ModularUISelectors = require("../redux/_modularui/ModularUISelectors");
 var _actions = require("../redux/actions");
 var _Cache = _interopRequireDefault(require("../utils/browser/Cache"));
 var _constants = require("../constants");
@@ -21,9 +20,11 @@ const useLogin = () => {
   const application = (0, _useModularUIModel.useApplication)();
   const auth = (0, _reactRedux.useSelector)(state => state.auth);
   const isAuthenticated = application?.isLoggedIn ?? false;
+  const primaryAuthenticationType = _Cache.default.getItem("primaryAuthenticationType");
   return {
     isAuthenticated,
-    authenticationTypes: application?.authenticationTypes ?? [_constants.DEFAULT_AUTHENTICATION_TYPE],
+    primaryAuthenticationType: primaryAuthenticationType ?? application?.authenticationTypes[0],
+    authenticationTypes: application?.authenticationTypes ?? [],
     errorMessage: auth.error,
     resetErrors: () => dispatch((0, _actions.resetAuthErrors)()),
     login: (username, password) => dispatch((0, _actions.login)(username, password)),
@@ -45,13 +46,15 @@ const useLogin = () => {
 exports.useLogin = useLogin;
 const useLogout = () => {
   const dispatch = (0, _reactRedux.useDispatch)();
-  const application = (0, _reactRedux.useSelector)(_ModularUISelectors.getApplication);
+  const application = (0, _useModularUIModel.useApplication)();
   const BASE_PATH = (0, _constants.getBasePath)();
   const authenticate = new _modularui.Authenticate();
+  const primaryAuthenticationType = _Cache.default.getItem("primaryAuthenticationType");
   const isAuthenticated = application?.isLoggedIn ?? false;
   return {
     isAuthenticated,
-    authenticationTypes: application?.authenticationTypes ?? [_constants.DEFAULT_AUTHENTICATION_TYPE],
+    primaryAuthenticationType: primaryAuthenticationType ?? application?.authenticationTypes[0],
+    authenticationTypes: application?.authenticationTypes ?? [],
     logout: () => {
       const type = authenticate.authenticationType;
       if (type === _constants.INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {

package/lib/hooks/useAuthentication.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAuthentication.js","names":["_reactRedux","require","_ModularUISelectors","_actions","_Cache","_interopRequireDefault","_constants","_exceptions","_modularui","_useModularUIModel","useLogin","Cache","setItem","dispatch","useDispatch","application","useApplication","auth","useSelector","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","getApplication","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\";\nimport { useApplication } from \"./useModularUIModel\";\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 = useApplication();\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":[]}
+{"version":3,"file":"useAuthentication.js","names":["_reactRedux","require","_actions","_Cache","_interopRequireDefault","_constants","_exceptions","_modularui","_useModularUIModel","useLogin","Cache","setItem","dispatch","useDispatch","application","useApplication","auth","useSelector","state","isAuthenticated","isLoggedIn","primaryAuthenticationType","getItem","authenticationTypes","errorMessage","error","resetErrors","resetAuthErrors","login","username","password","redirectLogin","authenticationType","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 { login, logout, resetAuthErrors } from \"../redux/actions\";\n\nimport Cache from \"../utils/browser/Cache\";\nimport {\n  getBasePath,\n  getBasePathServer,\n  INTERNAL_LOGIN_TYPE,\n} from \"../constants\";\nimport { IllegalStateException } from \"../exceptions\";\nimport { Authenticate } from \"../modularui\";\nimport { useApplication } from \"./useModularUIModel\";\n\nimport type { ResetAuthErrorsAction } from \"../redux/types\";\nimport type { AuthenticationType } from \"../models/types\";\n\ntype LoginHook = {\n  isAuthenticated: boolean,\n  primaryAuthenticationType: AuthenticationType,\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  primaryAuthenticationType: AuthenticationType,\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 = useApplication();\n  const auth = useSelector((state) => state.auth);\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n\n  const primaryAuthenticationType = Cache.getItem(\"primaryAuthenticationType\");\n\n  return {\n    isAuthenticated,\n    primaryAuthenticationType:\n      primaryAuthenticationType ?? application?.authenticationTypes[0],\n    authenticationTypes: application?.authenticationTypes ?? [],\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\n  const application = useApplication();\n\n  const BASE_PATH = getBasePath();\n\n  const authenticate = new Authenticate();\n\n  const primaryAuthenticationType = Cache.getItem(\"primaryAuthenticationType\");\n\n  const isAuthenticated = application?.isLoggedIn ?? false;\n  return {\n    isAuthenticated,\n    primaryAuthenticationType:\n      primaryAuthenticationType ?? application?.authenticationTypes[0],\n    authenticationTypes: application?.authenticationTypes ?? [],\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/application/ApplicationModel.js

@@ -13,14 +13,19 @@ var _LinkModel = _interopRequireDefault(require("../links/LinkModel"));
 var _UserServicesModel = _interopRequireDefault(require("../user/UserServicesModel"));
 var _exceptions = require("../../exceptions");
 var _constants = require("../../constants");
+var _Cache = _interopRequireDefault(require("../../utils/browser/Cache"));
 /**
  * The Application model
  */
 class ApplicationModel extends _ResourceModel.default {
-  constructor(...args) {
-    super(...args);
+  constructor(modularuiResponse) {
+    super(modularuiResponse);
+
+    // store authentication type in session cache, to make it available when application is no longer available (when not permitted for example)
     (0, _defineProperty2.default)(this, "_userServices", void 0);
+    _Cache.default.setItem("primaryAuthenticationType", this.primaryAuthenticationType);
   }
+
   /**
    * Retrieve type of model
    */
@@ -79,6 +84,14 @@ class ApplicationModel extends _ResourceModel.default {
     return [_constants.DEFAULT_AUTHENTICATION_TYPE];
   }
 
+  /**
+   * Returns the primary authentication type
+   * @returns {AuthenticationType}
+   */
+  get primaryAuthenticationType() {
+    return this.authenticationTypes[0];
+  }
+
   /**
    * Getting the tab links
    */

package/lib/models/application/ApplicationModel.js.map

@@ -1 +1 @@
-{"version":3,"file":"ApplicationModel.js","names":["_ResourceModel","_interopRequireDefault","require","_LinkModel","_UserServicesModel","_exceptions","_constants","ApplicationModel","ResourceModel","constructor","args","_defineProperty2","default","type","modelName","isApplicableModel","data","contributions","resourcetype","getInitialChildModelLinks","userService","links","getLinkByKey","href","path","NotAllowedUriException","setChildModels","models","userServiceModel","_find","call","model","userServices","label","getContribution","authenticationTypes","DEFAULT_AUTHENTICATION_TYPE","_context","Function","bind","_sort","a","b","isPrimary","tabs","getLinksByGroup","modelcatalog","LinkModel","create","modelOptions","_userServices","UserServicesModel","isLoggedIn","userHref","userLink","userMustChangePassword","mustChangePassword","exports"],"sources":["../../../src/models/application/ApplicationModel.js"],"sourcesContent":["// @flow\nimport ResourceModel from \"../base/ResourceModel\";\nimport LinkModel from \"../links/LinkModel\";\nimport UserServicesModel from \"../user/UserServicesModel\";\n\nimport { NotAllowedUriException } from \"../../exceptions\";\n\nimport { DEFAULT_AUTHENTICATION_TYPE } from \"../../constants\";\n\nimport type { ModularUIModel, AuthenticationType } from \"../types\";\nimport type { ModularUIResponse } from \"../../modularui\";\nimport type LinkCollection from \"../links/LinkCollection\";\nimport type Href from \"../href/Href\";\n\n/**\n * The Application model\n */\nexport default class ApplicationModel extends ResourceModel {\n  _userServices: ?UserServicesModel;\n\n  /**\n   * Retrieve type of model\n   */\n  get type(): string {\n    return \"Application\";\n  }\n\n  /**\n   */\n  static get modelName(): string {\n    return \"ApplicationModel\";\n  }\n\n  /**\n   */\n  static isApplicableModel(data: ModularUIResponse): boolean {\n    return (\n      data.contributions.resourcetype &&\n      data.contributions.resourcetype === \"Application\"\n    );\n  }\n\n  /**\n   */\n  getInitialChildModelLinks(): Array<LinkModel> {\n    const userService = this.links.getLinkByKey(\"UserServices\");\n    if (userService && userService.href.path === \"/login\") {\n      throw new NotAllowedUriException(\n        \"The user service (Login panel) should not have the uri '/login', use a different URI because this uri matches the login service.\",\n      );\n    }\n\n    return userService ? [userService] : [];\n  }\n\n  /**\n   */\n  setChildModels(models: Array<ModularUIModel>) {\n    const userServiceModel = models.find(\n      (model) => model.type === \"UserServices\",\n    );\n\n    if (userServiceModel) {\n      this.userServices = userServiceModel;\n    }\n  }\n\n  /**\n   * Getting the label of the application\n   */\n  get label(): string {\n    return this.getContribution(\"label\", \"\");\n  }\n\n  /**\n   * Getting the authentication types of the application\n   */\n  get authenticationTypes(): Array<AuthenticationType> {\n    const authenticationTypes = this.getContribution(\"security\", [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ]);\n\n    if (authenticationTypes) {\n      //put primary first\n      return authenticationTypes?.sort(\n        (a: AuthenticationType, b: AuthenticationType) =>\n          a.isPrimary === b.isPrimary ? 0 : a.isPrimary ? -1 : 1,\n      );\n    }\n\n    return [DEFAULT_AUTHENTICATION_TYPE];\n  }\n\n  /**\n   * Getting the tab links\n   */\n  get tabs(): LinkCollection {\n    return this.links.getLinksByGroup(\"tab\");\n  }\n\n  /**\n   * Get modelcatalog link\n   */\n  get modelcatalog(): LinkModel {\n    return LinkModel.create(\n      \"modelcatalog\",\n      \"/modelcatalog\",\n      \"Model catalog\",\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * Set the userservices for this application\n   */\n  set userServices(model: ?ModularUIModel) {\n    this._userServices = model instanceof UserServicesModel ? model : null;\n  }\n\n  /**\n   * returns the userservices configured for this application\n   */\n  get userServices(): ?UserServicesModel {\n    return this._userServices ? this._userServices : null;\n  }\n\n  /**\n   * Indicates if the user is logged in\n   */\n  get isLoggedIn(): boolean {\n    return this.userServices?.isLoggedIn ?? false;\n  }\n\n  /**\n   * Retrieve link to the user information,\n   * only available when the user services are available\n   */\n  get userHref(): Href | null {\n    if (this.userServices?.userLink) {\n      return this.userServices.userLink.href;\n    }\n\n    return null;\n  }\n\n  /**\n   */\n  get userMustChangePassword(): boolean {\n    return this.userServices?.mustChangePassword ?? false;\n  }\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"ApplicationModel.js","names":["_ResourceModel","_interopRequireDefault","require","_LinkModel","_UserServicesModel","_exceptions","_constants","_Cache","ApplicationModel","ResourceModel","constructor","modularuiResponse","_defineProperty2","default","Cache","setItem","primaryAuthenticationType","type","modelName","isApplicableModel","data","contributions","resourcetype","getInitialChildModelLinks","userService","links","getLinkByKey","href","path","NotAllowedUriException","setChildModels","models","userServiceModel","_find","call","model","userServices","label","getContribution","authenticationTypes","DEFAULT_AUTHENTICATION_TYPE","_context","Function","bind","_sort","a","b","isPrimary","tabs","getLinksByGroup","modelcatalog","LinkModel","create","modelOptions","_userServices","UserServicesModel","isLoggedIn","userHref","userLink","userMustChangePassword","mustChangePassword","exports"],"sources":["../../../src/models/application/ApplicationModel.js"],"sourcesContent":["// @flow\nimport ResourceModel from \"../base/ResourceModel\";\nimport LinkModel from \"../links/LinkModel\";\nimport UserServicesModel from \"../user/UserServicesModel\";\n\nimport { NotAllowedUriException } from \"../../exceptions\";\n\nimport { DEFAULT_AUTHENTICATION_TYPE } from \"../../constants\";\n\nimport Cache from \"../../utils/browser/Cache\";\n\nimport type { ModularUIModel, AuthenticationType } from \"../types\";\nimport type { ModularUIResponse } from \"../../modularui\";\nimport type LinkCollection from \"../links/LinkCollection\";\nimport type Href from \"../href/Href\";\n\n/**\n * The Application model\n */\nexport default class ApplicationModel extends ResourceModel {\n  _userServices: ?UserServicesModel;\n\n  constructor(modularuiResponse: ModularUIResponse) {\n    super(modularuiResponse);\n\n    // store authentication type in session cache, to make it available when application is no longer available (when not permitted for example)\n    Cache.setItem(\"primaryAuthenticationType\", this.primaryAuthenticationType);\n  }\n\n  /**\n   * Retrieve type of model\n   */\n  get type(): string {\n    return \"Application\";\n  }\n\n  /**\n   */\n  static get modelName(): string {\n    return \"ApplicationModel\";\n  }\n\n  /**\n   */\n  static isApplicableModel(data: ModularUIResponse): boolean {\n    return (\n      data.contributions.resourcetype &&\n      data.contributions.resourcetype === \"Application\"\n    );\n  }\n\n  /**\n   */\n  getInitialChildModelLinks(): Array<LinkModel> {\n    const userService = this.links.getLinkByKey(\"UserServices\");\n    if (userService && userService.href.path === \"/login\") {\n      throw new NotAllowedUriException(\n        \"The user service (Login panel) should not have the uri '/login', use a different URI because this uri matches the login service.\",\n      );\n    }\n\n    return userService ? [userService] : [];\n  }\n\n  /**\n   */\n  setChildModels(models: Array<ModularUIModel>) {\n    const userServiceModel = models.find(\n      (model) => model.type === \"UserServices\",\n    );\n\n    if (userServiceModel) {\n      this.userServices = userServiceModel;\n    }\n  }\n\n  /**\n   * Getting the label of the application\n   */\n  get label(): string {\n    return this.getContribution(\"label\", \"\");\n  }\n\n  /**\n   * Getting the authentication types of the application\n   */\n  get authenticationTypes(): Array<AuthenticationType> {\n    const authenticationTypes = this.getContribution(\"security\", [\n      DEFAULT_AUTHENTICATION_TYPE,\n    ]);\n\n    if (authenticationTypes) {\n      //put primary first\n      return authenticationTypes?.sort(\n        (a: AuthenticationType, b: AuthenticationType) =>\n          a.isPrimary === b.isPrimary ? 0 : a.isPrimary ? -1 : 1,\n      );\n    }\n\n    return [DEFAULT_AUTHENTICATION_TYPE];\n  }\n\n  /**\n   * Returns the primary authentication type\n   * @returns {AuthenticationType}\n   */\n  get primaryAuthenticationType(): AuthenticationType {\n    return this.authenticationTypes[0];\n  }\n\n  /**\n   * Getting the tab links\n   */\n  get tabs(): LinkCollection {\n    return this.links.getLinksByGroup(\"tab\");\n  }\n\n  /**\n   * Get modelcatalog link\n   */\n  get modelcatalog(): LinkModel {\n    return LinkModel.create(\n      \"modelcatalog\",\n      \"/modelcatalog\",\n      \"Model catalog\",\n      this.modelOptions,\n    );\n  }\n\n  /**\n   * Set the userservices for this application\n   */\n  set userServices(model: ?ModularUIModel) {\n    this._userServices = model instanceof UserServicesModel ? model : null;\n  }\n\n  /**\n   * returns the userservices configured for this application\n   */\n  get userServices(): ?UserServicesModel {\n    return this._userServices ? this._userServices : null;\n  }\n\n  /**\n   * Indicates if the user is logged in\n   */\n  get isLoggedIn(): boolean {\n    return this.userServices?.isLoggedIn ?? false;\n  }\n\n  /**\n   * Retrieve link to the user information,\n   * only available when the user services are available\n   */\n  get userHref(): Href | null {\n    if (this.userServices?.userLink) {\n      return this.userServices.userLink.href;\n    }\n\n    return null;\n  }\n\n  /**\n   */\n  get userMustChangePassword(): boolean {\n    return this.userServices?.mustChangePassword ?? false;\n  }\n}\n"],"mappings":"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","ignoreList":[]}

package/lib/redux/actions/SignIn.js

@@ -9,6 +9,7 @@ var _promise = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-st
 var _Cache = _interopRequireDefault(require("../../utils/browser/Cache"));
 var _Authenticate = _interopRequireDefault(require("../../modularui/Authenticate"));
 var _ModularUISelectors = require("../_modularui/ModularUISelectors");
+var _Error = require("./Error");
 var _Application = require("./Application");
 var _ProgressIndicator = require("./ProgressIndicator");
 var _RouterActions = require("../_router/RouterActions");
@@ -83,7 +84,7 @@ const login = (username, password) => (dispatch, getState) => {
       });
     }
     dispatch(loginFailed(error.id));
-    return dispatch((0, _ProgressIndicator.finishProgress)());
+    return dispatch((0, _Error.handleError)(error));
   });
 };
 exports.login = login;

package/lib/redux/actions/SignIn.js.map

@@ -1 +1 @@
-{"version":3,"file":"SignIn.js","names":["_Cache","_interopRequireDefault","require","_Authenticate","_ModularUISelectors","_Application","_ProgressIndicator","_RouterActions","_Constants","loginFailed","errorMessage","sendAuthenticationError","exports","type","payload","resetAuthErrors","loginSuccess","changePassword","dispatch","getState","isModal","router","location","state","modal","locationFrom","from","push","CHANGEPASSWORD_PATH","login","username","password","startProgress","Authenticate","then","reloadApplication","Cache","addItem","application","getApplication","userMustChangePassword","finishProgress","catch","error","id","dispatchedReloadApplication","_promise","default","resolve"],"sources":["../../../src/redux/actions/SignIn.js"],"sourcesContent":["// @flow\nimport Cache from \"../../utils/browser/Cache\";\nimport Authenticate from \"../../modularui/Authenticate\";\nimport { getApplication } from \"../_modularui/ModularUISelectors\";\n\nimport { reloadApplication } from \"./Application\";\n\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\nimport { push } from \"../_router/RouterActions\";\nimport { CHANGEPASSWORD_PATH } from \"../../constants/Constants\";\n\nimport type {\n  SendAuthenticationErrorAction,\n  ResetAuthErrorsAction,\n  LoginSuccessAction,\n  ThunkAction,\n} from \"../types\";\n\n/**\n * Send login failed action\n */\nexport const loginFailed = (\n  errorMessage: string,\n): SendAuthenticationErrorAction => sendAuthenticationError(errorMessage);\n\n/**\n * Send authentication error action\n */\nexport const sendAuthenticationError = (\n  errorMessage: string,\n): SendAuthenticationErrorAction => ({\n  type: \"AUTHENTICATION_ERROR\",\n  payload: errorMessage,\n});\n\n/**\n * Resets any authentication errors\n */\nexport const resetAuthErrors = (): ResetAuthErrorsAction => ({\n  type: \"AUTHENTICATION_RESET_ERRORS\",\n});\n\n/**\n * Send login success action\n */\nexport const loginSuccess = (): LoginSuccessAction => ({\n  type: \"AUTHENTICATION_SUCCESS\",\n});\n\n/**\n * Send change password action\n */\nexport const changePassword = (): ThunkAction => (dispatch, getState) => {\n  dispatch({\n    type: \"CHANGE_PASSWORD\",\n  });\n\n  const isModal = getState().router.location?.state?.modal;\n  const locationFrom = getState().router.location?.state?.from;\n  return dispatch(\n    push(CHANGEPASSWORD_PATH, {\n      from: locationFrom ? locationFrom : getState().router.location,\n      modal: isModal,\n    }),\n  );\n};\n\n/**\n */\nexport const login =\n  (username: string, password: string): ThunkAction =>\n  (dispatch, getState) => {\n    dispatch(startProgress());\n\n    return new Authenticate()\n      .login(username, password)\n      .then(() => dispatch(reloadApplication()))\n      .then(() => {\n        Cache.addItem(\"auth\", true);\n        const application = getApplication(getState());\n        if (application?.userMustChangePassword) {\n          dispatch(changePassword());\n        } else {\n          dispatch(loginSuccess());\n        }\n        return dispatch(finishProgress());\n      })\n      .catch((error) => {\n        if (error.id === \"Error.ChangePasswordRequired\") {\n          const dispatchedReloadApplication = dispatch(reloadApplication());\n\n          return Promise.resolve(dispatchedReloadApplication).then(() => {\n            Cache.addItem(\"auth\", true);\n            dispatch(changePassword());\n            return dispatch(finishProgress());\n          });\n        }\n\n        dispatch(loginFailed(error.id));\n        return dispatch(finishProgress());\n      });\n  };\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"SignIn.js","names":["_Cache","_interopRequireDefault","require","_Authenticate","_ModularUISelectors","_Error","_Application","_ProgressIndicator","_RouterActions","_Constants","loginFailed","errorMessage","sendAuthenticationError","exports","type","payload","resetAuthErrors","loginSuccess","changePassword","dispatch","getState","isModal","router","location","state","modal","locationFrom","from","push","CHANGEPASSWORD_PATH","login","username","password","startProgress","Authenticate","then","reloadApplication","Cache","addItem","application","getApplication","userMustChangePassword","finishProgress","catch","error","id","dispatchedReloadApplication","_promise","default","resolve","handleError"],"sources":["../../../src/redux/actions/SignIn.js"],"sourcesContent":["// @flow\nimport Cache from \"../../utils/browser/Cache\";\nimport Authenticate from \"../../modularui/Authenticate\";\nimport { getApplication } from \"../_modularui/ModularUISelectors\";\n\nimport { handleError } from \"./Error\";\nimport { reloadApplication } from \"./Application\";\nimport { startProgress, finishProgress } from \"./ProgressIndicator\";\n\nimport { push } from \"../_router/RouterActions\";\nimport { CHANGEPASSWORD_PATH } from \"../../constants/Constants\";\n\nimport type {\n  SendAuthenticationErrorAction,\n  ResetAuthErrorsAction,\n  LoginSuccessAction,\n  ThunkAction,\n} from \"../types\";\n\n/**\n * Send login failed action\n */\nexport const loginFailed = (\n  errorMessage: string,\n): SendAuthenticationErrorAction => sendAuthenticationError(errorMessage);\n\n/**\n * Send authentication error action\n */\nexport const sendAuthenticationError = (\n  errorMessage: string,\n): SendAuthenticationErrorAction => ({\n  type: \"AUTHENTICATION_ERROR\",\n  payload: errorMessage,\n});\n\n/**\n * Resets any authentication errors\n */\nexport const resetAuthErrors = (): ResetAuthErrorsAction => ({\n  type: \"AUTHENTICATION_RESET_ERRORS\",\n});\n\n/**\n * Send login success action\n */\nexport const loginSuccess = (): LoginSuccessAction => ({\n  type: \"AUTHENTICATION_SUCCESS\",\n});\n\n/**\n * Send change password action\n */\nexport const changePassword = (): ThunkAction => (dispatch, getState) => {\n  dispatch({\n    type: \"CHANGE_PASSWORD\",\n  });\n\n  const isModal = getState().router.location?.state?.modal;\n  const locationFrom = getState().router.location?.state?.from;\n  return dispatch(\n    push(CHANGEPASSWORD_PATH, {\n      from: locationFrom ? locationFrom : getState().router.location,\n      modal: isModal,\n    }),\n  );\n};\n\n/**\n */\nexport const login =\n  (username: string, password: string): ThunkAction =>\n  (dispatch, getState) => {\n    dispatch(startProgress());\n\n    return new Authenticate()\n      .login(username, password)\n      .then(() => dispatch(reloadApplication()))\n      .then(() => {\n        Cache.addItem(\"auth\", true);\n        const application = getApplication(getState());\n        if (application?.userMustChangePassword) {\n          dispatch(changePassword());\n        } else {\n          dispatch(loginSuccess());\n        }\n        return dispatch(finishProgress());\n      })\n      .catch((error) => {\n        if (error.id === \"Error.ChangePasswordRequired\") {\n          const dispatchedReloadApplication = dispatch(reloadApplication());\n\n          return Promise.resolve(dispatchedReloadApplication).then(() => {\n            Cache.addItem(\"auth\", true);\n            dispatch(changePassword());\n            return dispatch(finishProgress());\n          });\n        }\n\n        dispatch(loginFailed(error.id));\n        return dispatch(handleError(error));\n      });\n  };\n"],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beinformed/ui",
-  "version": "1.63.12",
+  "version": "1.63.14",
   "description": "Toolbox for be informed javascript layouts",
   "license": "SEE LICENSE IN LICENSE.md",
   "bugs": "https://support.beinformed.com",
@@ -71,7 +71,7 @@
   "dependencies": {
     "@babel/runtime-corejs3": "^7.28.4",
     "@date-fns/tz": "^1.4.1",
-    "baseline-browser-mapping": "^2.9.4",
+    "baseline-browser-mapping": "^2.9.5",
     "big.js": "^7.0.1",
     "date-fns": "^4.1.0",
     "deepmerge": "^4.3.1",

package/src/hooks/__tests__/useAuthentication.spec.js

@@ -115,7 +115,12 @@ describe("authentication hooks", () => {
       return res.status(200).body({ data: "ok" });
     });
 
-    const store = mockStore({ auth: {}, i18n: { locale: "en" } });
+    const store = mockStore({
+      auth: {},
+      modularui: {},
+      router: { location: {} },
+      i18n: { locale: "en" },
+    });
 
     /**
      */
@@ -135,6 +140,14 @@ describe("authentication hooks", () => {
 
     expect(store.getActions()).toStrictEqual([
       { type: "START_PROGRESS" },
+      expect.objectContaining({
+        type: "MODULARUI/FETCH",
+        payload: expect.objectContaining({
+          key: "application(/)(en)",
+        }),
+      }),
+      { type: "START_PROGRESS" },
+      { type: "FINISH_PROGRESS" },
       { type: "MODULARUI/RESET" },
       { type: "START_PROGRESS" },
       expect.objectContaining({

package/src/hooks/useAuthentication.js

@@ -1,12 +1,10 @@
 // @flow
 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,
   getBasePath,
   getBasePathServer,
   INTERNAL_LOGIN_TYPE,
@@ -20,6 +18,7 @@ import type { AuthenticationType } from "../models/types";
 
 type LoginHook = {
   isAuthenticated: boolean,
+  primaryAuthenticationType: AuthenticationType,
   authenticationTypes: Array<AuthenticationType>,
   errorMessage: ?string,
   resetErrors: () => ResetAuthErrorsAction,
@@ -28,6 +27,7 @@ type LoginHook = {
 };
 type LogoutHook = {
   isAuthenticated: boolean,
+  primaryAuthenticationType: AuthenticationType,
   authenticationTypes: Array<AuthenticationType>,
   logout: () => void,
   logoutUrl: string,
@@ -45,11 +45,13 @@ export const useLogin = (): LoginHook => {
 
   const isAuthenticated = application?.isLoggedIn ?? false;
 
+  const primaryAuthenticationType = Cache.getItem("primaryAuthenticationType");
+
   return {
     isAuthenticated,
-    authenticationTypes: application?.authenticationTypes ?? [
-      DEFAULT_AUTHENTICATION_TYPE,
-    ],
+    primaryAuthenticationType:
+      primaryAuthenticationType ?? application?.authenticationTypes[0],
+    authenticationTypes: application?.authenticationTypes ?? [],
     errorMessage: auth.error,
     resetErrors: () => dispatch(resetAuthErrors()),
     login: (username: string, password: string) =>
@@ -78,18 +80,21 @@ export const useLogin = (): LoginHook => {
  */
 export const useLogout = (): LogoutHook => {
   const dispatch = useDispatch();
-  const application = useSelector(getApplication);
+
+  const application = useApplication();
 
   const BASE_PATH = getBasePath();
 
   const authenticate = new Authenticate();
 
+  const primaryAuthenticationType = Cache.getItem("primaryAuthenticationType");
+
   const isAuthenticated = application?.isLoggedIn ?? false;
   return {
     isAuthenticated,
-    authenticationTypes: application?.authenticationTypes ?? [
-      DEFAULT_AUTHENTICATION_TYPE,
-    ],
+    primaryAuthenticationType:
+      primaryAuthenticationType ?? application?.authenticationTypes[0],
+    authenticationTypes: application?.authenticationTypes ?? [],
     logout: () => {
       const type = authenticate.authenticationType;
       if (type === INTERNAL_LOGIN_TYPE.PAC4J_INDIRECT) {

package/src/models/application/ApplicationModel.js

@@ -7,6 +7,8 @@ import { NotAllowedUriException } from "../../exceptions";
 
 import { DEFAULT_AUTHENTICATION_TYPE } from "../../constants";
 
+import Cache from "../../utils/browser/Cache";
+
 import type { ModularUIModel, AuthenticationType } from "../types";
 import type { ModularUIResponse } from "../../modularui";
 import type LinkCollection from "../links/LinkCollection";
@@ -18,6 +20,13 @@ import type Href from "../href/Href";
 export default class ApplicationModel extends ResourceModel {
   _userServices: ?UserServicesModel;
 
+  constructor(modularuiResponse: ModularUIResponse) {
+    super(modularuiResponse);
+
+    // store authentication type in session cache, to make it available when application is no longer available (when not permitted for example)
+    Cache.setItem("primaryAuthenticationType", this.primaryAuthenticationType);
+  }
+
   /**
    * Retrieve type of model
    */
@@ -91,6 +100,14 @@ export default class ApplicationModel extends ResourceModel {
     return [DEFAULT_AUTHENTICATION_TYPE];
   }
 
+  /**
+   * Returns the primary authentication type
+   * @returns {AuthenticationType}
+   */
+  get primaryAuthenticationType(): AuthenticationType {
+    return this.authenticationTypes[0];
+  }
+
   /**
    * Getting the tab links
    */

package/src/redux/actions/SignIn.js

@@ -3,9 +3,10 @@ import Cache from "../../utils/browser/Cache";
 import Authenticate from "../../modularui/Authenticate";
 import { getApplication } from "../_modularui/ModularUISelectors";
 
+import { handleError } from "./Error";
 import { reloadApplication } from "./Application";
-
 import { startProgress, finishProgress } from "./ProgressIndicator";
+
 import { push } from "../_router/RouterActions";
 import { CHANGEPASSWORD_PATH } from "../../constants/Constants";
 
@@ -97,6 +98,6 @@ export const login =
         }
 
         dispatch(loginFailed(error.id));
-        return dispatch(finishProgress());
+        return dispatch(handleError(error));
       });
   };