@eeacms/volto-eea-website-policy 2.0.0 → 2.1.0

package/CHANGELOG.md

@@ -4,17 +4,35 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-### [2.0.0](https://github.com/eea/volto-eea-website-policy/compare/1.14.1-beta.1...2.0.0) - 22 April 2024
+### [2.1.0](https://github.com/eea/volto-eea-website-policy/compare/2.0.0...2.1.0) - 9 May 2024
+
+#### :rocket: New Features
+
+- feat: integrated EEA Azure AD authentication - refs #258877 [Alexandru Ghica - [`7ff72c1`](https://github.com/eea/volto-eea-website-policy/commit/7ff72c1567524ce73ec72e6a30e91d6d29342510)]
+
+#### :hammer_and_wrench: Others
+
+- Release 2.1.0 [alin - [`da22af4`](https://github.com/eea/volto-eea-website-policy/commit/da22af436092236d7ef6e8568e3eca4813d517b5)]
+## [2.0.0](https://github.com/eea/volto-eea-website-policy/compare/1.15.0...2.0.0) - 22 April 2024
 
 #### :rocket: New Features
 
 - feat: Release 2.0.0 - Volto 17 support [alin - [`d6cf5c8`](https://github.com/eea/volto-eea-website-policy/commit/d6cf5c8f41950a94cd68e7a36a45b5be8cc6195b)]
-- feat: Default view layout restriction to Manager - refs #268249 [ichim-david - [`1840c1b`](https://github.com/eea/volto-eea-website-policy/commit/1840c1bd9aae6ce18a23800ce618f8bbe47525ab)]
 
 #### :nail_care: Enhancements
 
 - refactor: Move customizations to volto-eea-website-theme [alin - [`9641437`](https://github.com/eea/volto-eea-website-policy/commit/9641437c7f10ba6c7ec1f896b180b49d2718a7d0)]
 
+### [1.15.0](https://github.com/eea/volto-eea-website-policy/compare/1.14.1-beta.1...1.15.0) - 9 May 2024
+
+#### :rocket: New Features
+
+- feat: integrated EEA Azure AD authentication - refs #258877 [Alexandru Ghica - [`1897659`](https://github.com/eea/volto-eea-website-policy/commit/18976594a9c7b4f2640dc79ab6420f509e7de668)]
+- feat: Default view layout restriction to Manager - refs #268249 [ichim-david - [`1840c1b`](https://github.com/eea/volto-eea-website-policy/commit/1840c1bd9aae6ce18a23800ce618f8bbe47525ab)]
+
+#### :hammer_and_wrench: Others
+
+- Release 1.15.0 [alin - [`f0d61d8`](https://github.com/eea/volto-eea-website-policy/commit/f0d61d8bd99687f0460acd0a1ad6e200206b5b6a)]
 ### [1.14.1-beta.1](https://github.com/eea/volto-eea-website-policy/compare/1.14.1-beta.0...1.14.1-beta.1) - 19 April 2024
 
 #### :hammer_and_wrench: Others

package/jest-addon.config.js

@@ -1,4 +1,4 @@
-require('dotenv').config({ path: __dirname + '/.env' })
+require('dotenv').config({ path: __dirname + '/.env' });
 
 module.exports = {
   testMatch: ['**/src/addons/**/?(*.)+(spec|test).[jt]s?(x)'],
@@ -8,6 +8,8 @@ module.exports = {
   ],
   moduleNameMapper: {
     '\\.(css|less|scss|sass)$': 'identity-obj-proxy',
+    '@plone-collective/volto-authomatic/(.*)$':
+      '<rootDir>/node_modules/@plone-collective/volto-authomatic/src/$1',
     '@plone/volto/cypress': '<rootDir>/node_modules/@plone/volto/cypress',
     '@plone/volto/babel': '<rootDir>/node_modules/@plone/volto/babel',
     '@plone/volto/(.*)$': '<rootDir>/node_modules/@plone/volto/src/$1',
@@ -26,7 +28,7 @@ module.exports = {
       '<rootDir>/node_modules/@plone/volto/jest-addons-loader.js',
   },
   transformIgnorePatterns: [
-    '/node_modules/(?!(@plone|@root|@package|@eeacms)/).*/',
+    '/node_modules/(?!(@plone|@root|@package|@eeacms|@plone-collective)/).*/',
   ],
   transform: {
     '^.+\\.js(x)?$': 'babel-jest',
@@ -48,4 +50,4 @@ module.exports = {
       '<rootDir>/node_modules/@eeacms/volto-eea-website-policy/jest.setup.js',
     ],
   }),
-}
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-eea-website-policy",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "@eeacms/volto-eea-website-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",
@@ -17,15 +17,21 @@
     "url": "git@github.com:eea/volto-eea-website-policy.git"
   },
   "addons": [
-    "@eeacms/volto-widget-dataprovenance"
+    "@eeacms/volto-widget-dataprovenance",
+    "@plone-collective/volto-authomatic"
   ],
   "dependencies": {
-    "@eeacms/volto-widget-dataprovenance": "*"
+    "@eeacms/volto-widget-dataprovenance": "*",
+    "@plone-collective/volto-authomatic": "2.0.1"
+  },
+  "resolutions": {
+    "@plone-collective/volto-authomatic": "2.0.1"
   },
   "devDependencies": {
     "@cypress/code-coverage": "^3.10.0",
     "@plone/scripts": "*",
     "babel-plugin-transform-class-properties": "^6.24.1",
+    "cypress": "13.1.0",
     "dotenv": "^16.3.2",
     "husky": "^8.0.3",
     "lint-staged": "^14.0.1",

package/src/components/AzureLogin/Login.jsx

@@ -0,0 +1,103 @@
+/**
+ * Login container.
+ * @module components/Login/Login
+ */
+import React, { useEffect, useState } from 'react';
+import {
+  authomaticRedirect,
+  listAuthOptions,
+  oidcRedirect,
+} from '@plone-collective/volto-authomatic/actions';
+import { injectIntl } from 'react-intl';
+import { useSelector, useDispatch } from 'react-redux';
+import { useLocation } from 'react-router-dom';
+import LoginForm from '@plone-collective/volto-authomatic/components/Login/LoginForm';
+import qs from 'query-string';
+import { useCookies } from 'react-cookie';
+
+/**
+ * Get retur url function.
+ * @function getReturnUrl
+ * @param  {Object} location Location object.
+ * @returns {string} Return url.
+ */
+function getReturnUrl(location) {
+  return `${
+    qs.parse(location.search).return_url ||
+    (location.pathname === '/azure_login'
+      ? '/'
+      : location.pathname.replace('/azure_login', ''))
+  }`;
+}
+
+/**
+ * Login function.
+ * @function Login
+ * @returns {JSX.Element} Markup of the Login page.
+ */
+function Login({ intl }) {
+  const dispatch = useDispatch();
+  const [startedOAuth, setStartedOAuth] = useState(false);
+  const [startedOIDC, setStartedOIDC] = useState(false);
+  const loading = useSelector((state) => state.authOptions.loading);
+  const options = useSelector((state) => state.authOptions.options);
+  const loginOAuthValues = useSelector((state) => state.authomaticRedirect);
+  const loginOIDCValues = useSelector((state) => state.oidcRedirect);
+  const location = useLocation();
+  const [, setCookie] = useCookies();
+
+  useEffect(() => {
+    dispatch(listAuthOptions());
+  }, [dispatch]);
+
+  useEffect(() => {
+    const next_url = loginOAuthValues.next_url;
+    const session = loginOAuthValues.session;
+    if (next_url && session && startedOAuth) {
+      setStartedOAuth(false);
+      // Give time to save state to localstorage
+      setTimeout(function () {
+        window.location.href = next_url;
+      }, 500);
+    }
+  }, [startedOAuth, loginOAuthValues]);
+
+  const onSelectProvider = (provider) => {
+    setStartedOAuth(true);
+    setCookie('return_url', getReturnUrl(location), { path: '/' });
+    dispatch(authomaticRedirect(provider.id));
+  };
+
+  useEffect(() => {
+    const next_url = loginOIDCValues.next_url;
+    if (next_url && startedOIDC) {
+      setStartedOIDC(false);
+      // Give time to save state to localstorage
+      setTimeout(function () {
+        window.location.href = next_url;
+      }, 500);
+    }
+  }, [startedOIDC, loginOIDCValues]);
+
+  useEffect(() => {
+    if (
+      options !== undefined &&
+      options.length === 1 &&
+      options[0].id === 'oidc'
+    ) {
+      setStartedOIDC(true);
+      dispatch(oidcRedirect('oidc'));
+    }
+  }, [options, dispatch]);
+
+  return (
+    <LoginForm
+      loading={loading}
+      providers={options}
+      action={'login'}
+      onSelectProvider={onSelectProvider}
+    />
+  );
+}
+
+export default injectIntl(Login);

package/src/components/AzureLogin/Login.test.jsx

@@ -0,0 +1,179 @@
+import { render, screen, fireEvent } from '@testing-library/react';
+import { Provider } from 'react-intl-redux';
+import configureStore from 'redux-mock-store';
+import { useLocation } from 'react-router-dom';
+import { listAuthOptions } from '@plone-collective/volto-authomatic/actions';
+import '@testing-library/jest-dom/extend-expect';
+
+import Login from './Login';
+
+const mockStore = configureStore();
+
+jest.mock('react-router-dom', () => ({
+  ...jest.requireActual('react-router-dom'),
+  useLocation: jest.fn(),
+}));
+
+jest.useFakeTimers();
+
+describe('Login component', () => {
+  beforeEach(() => {
+    useLocation.mockReturnValue({ pathname: '/azure_login' });
+  });
+
+  it('renders correctly with loading state', () => {
+    const store = mockStore({
+      authOptions: { loading: true, options: [] },
+      authomaticRedirect: {
+        next_url: '/dashboard',
+        session: true,
+      },
+      oidcRedirect: {
+        next_url: '/dashboard',
+        session: true,
+      },
+      intl: {
+        locale: 'en',
+        messages: {},
+        formatMessage: jest.fn(),
+      },
+    });
+
+    render(
+      <Provider store={store}>
+        <Login />
+      </Provider>,
+    );
+
+    expect(screen.getByText('Loading')).toBeInTheDocument();
+  });
+
+  it('dispatches listAuthOptions on mount', () => {
+    const store = mockStore({
+      authOptions: { loading: true, options: [] },
+      authomaticRedirect: {
+        next_url: '/dashboard',
+        session: true,
+      },
+      oidcRedirect: {
+        next_url: '/dashboard',
+        session: true,
+      },
+      intl: {
+        locale: 'en',
+        messages: {},
+        formatMessage: jest.fn(),
+      },
+    });
+    const dispatch = jest.spyOn(store, 'dispatch');
+
+    render(
+      <Provider store={store}>
+        <Login />
+      </Provider>,
+    );
+
+    expect(dispatch).toHaveBeenCalledWith(listAuthOptions());
+  });
+
+  it('renders providers from the store', () => {
+    const store = mockStore({
+      authOptions: {
+        loading: false,
+        options: [
+          { id: 'facebook', title: 'Facebook' },
+          { id: 'twitter', title: 'Twitter' },
+        ],
+      },
+      authomaticRedirect: {
+        next_url: '/dashboard',
+        session: true,
+      },
+      oidcRedirect: {
+        next_url: '/dashboard',
+        session: true,
+      },
+      intl: {
+        locale: 'en',
+        messages: {},
+        formatMessage: jest.fn(),
+      },
+    });
+
+    render(
+      <Provider store={store}>
+        <Login />
+      </Provider>,
+    );
+
+    // Assert that the provider buttons are present
+    expect(
+      screen.getByRole('button', { name: /Facebook/i }),
+    ).toBeInTheDocument();
+    expect(
+      screen.getByRole('button', { name: /Twitter/i }),
+    ).toBeInTheDocument();
+
+    fireEvent.click(screen.getByRole('button', { name: /Facebook/i }));
+  });
+
+  it('clicks on GitHub button for OAuth login', () => {
+    useLocation.mockReturnValue({ pathname: '/login' });
+
+    const store = mockStore({
+      authOptions: {
+        loading: false,
+        options: [{ id: 'github', title: 'GitHub' }],
+      },
+      authomaticRedirect: { next_url: '/dashboard', session: true },
+      oidcRedirect: {
+        next_url: '/dashboard',
+        session: true,
+      },
+      intl: {
+        locale: 'en',
+        messages: {},
+        formatMessage: jest.fn(),
+      },
+    });
+
+    render(
+      <Provider store={store}>
+        <Login />
+      </Provider>,
+    );
+
+    fireEvent.click(screen.getByRole('button', { name: /GitHub/i }));
+  });
+
+  it('renders correctly with loading state', () => {
+    const store = mockStore({
+      authOptions: {
+        loading: true,
+        options: [{ id: 'oidc', title: 'OIDC' }],
+      },
+      authomaticRedirect: {
+        next_url: '/dashboard',
+        session: true,
+      },
+      oidcRedirect: {
+        next_url: '/dashboard',
+        session: true,
+      },
+      intl: {
+        locale: 'en',
+        messages: {},
+        formatMessage: jest.fn(),
+      },
+    });
+
+    render(
+      <Provider store={store}>
+        <Login />
+      </Provider>,
+    );
+
+    expect(screen.getByText('Loading')).toBeInTheDocument();
+    jest.advanceTimersByTime(500);
+  });
+});

package/src/index.js

@@ -2,6 +2,9 @@ import { runtimeConfig } from '@plone/volto/runtime_config';
 import installContextNavigationBlock from '@eeacms/volto-eea-website-policy/components/Blocks/ContextNavigation';
 import { appendGroup } from './helpers';
 import { FrequencyOfDissemination } from '@eeacms/volto-eea-website-policy/components/Widgets/FrequencyOfDissemination';
+import Login from '@eeacms/volto-eea-website-policy/components/AzureLogin/Login.jsx';
+import Logout from '@plone-collective/volto-authomatic/components/Logout/Logout.jsx';
+import { Login as VoltoLogin } from '@plone/volto/components';
 
 const restrictedBlocks = [
   'imagecards',
@@ -40,7 +43,7 @@ const overrideBlocks = {
 const applyConfig = (config) => {
   // #158717#note-25 any path that isn't static, en or controlpanel is treated as external
   const notInEN =
-    /^(?!(#|\/en|\/login-authomatic|\/fallback_login|\/static|\/controlpanel|\/cypress|\/login|\/logout|\/contact-form|\/passwordreset)).*$/;
+    /^(?!(#|\/en|\/login-authomatic|\/azure_login|\/fallback_login|\/static|\/controlpanel|\/cypress|\/login|\/logout|\/contact-form|\/passwordreset)).*$/;
   config.settings.externalRoutes = [
     ...(config.settings.externalRoutes || []),
     {
@@ -52,6 +55,17 @@ const applyConfig = (config) => {
     },
   ];
 
+  // #258877 Make Azure AD login to be at route /azure_login and EIONET LDAP login to be at /login
+  config.addonRoutes = [
+    { path: '/azure_login', component: Login },
+    { path: '/**/azure_login', component: Login },
+    { path: '/login', component: VoltoLogin },
+    { path: '/**/login', component: VoltoLogin },
+    { path: '/logout', component: Logout },
+    { path: '/**/logout', component: Logout },
+    ...(config.addonRoutes || []),
+  ];
+
   // #160689 Redirect contact-form to contact-us
   config.settings.contactForm = '/en/about/contact-us';