@beinformed/ui 1.18.3 → 1.18.6

package/src/modularui/Authenticate.js

@@ -5,10 +5,10 @@ import universalFetch from "../utils/fetch/universalFetch";
 import Cache from "../utils/browser/Cache";
 
 import { UnauthorizedException } from "../exceptions";
-import type { RequestOptions } from "../utils/fetch/types";
 import {
-  loginPasswordField,
+  loginType,
   loginPath,
+  loginPasswordField,
   loginUsernameField,
   logoutPath,
 } from "../constants";
@@ -24,10 +24,27 @@ class Authenticate {
     this._isBasic = false;
   }
 
+  /**
+   */
+  get authenticationType(): "JAAS" | "PAC4J_FORM" | "PAC4J_BASIC" {
+    const type = loginType();
+
+    if (!type || type === "JAAS") {
+      return "JAAS";
+    }
+    if (type.includes("FormClient")) {
+      return "PAC4J_FORM";
+    } else if (type.includes("BasicClient")) {
+      return "PAC4J_BASIC";
+    }
+
+    throw new Error(`Unsupported login type found: ${type}`);
+  }
+
   /**
    */
   get isBasicAuthentication(): boolean {
-    return this._isBasic;
+    return this._isBasic || this.authenticationType === "PAC4J_BASIC";
   }
 
   /**
@@ -64,47 +81,85 @@ class Authenticate {
 
   /**
    */
