@eeacms/volto-cca-policy 0.3.122 → 0.3.124

package/CHANGELOG.md

@@ -4,6 +4,24 @@ 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).
 
+### [0.3.124](https://github.com/eea/volto-cca-policy/compare/0.3.123...0.3.124) - 12 May 2026
+
+#### :bug: Bug Fixes
+
+- fix: remove error logging from RSS middleware [kreafox - [`eae5722`](https://github.com/eea/volto-cca-policy/commit/eae5722a3c438542156a69344fa88e826e01c58a)]
+- fix: remove localhost fallback from RSS middleware [kreafox - [`6a3eba6`](https://github.com/eea/volto-cca-policy/commit/6a3eba614ba7158a9ccb95d43456b3555ec95c6d)]
+- fix: redo some changes, cleanup, improve image generation, use addHeadersFactory from volto [kreafox - [`94784a5`](https://github.com/eea/volto-cca-policy/commit/94784a5ab00a9e97b713ee4d9cd8d1ccc2adaec2)]
+- fix: normalize API path handling in RSS middleware [kreafox - [`f8ba94c`](https://github.com/eea/volto-cca-policy/commit/f8ba94c500ebabd7938547620dad3b673b8f1d5f)]
+- fix: normalize API path handling in RSS middleware [kreafox - [`4ce5633`](https://github.com/eea/volto-cca-policy/commit/4ce5633ec048132c07fc461d08d4ea3a8c6caa00)]
+
+### [0.3.123](https://github.com/eea/volto-cca-policy/compare/0.3.122...0.3.123) - 11 May 2026
+
+#### :bug: Bug Fixes
+
+- fix: improve error logging [kreafox - [`58bfd70`](https://github.com/eea/volto-cca-policy/commit/58bfd70ce2155de6f8a773b8bcf9482ceb704211)]
+- fix: add error logging in RSS middleware [kreafox - [`048d715`](https://github.com/eea/volto-cca-policy/commit/048d7154a118367a1ce4c6660c71517f8f049d55)]
+- fix: improve image URL resolution [kreafox - [`f3e2e32`](https://github.com/eea/volto-cca-policy/commit/f3e2e323b8d9c9a77e1656c1f2f8a09592733b86)]
+
 ### [0.3.122](https://github.com/eea/volto-cca-policy/compare/0.3.121...0.3.122) - 8 May 2026
 
 #### :bug: Bug Fixes
@@ -298,7 +316,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINSFILE] add package version in sonarqube [valentinab25 - [`e901251`](https://github.com/eea/volto-cca-policy/commit/e901251592eb54609fbc7eb8fcf7bd452c2da9cd)]
 
 ### [0.3.102](https://github.com/eea/volto-cca-policy/compare/0.3.101...0.3.102) - 24 February 2026
 
@@ -308,7 +325,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINSFILE] use sonarqube branches [EEA Jenkins - [`8b3699a`](https://github.com/eea/volto-cca-policy/commit/8b3699a6cbaef662b5e80884ac2c1f7dc9c6591e)]
 
 ### [0.3.101](https://github.com/eea/volto-cca-policy/compare/0.3.100...0.3.101) - 28 January 2026
 
@@ -596,7 +612,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - style: fix item spacing [kreafox - [`7d4535d`](https://github.com/eea/volto-cca-policy/commit/7d4535dbc486e6cb80fc55d6ac8c7c01d9cf48af)]
 - chore: code cleanup [kreafox - [`842419b`](https://github.com/eea/volto-cca-policy/commit/842419b1bce3dc624755c81c9dea672198cab9e2)]
 - style: update teaser block styling [kreafox - [`1e0cad8`](https://github.com/eea/volto-cca-policy/commit/1e0cad8e1ed3ae827ee868dce8ad50b292a937ba)]
-- chore: update Makefile, run yarn i18n [kreafox - [`61e6962`](https://github.com/eea/volto-cca-policy/commit/61e6962901068ae6512265417a730bd9befd65fe)]
 - chore: move styling to theme folder [kreafox - [`8cf6a1b`](https://github.com/eea/volto-cca-policy/commit/8cf6a1b8b14abf472a9c61b28db574f6d9e0bd3b)]
 - chore: remove ArrayWidget customization [kreafox - [`249bf93`](https://github.com/eea/volto-cca-policy/commit/249bf93054f7726c3d57a8b8ca01b75cd0d30522)]
 - chore: remove Footer customization [kreafox - [`7038af3`](https://github.com/eea/volto-cca-policy/commit/7038af37d48a328dfc31746f3fa84973e2f840ab)]
@@ -3359,13 +3374,10 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Refs #260715 rast-block wip [Tripon Eugen - [`f19d54e`](https://github.com/eea/volto-cca-policy/commit/f19d54e0b9a6a86bf344eb85b6a1cda7f3de91bf)]
 - Refs #260715 rast-block wip [Tripon Eugen - [`2828537`](https://github.com/eea/volto-cca-policy/commit/2828537b6c084cd1a82162d552fb4ef025b71f9f)]
 - Refs #260715 rast-block updates [Tripon Eugen - [`1e803e5`](https://github.com/eea/volto-cca-policy/commit/1e803e5bd3d3fb7558f261c76c68866be7beb8b5)]
-- test: [JENKINS] Use java17 for sonarqube scanner [valentinab25 - [`0a15e1b`](https://github.com/eea/volto-cca-policy/commit/0a15e1b2ad081233685e80d5b3c60a8663f6b896)]
-- test: [JENKINS] Run cypress in started frontend container [valentinab25 - [`9554e44`](https://github.com/eea/volto-cca-policy/commit/9554e44c92a621a52b2adb5a4830fb084ee5734b)]
 ### [0.1.49](https://github.com/eea/volto-cca-policy/compare/0.1.48...0.1.49) - 15 November 2023
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Refactor automated testing [valentinab25 - [`7b820a6`](https://github.com/eea/volto-cca-policy/commit/7b820a6369c2ddd5203b1a4abe352cb4bb43db7a)]
 - chore: husky, lint-staged use fixed versions [valentinab25 - [`f0a8061`](https://github.com/eea/volto-cca-policy/commit/f0a8061c275c236deb00087c23fac9860a073106)]
 
 #### :hammer_and_wrench: Others
@@ -3382,9 +3394,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 - Refs #259267 - jenkins test [Tripon Eugen - [`cacd31e`](https://github.com/eea/volto-cca-policy/commit/cacd31e7b1afe0983674ed5c7632d2e1d7fa752e)]
 - Refs #259267 - jenkins [Tripon Eugen - [`5b3affe`](https://github.com/eea/volto-cca-policy/commit/5b3affee8401239de10097884c1b7f2349d15ec0)]
 - Refs #259267 - add When, lead image and title to files [Tripon Eugen - [`2cedb23`](https://github.com/eea/volto-cca-policy/commit/2cedb237f898af9057e13fba94b615ef71077204)]
-- test: [JENKINS] Add cpu limit on cypress docker [valentinab25 - [`4d607a5`](https://github.com/eea/volto-cca-policy/commit/4d607a576e9d0a5c34e48c41b409e7df616ee3d6)]
-- test: [JENKINS] Increase shm-size to cypress docker [valentinab25 - [`b7f74d5`](https://github.com/eea/volto-cca-policy/commit/b7f74d53513a6edbfbca5cb6d19687929bb1e5db)]
-- test: [JENKINS] Improve cypress time [valentinab25 - [`db65617`](https://github.com/eea/volto-cca-policy/commit/db656173391f65157098d95d388c25f6429753d8)]
 - Refs #259267 - cca event blocks attachments and check not mandatoty fields [Tripon Eugen - [`3138e5a`](https://github.com/eea/volto-cca-policy/commit/3138e5afb5bfbdbed14e27ed457b16867b7fa414)]
 - Refs #256681 - Fix error in CCA Event view menu. ([React Intl] An id must be provided to format a message.) [GhitaB - [`517eeb8`](https://github.com/eea/volto-cca-policy/commit/517eeb817264a47bbfd6b9b7d22aaf22d44ed224)]
 - Refs #161485 - Fix ECDE name conflict. [GhitaB - [`8bfd99f`](https://github.com/eea/volto-cca-policy/commit/8bfd99ff68bb82a04d1c0ed625fa514fcf46289e)]
@@ -3601,7 +3610,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
 #### :house: Internal changes
 
-- chore: [JENKINS] Remove alpha testing version [valentinab25 - [`ad1ced0`](https://github.com/eea/volto-cca-policy/commit/ad1ced0971ba116c13a3b5fcc039172cc915c919)]
 
 #### :hammer_and_wrench: Others
 
@@ -4082,7 +4090,6 @@ Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 #### :hammer_and_wrench: Others
 
 - Refs #158294 - Update supported languages list. [GhitaB - [`0a4f91f`](https://github.com/eea/volto-cca-policy/commit/0a4f91f39b7edc367bd4c127d6a8f273c7788361)]
-- Add Sonarqube tag using cca-frontend addons list [EEA Jenkins - [`8f1f9ce`](https://github.com/eea/volto-cca-policy/commit/8f1f9ce6c22805670cc0800d3c779b6d619d0f31)]
 ### [0.1.1](https://github.com/eea/volto-cca-policy/compare/0.1.0...0.1.1) - 13 December 2022
 
 #### :hammer_and_wrench: Others

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eeacms/volto-cca-policy",
-  "version": "0.3.122",
+  "version": "0.3.124",
   "description": "@eeacms/volto-cca-policy: Volto add-on",
   "main": "src/index.js",
   "author": "European Environment Agency: IDM2 A-Team",

package/src/customizations/@plone-collective/volto-rss-provider/express-middleware.js

@@ -1,8 +1,9 @@
 import express from 'express';
 import superagent from 'superagent';
 import RSS from 'rss';
-import { findBlocks } from '@plone/volto/helpers';
+import { findBlocks, toPublicURL } from '@plone/volto/helpers';
 import config from '@plone/volto/registry';
+import { addHeadersFactory } from '@plone/volto/helpers/Proxy/Proxy';
 
 /**
  * Retrieves the query data (search criteria) used by the listing block of the rss_feed content type
@@ -33,75 +34,68 @@ import config from '@plone/volto/registry';
  * @throws Will throw an error if no query data is found in the listing block or if the request fails.
  */
 async function getRssFeedData(apiPath, APISUFFIX, req, settings) {
-  const request = superagent
-    .get(
-      `${apiPath}${__DEVELOPMENT__ ? '' : APISUFFIX}${req.path.replace(
-        '/rss.xml',
-        '',
-      )}`,
-    )
-    .accept('json');
-
-  const authToken = req.universalCookies.get('auth_token');
-  if (authToken) {
-    request.set('Authorization', `Bearer ${authToken}`);
-  }
-
-  const response = await request;
-  const json = response.body;
-  const listingBlocks = findBlocks(json.blocks, 'listing');
-  const listingBlockId = Array.isArray(listingBlocks)
-    ? listingBlocks[0]
-    : listingBlocks;
-
-  const queryData = listingBlockId
-    ? json.blocks?.[listingBlockId]?.querystring
-    : null;
-  const language = json.language?.token ?? 'en';
-  const description = json.description ?? 'A Volto RSS Feed';
-  const title = json.title;
-  const subjects = json.subjects;
-  const date = json.effective;
-  const max_description_length = json.max_description_length;
-  const max_title_length = json.max_title_length;
-  if (!queryData) {
-    throw new Error('No query data found in listing block');
-  }
+  try {
+    const request = superagent
+      .get(
+        `${apiPath}${__DEVELOPMENT__ ? '' : APISUFFIX}${req.path.replace(
+          '/rss.xml',
+          '',
+        )}`,
+      )
+      .accept('json')
+      .use(addHeadersFactory(req));
 
-  const normalizedQueryData = { ...queryData };
+    const authToken = req.universalCookies?.get?.('auth_token');
+    if (authToken) {
+      request.set('Authorization', `Bearer ${authToken}`);
+    }
 
-  if (normalizedQueryData.sort_order != null) {
-    if (typeof normalizedQueryData.sort_order === 'boolean') {
-      normalizedQueryData.sort_order = normalizedQueryData.sort_order
-        ? 'reverse'
-        : 'ascending';
+    const response = await request;
+    const json = JSON.parse(JSON.stringify(response.body));
+    const listingBlock = findBlocks(json.blocks, 'listing');
+    const queryData = json.blocks?.[listingBlock]?.querystring;
+    const language = json.language?.token ?? 'en';
+    const description = json.description ?? 'A Volto RSS Feed';
+    const title = json.title;
+    const subjects = json.subjects;
+    const date = json.effective;
+    const max_description_length = json.max_description_length;
+    const max_title_length = json.max_title_length;
+    if (!queryData) {
+      throw new Error('No query data found in listing block');
     }
 
-    if (normalizedQueryData.sort_order === 'descending') {
-      normalizedQueryData.sort_order = 'reverse';
+    if (queryData?.sort_order != null) {
+      if (typeof queryData.sort_order === 'boolean') {
+        queryData.sort_order = queryData.sort_order
+          ? 'descending'
+          : 'ascending';
+      }
     }
-  }
 
-  const query = {
-    ...normalizedQueryData,
-    ...(!normalizedQueryData.b_size && {
-      b_size: settings.defaultPageSize,
-    }),
-    query: normalizedQueryData?.query,
-    metadata_fields: '_all',
-    b_start: 0,
-  };
+    const query = {
+      ...queryData,
+      ...(!queryData.b_size && {
+        b_size: settings.defaultPageSize,
+      }),
+      query: queryData?.query,
+      metadata_fields: '_all',
+      b_start: 0,
+    };
 
-  return {
-    query,
-    language,
-    description,
-    title,
-    subjects,
-    date,
-    max_description_length,
-    max_title_length,
-  };
+    return {
+      query,
+      language,
+      description,
+      title,
+      subjects,
+      date,
+      max_description_length,
+      max_title_length,
+    };
+  } catch (err) {
+    throw err;
+  }
 }
 
 /**
@@ -119,39 +113,22 @@ async function getRssFeedData(apiPath, APISUFFIX, req, settings) {
  * @return {Array} An array of items that match the query criteria.
  * @throws Will throw an error if the request fails.
  */
-async function fetchListingItems(query, apiPath, APISUFFIX, authToken) {
-  const request = superagent
-    .post(`${apiPath}${__DEVELOPMENT__ ? '' : APISUFFIX}/@querystring-search`)
-    .send(query)
-    .accept('json');
-
-  if (authToken) {
-    request.set('Authorization', `Bearer ${authToken}`);
-  }
-
-  const response = await request;
-  return response.body.items || [];
-}
-
-function normalizeFeedURL(url, publicURL, apiPath) {
-  if (!url) return publicURL;
-
+async function fetchListingItems(query, apiPath, APISUFFIX, authToken, req) {
   try {
-    const parsedUrl = new URL(url, publicURL);
-
-    if (apiPath) {
-      const apiOrigin = new URL(apiPath).origin;
-      const publicOrigin = new URL(publicURL).origin;
+    const request = superagent
+      .post(`${apiPath}${__DEVELOPMENT__ ? '' : APISUFFIX}/@querystring-search`)
+      .send(query)
+      .accept('json')
+      .use(addHeadersFactory(req));
 
-      if (parsedUrl.origin === apiOrigin) {
-        parsedUrl.protocol = new URL(publicOrigin).protocol;
-        parsedUrl.host = new URL(publicOrigin).host;
-      }
+    if (authToken) {
+      request.set('Authorization', `Bearer ${authToken}`);
     }
 
-    return parsedUrl.toString();
-  } catch {
-    return url;
+    const response = await request;
+    return response.body?.items || [];
+  } catch (err) {
+    throw err;
   }
 }
 
@@ -167,13 +144,6 @@ function truncateText(text = '', maxLength) {
   return text.length > maxLength ? `${text.substring(0, maxLength)}...` : text;
 }
 
-function safeDate(value) {
-  if (!value) return undefined;
-  const d = new Date(value);
-  if (Number.isNaN(d.getTime()) || d.getTime() <= 0) return undefined;
-  return d;
-}
-
 /**
  * Creates an Express middleware for generating an RSS feed using the listing block of the
  * rss_feed content type.
@@ -188,9 +158,6 @@ function make_rssMiddleware() {
   const { settings } = config;
   const APISUFFIX = settings.legacyTraverse ? '' : '/++api++';
   let apiPath = '';
-  const host = process.env.HOST || 'localhost';
-  const port = process.env.PORT || '3000';
-  const ProdapiPath = `http://${host}:${port}`;
   if (settings.internalApiPath && __SERVER__) {
     apiPath = settings.internalApiPath;
   } else if (__DEVELOPMENT__ && settings.devProxyToApiPath) {
@@ -198,9 +165,6 @@ function make_rssMiddleware() {
   } else {
     apiPath = settings.apiPath;
   }
-  if (apiPath === '') {
-    apiPath = ProdapiPath;
-  }
 
   async function rssMiddleware(req, res, next) {
     try {
@@ -218,40 +182,50 @@ function make_rssMiddleware() {
         query,
         apiPath,
         APISUFFIX,
-        req.universalCookies.get('auth_token'),
+        req.universalCookies?.get?.('auth_token'),
+        req,
       );
       const feedOptions = {
         title: truncateText(title, max_title_length),
         description: truncateText(description, max_description_length),
-        feed_url: normalizeFeedURL(req.path, settings.publicURL, apiPath),
+        feed_url: `${settings.publicURL}${req.path}`,
         site_url: settings.publicURL,
         generator: 'RSS Feed Generator',
         language: language,
-        pubDate: safeDate(date),
+        pubDate: new Date(date),
         categories: subjects || [],
       };
 
       const feed = new RSS(feedOptions);
 
       items.forEach((item) => {
-        const link = normalizeFeedURL(item.getURL, settings.publicURL, apiPath);
+        let link = toPublicURL(item['getURL']);
         let enclosure = undefined;
+        if (
+          item.image_field &&
+          item.image_scales &&
+          item.image_scales[item.image_field] &&
+          item.image_scales[item.image_field].length > 0
+        ) {
+          const imageData = item.image_scales[item.image_field][0];
+          const scales = imageData.scales || {};
+          const scale =
+            scales.preview ||
+            scales.large ||
+            scales.teaser ||
+            Object.values(scales)[0];
 
-        const imageData = item.image_scales?.[item.image_field]?.[0];
-        const previewDownload = imageData?.scales?.preview?.download;
-
-        if (previewDownload && imageData.size && imageData['content-type']) {
-          enclosure = {
-            url: normalizeFeedURL(
-              new URL(previewDownload, link).toString(),
-              settings.publicURL,
-              apiPath,
-            ),
-            type: imageData['content-type'],
-            size: imageData.size,
-          };
+          if (scale && scale.download) {
+            const imageUrl = `${link}/${scale.download}`;
+            const mimeType = item['content-type'];
+            const originalSize = imageData.size;
+            enclosure = {
+              url: imageUrl,
+              type: mimeType,
+              size: originalSize,
+            };
+          }
         }
-
         feed.item({
           title: truncateText(item.title, max_title_length),
           description: truncateText(
@@ -260,7 +234,7 @@ function make_rssMiddleware() {
           ),
           url: link,
           guid: item.UID,
-          date: safeDate(item.effective || item.created || item.modified),
+          date: new Date(item.effective),
           author: item.listCreators?.join(', '),
           categories: item.Subject ? item.Subject : [],
           enclosure: enclosure || undefined,
@@ -303,7 +277,7 @@ function make_rssMiddleware() {
 export default function makeMiddlewares() {
   const middleware = express.Router();
   middleware.use(express.urlencoded({ extended: true }));
-  middleware.get('**/rss.xml', make_rssMiddleware());
+  middleware.all('**/rss.xml', make_rssMiddleware());
 
   middleware.id = 'rss-middleware';