@eeacms/volto-clms-theme 1.1.293 → 1.1.295

package/CHANGELOG.md

@@ -4,6 +4,20 @@ 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).
 
+### [1.1.295](https://github.com/eea/volto-clms-theme/compare/1.1.294...1.1.295) - 8 June 2026
+
+#### :house: Internal changes
+
+- style: Automated code fix [eea-jenkins - [`cb21bf3`](https://github.com/eea/volto-clms-theme/commit/cb21bf3e1891a59fce5e8cbd2bd2185ba67cae03)]
+
+#### :hammer_and_wrench: Others
+
+- fix routing [Dobricean Ioan Dorian - [`a640f1f`](https://github.com/eea/volto-clms-theme/commit/a640f1f55e682d2f6b5a007df8e12aa4283d27b1)]
+### [1.1.294](https://github.com/eea/volto-clms-theme/compare/1.1.293...1.1.294) - 5 June 2026
+
+#### :hammer_and_wrench: Others
+
+- Fix redirect [Dobricean Ioan Dorian - [`18dc53d`](https://github.com/eea/volto-clms-theme/commit/18dc53d5b4fde69cf2ce95013ce7624b8dcb156d)]
 ### [1.1.293](https://github.com/eea/volto-clms-theme/compare/1.1.292...1.1.293) - 5 June 2026
 
 #### :house: Internal changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-clms-theme",
-  "version": "1.1.293",
+  "version": "1.1.295",
   "description": "volto-clms-theme: Volto theme for CLMS site",
   "main": "src/index.js",
   "author": "CodeSyntax for the European Environment Agency",

package/src/components/CLMSLoginView/AuthomaticLoginPlone.jsx

@@ -14,7 +14,6 @@ import {
   Grid,
 } from 'semantic-ui-react';
 import { FormattedMessage, defineMessages, injectIntl } from 'react-intl';
-import qs from 'query-string';
 import { useCookies } from 'react-cookie';
 
 import { Helmet } from '@plone/volto/helpers';
@@ -34,6 +33,7 @@ import {
   oidcRedirect,
 } from '@plone-collective/volto-authomatic/actions';
 import AuthProviders from '@plone-collective/volto-authomatic/components/AuthProviders/AuthProviders';
+import { getReturnUrl } from './loginUrl';
 
 const messages = defineMessages({
   login: {
@@ -92,21 +92,6 @@ const messages = defineMessages({
   },
 });
 
-/**
- * Get return 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 === '/login'
-      ? '/'
-      : location.pathname.replace('/login', ''))
-  }`;
-}
-
 /**
  * Combined Login function.
  * @function Login
@@ -131,10 +116,7 @@ function Login({ intl }) {
   const error = useSelector((state) => state.userSession.login.error);
   const ploneLoading = useSelector((state) => state.userSession.login.loading);
 
-  const returnUrl =
-    qs.parse(location.search).return_url ||
-    location.pathname.replace(/\/login\/?$/, '').replace(/\/logout\/?$/, '') ||
-    '/';
+  const returnUrl = getReturnUrl(location);
 
   useEffect(() => {
     dispatch(listAuthOptions());

package/src/components/CLMSLoginView/loginUrl.js

@@ -0,0 +1,9 @@
+import qs from 'query-string';
+
+export function getReturnUrl(location) {
+  return (
+    qs.parse(location.search || '').return_url ||
+    (location.pathname || '/').replace(/\/(?:login|login-plone)\/?$/, '') ||
+    '/'
+  );
+}

package/src/index.js

@@ -53,6 +53,7 @@ import reducers from './reducers';
 import CookieBanner from 'volto-cookie-banner/CookieBannerContainer';
 import CLMSLoginView from './components/CLMSLoginView/CLMSLogin';
 import AuthomaticLoginPlone from './components/CLMSLoginView/AuthomaticLoginPlone';
+import { withCLMSLoginRoutes } from './loginRoutes';
 //SLATE CONFIGURATION
 import installLinkEditor from '@plone/volto-slate/editor/plugins/AdvancedLink';
 
@@ -271,23 +272,11 @@ const applyConfig = (config) => {
   );
 
   config.addonRoutes = [
-    ...config.addonRoutes,
-    {
-      path: '/login-plone',
-      component: AuthomaticLoginPlone,
-    },
-    {
-      path: '/**/login-plone',
-      component: AuthomaticLoginPlone,
-    },
-    {
-      path: '/login',
-      component: CLMSLoginView,
-    },
-    {
-      path: '/**/login',
-      component: CLMSLoginView,
-    },
+    ...withCLMSLoginRoutes(
+      config.addonRoutes,
+      CLMSLoginView,
+      AuthomaticLoginPlone,
+    ),
     {
       path: '/profile',
       component: ProfileView,

package/src/loginRoutes.js

@@ -0,0 +1,35 @@
+const clmsLoginPaths = [
+  '/login',
+  '/**/login',
+  '/login-plone',
+  '/**/login-plone',
+];
+
+const routeHasCLMSLoginPath = (route) => {
+  const paths = Array.isArray(route.path) ? route.path : [route.path];
+  return paths.some((path) => clmsLoginPaths.includes(path));
+};
+
+export const buildLoginRoutes = (Login, LoginPlone) => [
+  {
+    path: '/login',
+    component: Login,
+  },
+  {
+    path: '/**/login',
+    component: Login,
+  },
+  {
+    path: '/login-plone',
+    component: LoginPlone,
+  },
+  {
+    path: '/**/login-plone',
+    component: LoginPlone,
+  },
+];
+
+export const withCLMSLoginRoutes = (addonRoutes, Login, LoginPlone) => [
+  ...buildLoginRoutes(Login, LoginPlone),
+  ...(addonRoutes || []).filter((route) => !routeHasCLMSLoginPath(route)),
+];