@beinformed/ui 1.27.2 → 1.27.3

package/src/models/application/ApplicationModel.js

@@ -80,12 +80,17 @@ export default class ApplicationModel extends ResourceModel {
       DEFAULT_AUTHENTICATION_TYPE,
     ]);
 
-    //put primary first
-    return authenticationTypes?.sort(
-      (a: AuthenticationType, b: AuthenticationType) =>
-        a.isPrimary === b.isPrimary ? 0 : a.isPrimary ? -1 : 1
-    );
+    if (authenticationTypes) {
+      //put primary first
+      return authenticationTypes?.sort(
+        (a: AuthenticationType, b: AuthenticationType) =>
+          a.isPrimary === b.isPrimary ? 0 : a.isPrimary ? -1 : 1
+      );
+    }
+
+    return [DEFAULT_AUTHENTICATION_TYPE];
   }
+
   /**
    * Getting the tab links
    */

package/src/modularui/Authenticate.js

@@ -6,6 +6,7 @@ import Cache from "../utils/browser/Cache";
 
 import { UnauthorizedException } from "../exceptions";
 import {
+  INTERNAL_LOGIN_TYPE,
   loginType,
   loginPath,
   loginPasswordField,
@@ -27,16 +28,17 @@ class Authenticate {
 
   /**
    */
-  get authenticationType(): "JAAS" | "PAC4J_FORM" | "PAC4J_BASIC" {
+  get authenticationType(): $Keys<typeof INTERNAL_LOGIN_TYPE> {
     const type = loginType();
 
-    if (!type || type === "JAAS") {
-      return "JAAS";
+    if (!type || type === INTERNAL_LOGIN_TYPE.JAAS) {
+      return INTERNAL_LOGIN_TYPE.JAAS;
     }
+
     if (type.includes("FormClient")) {
-      return "PAC4J_FORM";
+      return INTERNAL_LOGIN_TYPE.PAC4J_FORM;
     } else if (type.includes("BasicClient")) {
-      return "PAC4J_BASIC";
+      return INTERNAL_LOGIN_TYPE.PAC4J_BASIC;
     }
 
     throw new Error(`Unsupported login type found: ${type}`);
@@ -45,7 +47,10 @@ class Authenticate {
   /**
    */
   get isBasicAuthentication(): boolean {
-    return this._isBasic || this.authenticationType === "PAC4J_BASIC";
+    return (
+      this._isBasic ||
+      this.authenticationType === INTERNAL_LOGIN_TYPE.PAC4J_BASIC
+    );
   }
 
   /**
@@ -90,9 +95,9 @@ class Authenticate {
    */
   login(username: string, password: string): Promise<any> {
     switch (this.authenticationType) {
-      case "PAC4J_FORM":
+      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:
         return this.doFormLogin(username, password);
-      case "PAC4J_BASIC":
+      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:
         return this.doBasicAuthentication(username, password);
       default:
         return this.doJaasAuthentication(username, password);
@@ -103,8 +108,8 @@ class Authenticate {
    */
   getFormLoginUrl(): string {
     switch (this.authenticationType) {
-      case "PAC4J_BASIC":
-      case "PAC4J_FORM":
+      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:
+      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:
         return `${getBasePath()}${loginPath()}`;
       default:
         return `${getBasePath()}/j_security_check`;
@@ -118,8 +123,8 @@ class Authenticate {
     const encodedPassword = encodeURIComponent(password);
 
     switch (this.authenticationType) {
-      case "PAC4J_BASIC":
-      case "PAC4J_FORM":
+      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:
+      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:
         return `${loginUsernameField()}=${encodedUsername}&${loginPasswordField()}=${encodedPassword}`;
       default:
         return `j_username=${encodedUsername}&j_password=${encodedPassword}`;
@@ -158,11 +163,23 @@ class Authenticate {
     });
   }
 
+  /**
+   */
+  getLogoutUrl(): string {
+    switch (this.authenticationType) {
+      case INTERNAL_LOGIN_TYPE.PAC4J_BASIC:
+      case INTERNAL_LOGIN_TYPE.PAC4J_FORM:
+        return `${getBasePath()}${logoutPath()}`;
+      default:
+        return `${getBasePath()}/Logoff`;
+    }
+  }
+
   /**
    */
   logout(): Promise<any> {
     return universalFetch({
-      url: `${getBasePath()}${logoutPath()}`,
+      url: this.getLogoutUrl(),
     }).then((response) => {
       // clear cache because of cached contributions
       Cache.clear();

package/src/react/ErrorBoundaryFallback.js

@@ -12,6 +12,7 @@ export type Props = {
   +error: Error,
 };
 
+// $FlowFixMe
 const StyledBoundary: StyledComponent<{}, Theme, *> = styled.div`
   padding: ${spacers(2, 1)};
   margin-bottom: ${spacer(2)};
@@ -19,6 +20,7 @@ const StyledBoundary: StyledComponent<{}, Theme, *> = styled.div`
   border-radius: 0.3em;
 `;
 
+// $FlowFixMe
 const StyledStack = styled.pre`
   display: block;
   font-size: 87.5%;

package/src/react-server/serverUtil.js

@@ -176,6 +176,8 @@ const setApplication = (store: ReduxStore) => {
       locale: locale,
     }).fetchSync();
 
+    application.connectKey = `application(/)(${locale})`;
+
     store.dispatch(
       initModels([
         {

package/types/constants/Constants.d.ts

@@ -128,6 +128,11 @@ export namespace ATTRIBUTE_WIDTH {
     const EXTRA_LARGE: string;
 }
 export const ALL_CONTENT_IN_DATA_SETTING: "hasAllContentInData";
+export namespace INTERNAL_LOGIN_TYPE {
+    const JAAS: string;
+    const PAC4J_FORM: string;
+    const PAC4J_BASIC: string;
+}
 export const LOGIN_TYPE: "security.clients";
 export const LOGIN_PATH_SETTING: "FormClient.login_url";
 export const LOGIN_USERNAME_SETTING: "FormClient.username_field_name";

package/types/modularui/Authenticate.d.ts

@@ -5,7 +5,11 @@ declare class Authenticate {
     _isBasic: boolean;
     /**
      */
-    get authenticationType(): "JAAS" | "PAC4J_FORM" | "PAC4J_BASIC";
+    get authenticationType(): $Keys<{
+        JAAS: string;
+        PAC4J_FORM: string;
+        PAC4J_BASIC: string;
+    }>;
     /**
      */
     set isBasicAuthentication(arg: boolean);
@@ -36,6 +40,9 @@ declare class Authenticate {
     /**
      */
     doJaasAuthentication(username: string, password: string): Promise<any>;
+    /**
+     */
+    getLogoutUrl(): string;
     /**
      */
     logout(): Promise<any>;