-  createLogin(username: string, password: string): $Shape<RequestOptions> {
-    const LOGIN_PATH = loginPath();
-    const usernameField = loginUsernameField();
-    const passwordField = loginPasswordField();
+  login(username: string, password: string): Promise<any> {
+    switch (this.authenticationType) {
+      case "PAC4J_FORM":
+        return this.doFormLogin(username, password);
+      case "PAC4J_BASIC":
+        return this.doBasicAuthentication(username, password);
+      default:
+        return this.doJaasAuthentication(username, password);
+    }
+  }
+
+  /**
+   */
+  getFormLoginUrl(): string {
+    switch (this.authenticationType) {
+      case "PAC4J_BASIC":
+      case "PAC4J_FORM":
+        return `${BASE}${loginPath()}`;
+      default:
+        return `${BASE}/j_security_check`;
+    }
+  }
 
+  /**
+   */
+  getFormLoginData(username: string, password: string): string {
     const encodedUsername = encodeURIComponent(username);
     const encodedPassword = encodeURIComponent(password);
 
-    return {
-      url: LOGIN_PATH,
+    switch (this.authenticationType) {
+      case "PAC4J_BASIC":
+      case "PAC4J_FORM":
+        return `${loginUsernameField()}=${encodedUsername}&${loginPasswordField()}=${encodedPassword}`;
+      default:
+        return `j_username=${encodedUsername}&j_password=${encodedPassword}`;
+    }
+  }
+
+  /**
+   */
+  doFormLogin(username: string, password: string): Promise<any> {
+    return universalFetch({
+      url: this.getFormLoginUrl(),
       method: HTTP_METHODS.POST,
       headers: {
         Accept: "application/json",
         "Content-Type": "application/x-www-form-urlencoded",
       },
-      data: `${usernameField}=${encodedUsername}&${passwordField}=${encodedPassword}`,
-    };
+      data: this.getFormLoginData(username, password),
+    });
   }
 
   /**
    */
-  login(username: string, password: string): Promise<any> {
+  doBasicAuthentication(username: string, password: string): Promise<any> {
+    Cache.addItem("basic", btoa(`${username}:${password}`));
+    return Promise.resolve();
+  }
+
+  /**
+   */
+  doJaasAuthentication(username: string, password: string): Promise<any> {
     return this.initLogin(true).then(() => {
       if (this.isBasicAuthentication) {
-        Cache.addItem("basic", btoa(`${username}:${password}`));
-
-        return Promise.resolve();
+        return this.doBasicAuthentication(username, password);
       }
-
-      return universalFetch(this.createLogin(username, password));
+      return this.doFormLogin(username, password);
     });
   }
 
   /**
    */
-  logout(): Promise<void> {
+  logout(): Promise<any> {
     return universalFetch({
-      url: logoutPath(),
-    }).then(() => {
+      url: `${BASE}${logoutPath()}`,
+    }).then((response) => {
       // clear cache because of cached contributions
       Cache.clear();
+      return response;
     });
   }
 }

package/src/react-server/__tests__/serverUtil.spec.js

@@ -112,10 +112,11 @@ describe("serverUtil", () => {
       {
         type: "SET_PREFERENCES",
         payload: {
-          "FormClient.login_url": "/BeInformed/j_security_check",
-          "FormClient.logout_url": "/BeInformed/Logoff",
+          "FormClient.login_url": "/j_security_check",
+          "FormClient.logout_url": "/Logoff",
           "FormClient.password_field_name": "j_password",
           "FormClient.username_field_name": "j_username",
+          "security.clients": null,
         },
       },
     ]);
@@ -158,10 +159,11 @@ describe("serverUtil", () => {
       {
         type: "SET_PREFERENCES",
         payload: {
-          "FormClient.login_url": "/BeInformed/j_security_check",
-          "FormClient.logout_url": "/BeInformed/Logoff",
+          "FormClient.login_url": "/j_security_check",
+          "FormClient.logout_url": "/Logoff",
           "FormClient.password_field_name": "j_password",
           "FormClient.username_field_name": "j_username",
+          "security.clients": null,
         },
       },
     ]);

package/src/redux/actions/Preferences.js

@@ -12,8 +12,8 @@ import type {
 } from "../types";
 
 import {
-  BASE,
   ALL_CONTENT_IN_DATA_SETTING,
+  LOGIN_TYPE,
   LOGIN_PASSWORD_SETTING,
   LOGIN_PATH_SETTING,
   LOGIN_USERNAME_SETTING,
@@ -123,9 +123,13 @@ export const setLoginPreferences = (
   state?: ReduxState
 ): SetPreferencesAction => {
   const loginSettings = {
+    [LOGIN_TYPE]: getServerPreferenceValue(
+      LOGIN_TYPE,
+      state?.preferences[LOGIN_TYPE]
+    ),
     [LOGIN_PATH_SETTING]: getServerPreferenceValue(
       LOGIN_PATH_SETTING,
-      state?.preferences[LOGIN_PATH_SETTING] ?? `${BASE}/j_security_check`
+      state?.preferences[LOGIN_PATH_SETTING] ?? `/j_security_check`
     ),
     [LOGIN_USERNAME_SETTING]: getServerPreferenceValue(
       LOGIN_USERNAME_SETTING,
@@ -137,7 +141,7 @@ export const setLoginPreferences = (
     ),
     [LOGOUT_PATH_SETTING]: getServerPreferenceValue(
       LOGOUT_PATH_SETTING,
-      state?.preferences[LOGOUT_PATH_SETTING] ?? `${BASE}/Logoff`
+      state?.preferences[LOGOUT_PATH_SETTING] ?? `/Logoff`
     ),
   };
 

package/src/redux/actions/SignOut.js

@@ -4,6 +4,7 @@ import { startProgress, finishProgress } from "./ProgressIndicator";
 import { resetModularUI } from "../_modularui/actions";
 
 import type { Dispatch, LogoutSuccessAction, ThunkAction } from "../types";
+import { reloadApplication } from "./Application";
 
 /**
  * Send logout success action
@@ -17,9 +18,12 @@ export const logoutSuccess = (): LogoutSuccessAction => ({
 export const logout = (): ThunkAction => (dispatch: Dispatch) => {
   dispatch(startProgress());
 
-  return new Authenticate().logout().then(() => {
-    dispatch(resetModularUI());
-    dispatch(logoutSuccess());
-    return dispatch(finishProgress());
-  });
+  return new Authenticate()
+    .logout()
+    .then(() => dispatch(resetModularUI()))
+    .then(() => dispatch(reloadApplication()))
+    .then(() => {
+      dispatch(logoutSuccess());
+      return dispatch(finishProgress());
+    });
 };

package/src/redux/connectors/SignIn.js

@@ -5,8 +5,6 @@ import { login } from "../actions/SignIn";
 
 import { getApplication } from "../_modularui/selectors";
 
-import UserServicesModel from "../../models/user/UserServicesModel";
-
 import type { ReduxState, ThunkAction } from "../types";
 import type { ComponentType } from "react";
 
@@ -28,10 +26,7 @@ const mapStateToProps = (state: ReduxState): StateProps => {
   const application = getApplication(state);
 
   return {
-    isAuthenticated:
-      state.auth.isAuthenticated &&
-      application?.userServices instanceof UserServicesModel &&
-      application.userServices.isLoggedIn,
+    isAuthenticated: application?.isLoggedIn ?? false,
     errorMessage: state.auth.error,
   };
 };

package/src/redux/connectors/SignOut.js

@@ -5,6 +5,7 @@ import { logout } from "../actions/SignOut";
 
 import type { ThunkAction } from "../types";
 import type { ComponentType } from "react";
+import { getApplication } from "../_modularui";
 
 type StateProps = {
   isAuthenticated: boolean,
@@ -20,7 +21,7 @@ type Props = {
 };
 
 const mapStateToProps = (state): StateProps => ({
-  isAuthenticated: state.auth.isAuthenticated,
+  isAuthenticated: getApplication(state)?.isLoggedIn ?? false,
 });
 
 const mapDispatchToProps = { doLogout: logout };

package/src/redux/reducers/AuthReducer.js

@@ -1,12 +1,9 @@
 // @flow
-import Cache from "../../utils/browser/Cache";
-
 import type { Reducer } from "redux";
 import type { AuthState, ReduxAction } from "../types";
 
 // REDUCER
 const initialState: AuthState = {
-  isAuthenticated: false,
   mustChangePassword: false,
   error: null,
 };
@@ -26,7 +23,6 @@ const AuthReducer: Reducer<AuthState, ReduxAction> = (
     case "AUTHENTICATION_SUCCESS":
       return {
         ...state,
-        isAuthenticated: true,
         error: null,
         mustChangePassword: false,
       };
@@ -38,15 +34,9 @@ const AuthReducer: Reducer<AuthState, ReduxAction> = (
       return { ...state, error: null };
 
     case "AUTHENTICATION_LOGOUT": {
-      // clear cache because of cached contributions
-      if (state.isAuthenticated) {
-        Cache.clear();
-      }
-
       return {
         ...state,
         mustChangePassword: false,
-        isAuthenticated: false,
         error: null,
       };
     }
@@ -54,7 +44,6 @@ const AuthReducer: Reducer<AuthState, ReduxAction> = (
     case "CHANGE_PASSWORD":
       return {
         ...state,
-        isAuthenticated: true,
         mustChangePassword: true,
         error: null,
       };

package/src/redux/reducers/__tests__/AuthReducer.spec.js

@@ -3,13 +3,11 @@ import AuthReducer from "../AuthReducer";
 describe("authentication reducer", () => {
   it("should return the initial state", () => {
     expect(AuthReducer(undefined, {})).toStrictEqual({
-      isAuthenticated: false,
       mustChangePassword: false,
       error: null,
     });
 
     expect(AuthReducer()).toStrictEqual({
-      isAuthenticated: false,
       mustChangePassword: false,
       error: null,
     });
@@ -24,7 +22,6 @@ describe("authentication reducer", () => {
         }
       )
     ).toStrictEqual({
-      isAuthenticated: true,
       mustChangePassword: false,
       error: null,
     });
@@ -49,7 +46,6 @@ describe("authentication reducer", () => {
     expect(
       AuthReducer(
         {
-          isAuthenticated: true,
           mustChangePassword: false,
           error: null,
         },
@@ -58,7 +54,6 @@ describe("authentication reducer", () => {
         }
       )
     ).toStrictEqual({
-      isAuthenticated: false,
       mustChangePassword: false,
       error: null,
     });
@@ -68,7 +63,6 @@ describe("authentication reducer", () => {
     expect(
       AuthReducer(
         {
-          isAuthenticated: false,
           mustChangePassword: false,
           error: "In error",
         },
@@ -77,7 +71,6 @@ describe("authentication reducer", () => {
         }
       )
     ).toStrictEqual({
-      isAuthenticated: false,
       mustChangePassword: false,
       error: null,
     });
@@ -87,7 +80,6 @@ describe("authentication reducer", () => {
     expect(
       AuthReducer(
         {
-          isAuthenticated: true,
           mustChangePassword: false,
           error: null,
         },
@@ -96,7 +88,6 @@ describe("authentication reducer", () => {
         }
       )
     ).toStrictEqual({
-      isAuthenticated: true,
       mustChangePassword: true,
       error: null,
     });

package/src/redux/types.js

@@ -168,7 +168,6 @@ export type ReduxAction =
 
 // Redux state
 export type AuthState = {
-  +isAuthenticated: boolean,
   +mustChangePassword: boolean,
   +error: ?string,
 };

package/src/utils/helpers/checkResource.js

@@ -17,6 +17,8 @@ export const resourceExists = (url: string | Href): boolean => {
   xhr.open("HEAD", fullUrl, false);
   xhr.setRequestHeader("Accept", "application/json");
   xhr.setRequestHeader("Content-Type", "application/json");
+  xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
+
   xhr.send();
 
   return xhr.status !== 404;
@@ -34,6 +36,7 @@ export const resourceRedirectsToSecureLogin = (url: string | Href): boolean => {
   xhr.open("HEAD", fullUrl, false);
   xhr.setRequestHeader("Accept", "application/json");
   xhr.setRequestHeader("Content-Type", "application/json");
+  xhr.setRequestHeader("X-Requested-With", "XMLHttpRequest");
   xhr.send();
 
   const responseURL = xhr.responseURL ?? "";