apostrophe 4.24.0 → 4.24.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 4.24.1 (2025-12-04)
+
+### Fixes
+
+* Fixes soft-redirect module to decode the URL path before matching historic URLs, ensuring proper matching of accents, Cyrillic, and other non-ASCII characters in old URLs. While this was not a new issue, the fix is of new importance now that a migration path to eliminate accent marks in existing slugs has been introduced in version 4.24.0.
+
 ## 4.24.0 (2025-11-25)
 
 ### Adds

package/modules/@apostrophecms/i18n/index.js

@@ -1262,32 +1262,59 @@ module.exports = {
         usage: 'Remove Latin accent characters from all document slugs. Usage: node app @apostrophecms/i18n:strip-slug-accents',
         async task() {
           let docChanged = 0;
+          const docErrors = [];
+          if (!self.shouldStripAccents()) {
+            self.apos.util.log('The option `stripUrlAccents` is not enabled. Aborting.');
+            return;
+          }
 
           await self.apos.migration.eachDoc({}, 5, async doc => {
-            const slug = doc.slug;
-            const req = self.apos.task.getAdminReq({
-              locale: doc.aposLocale?.split(':')[0] || self.defaultLocale
-            });
-            if (!self.shouldStripAccents()) {
-              return;
-            }
+            const oldSlug = doc.slug;
+            const newSlug = _.deburr(doc.slug);
 
-            doc.slug = _.deburr(doc.slug);
-            if (slug === doc.slug) {
-              return;
-            }
-            const manager = self.apos.doc.getManager(doc.type);
-            if (!manager) {
-              return;
+            try {
+              if (oldSlug === newSlug) {
+                return;
+              }
+              await self.apos.doc.db.updateOne(
+                { _id: doc._id },
+                { $set: { slug: newSlug } }
+              );
+              docChanged++;
+              self.apos.util.log(`[${doc.type}] [${doc.aposLocale}] "${oldSlug}" -> "${newSlug}"`);
+            } catch (e) {
+              const isUniqueIndexError = (e && e.code === 11000) || /E11000/.test(e?.message || '');
+              const message = isUniqueIndexError
+                ? `[ERROR] Duplicate slug "${newSlug}"`
+                : `[ERROR] Failed "${newSlug}" slug update: ${e.message}`;
+              docErrors.push({
+                message,
+                data: {
+                  docId: doc._id,
+                  oldSlug,
+                  newSlug
+                },
+                stack: isUniqueIndexError
+                  ? ''
+                  : e.stack.split('\n').slice(1).map(line => line.trim())
+              });
             }
-            await manager.update(req, doc, { permissions: false });
-            docChanged++;
-            self.apos.util.log(`Updated doc [${req.locale}] "${slug}" -> "${doc.slug}"`);
           });
 
+          if (docErrors.length) {
+            for (const err of docErrors) {
+              self.apos.util.error(err.message, err.data, err.stack);
+            }
+          }
+
           self.apos.util.log(
-            `Updated ${docChanged} document slug(s).`
+            `${docChanged} updated, ${docErrors.length} failed.`
           );
+
+          // Ensure proper exit code for the task runner
+          if (docErrors.length) {
+            throw new Error('Some documents failed to update their slugs.');
+          }
         }
       }
     };

package/modules/@apostrophecms/soft-redirect/index.js

@@ -40,7 +40,12 @@ module.exports = {
     return {
       '@apostrophecms/page:notFound': {
         async notFoundRedirect(req) {
-          const urlPathname = parseurl.original(req).pathname;
+          // Save the raw, encoded path, no change here, only the var name
+          const rawPathname = parseurl.original(req).pathname;
+          // URL decode the pathname for matching historic URLs
+          // so that e.g. accents, Cyrillic, and other non-ASCII characters
+          // are properly handled.
+          const urlPathname = decodeURI(rawPathname);
 
           const doc = await self.apos.doc
             .find(req, {

package/modules/@apostrophecms/task/index.js

@@ -87,7 +87,7 @@ module.exports = {
               await task.task(self.apos.argv);
               return self.exit(after, 0, span);
             } catch (e) {
-              console.error(e);
+              console.error(e.message);
               return self.exit(after, 1, span, e);
             }
           });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apostrophe",
-  "version": "4.24.0",
+  "version": "4.24.1",
   "description": "The Apostrophe Content Management System.",
   "main": "index.js",
   "scripts": {

package/test/i18n.js

@@ -289,7 +289,7 @@ describe('static i18n', function() {
     assert.strictEqual(browserData.adminLocale, 'fr');
   });
 
-  it('should replace accented characters in slugs and attachment names when configured', async function () {
+  it('should replace accented characters in slugs when configured', async function () {
     await t.destroy(apos);
     apos = await t.create({
       root: module,
@@ -313,6 +313,14 @@ describe('static i18n', function() {
         }
       }
     });
+    await apos.doc.db.deleteMany({
+      type: {
+        $in: [
+          'default-page',
+          'test-piece'
+        ]
+      }
+    });
     // Create content while accents are NOT stripped so we have accented slugs
     apos.i18n.options.stripUrlAccents = false;
 
@@ -325,15 +333,6 @@ describe('static i18n', function() {
       title: 'C\'est déjà l\'été'
     });
 
-    // Also add a page that already uses the non-accented slug to verify
-    // that the accent-stripping task de-duplicates slugs appropriately
-    const nonAccentedExisting = await apos.doc.insert(req, {
-      type: 'default-page',
-      visibility: 'public',
-      title: 'C\'est deja l\'ete',
-      slug: '/c-est-deja-l-ete'
-    });
-
     // Add a piece with accented characters in its title so slug preserves accents
     await apos.doc.insert(req, {
       type: 'test-piece',
@@ -349,12 +348,6 @@ describe('static i18n', function() {
     assert(pageBefore);
     assert.equal(pageBefore.slug, '/c-est-déjà-l-été');
 
-    const nonAccentedPageBefore = await apos.doc.db.findOne({
-      _id: nonAccentedExisting._id
-    });
-    assert(nonAccentedPageBefore);
-    assert.equal(nonAccentedPageBefore.slug, '/c-est-deja-l-ete');
-
     const pieceBefore = await apos.doc.db.findOne({
       type: 'test-piece',
       title: 'Café au lait'
@@ -369,18 +362,7 @@ describe('static i18n', function() {
     // Verify that the slugs and attachment names have been updated correctly
     const pageAfter = await apos.doc.db.findOne({ _id: pageBefore._id });
     assert(pageAfter);
-    // After stripping accents, this page's slug would conflict with the
-    // existing non-accented page. Ensure de-duplication added a suffix.
-    assert(pageAfter.slug.startsWith('/c-est-deja-l-ete'));
-    assert.notEqual(pageAfter.slug, '/c-est-deja-l-ete');
-    assert(/\/c-est-deja-l-ete\d+$/.test(pageAfter.slug));
-
-    // Verify the pre-existing non-accented page kept its slug unchanged
-    const nonAccentedPageAfter = await apos.doc.db.findOne({
-      _id: nonAccentedPageBefore._id
-    });
-    assert(nonAccentedPageAfter);
-    assert.equal(nonAccentedPageAfter.slug, '/c-est-deja-l-ete');
+    assert.equal(pageAfter.slug, '/c-est-deja-l-ete');
 
     const pieceAfter = await apos.doc.db.findOne({ _id: pieceBefore._id });
     assert(pieceAfter);
@@ -389,6 +371,194 @@ describe('static i18n', function() {
     // Restore default for other tests
     apos.i18n.options.stripUrlAccents = false;
   });
+
+  it('should report duplicated slug errors', async function () {
+    await t.destroy(apos);
+    apos = await t.create({
+      root: module,
+      modules: {
+        '@apostrophecms/i18n': {
+          options: {
+            stripUrlAccents: true,
+            locales: {
+              en: {},
+              fr: {
+                prefix: '/fr'
+              }
+            }
+          }
+        },
+        'default-page': {
+          extend: '@apostrophecms/page-type'
+        },
+        'test-piece': {
+          extend: '@apostrophecms/piece-type'
+        }
+      }
+    });
+    await apos.doc.db.deleteMany({
+      type: {
+        $in: [
+          'default-page',
+          'test-piece'
+        ]
+      }
+    });
+    apos.i18n.options.stripUrlAccents = false;
+    const req = apos.task.getReq();
+
+    await apos.doc.insert(req, {
+      type: 'default-page',
+      visibility: 'public',
+      title: 'C\'est déjà l\'été'
+    });
+    const nonAccentedExisting = await apos.doc.insert(req, {
+      type: 'default-page',
+      visibility: 'public',
+      title: 'C\'est deja l\'ete',
+      slug: '/c-est-deja-l-ete'
+    });
+    const pageBefore = await apos.doc.db.findOne({
+      type: 'default-page',
+      title: 'C\'est déjà l\'été'
+    });
+
+    assert(pageBefore);
+    assert.equal(pageBefore.slug, '/c-est-déjà-l-été');
+
+    const nonAccentedPageBefore = await apos.doc.db.findOne({
+      _id: nonAccentedExisting._id
+    });
+    assert(nonAccentedPageBefore);
+    assert.equal(nonAccentedPageBefore.slug, '/c-est-deja-l-ete');
+
+    apos.i18n.options.stripUrlAccents = true;
+    await assert.rejects(
+      async () => {
+        await apos.task.invoke('@apostrophecms/i18n:strip-slug-accents');
+      },
+      {
+        message: 'Some documents failed to update their slugs.'
+      }
+    );
+    apos.i18n.options.stripUrlAccents = false;
+  });
+
+  it('should redirect accent-preserving URLs to their stripped versions after running the accent task', async function () {
+    await t.destroy(apos);
+    apos = await t.create({
+      root: module,
+      modules: {
+        '@apostrophecms/i18n': {
+          options: {
+            stripUrlAccents: true,
+            locales: {
+              en: {},
+              fr: {
+                prefix: '/fr'
+              }
+            }
+          }
+        },
+        'default-page': {
+          extend: '@apostrophecms/page-type'
+        },
+        'test-piece': {
+          extend: '@apostrophecms/piece-type'
+        },
+        'test-piece-page': {
+          extend: '@apostrophecms/piece-page-type',
+          options: {
+            pieceType: 'test-piece'
+          }
+        }
+      }
+    });
+    await apos.doc.db.deleteMany({
+      type: {
+        $in: [
+          'default-page',
+          'test-piece',
+          'test-piece-page'
+        ]
+      }
+    });
+
+    apos.i18n.options.stripUrlAccents = false;
+
+    const req = apos.task.getReq();
+    const jar = apos.http.jar();
+    const parentId = '_home';
+
+    const accentedPage = await apos.page.insert(req, parentId, 'lastChild', {
+      type: 'default-page',
+      visibility: 'public',
+      title: 'C\'est déjà l\'été'
+    });
+
+    const pieceIndexPage = await apos.page.insert(req, parentId, 'lastChild', {
+      type: 'test-piece-page',
+      visibility: 'public',
+      title: 'Test Piece Page',
+      slug: '/test-piece'
+    });
+
+    const piece = await apos.doc.insert(req, {
+      type: 'test-piece',
+      visibility: 'public',
+      title: 'Café au lait'
+    });
+
+    const encodedOldPageUrl = encodeURI(accentedPage.slug);
+    const oldPieceSlug = piece.slug;
+    const pieceIndexSlug = pieceIndexPage.slug;
+    const encodedOldPieceUrl = encodeURI(`${pieceIndexSlug}/${oldPieceSlug}`);
+
+    // Visit the legacy URLs before stripping accents so historic
+    // redirects exist.
+    await apos.http.get(encodedOldPageUrl, {
+      followRedirect: false,
+      fullResponse: true,
+      redirect: 'manual',
+      jar
+    });
+    await apos.http.get(encodedOldPieceUrl, {
+      followRedirect: false,
+      fullResponse: true,
+      redirect: 'manual',
+      jar
+    });
+
+    apos.i18n.options.stripUrlAccents = true;
+    await apos.task.invoke('@apostrophecms/i18n:strip-slug-accents');
+
+    const updatedPage = await apos.doc.db.findOne({ _id: accentedPage._id });
+    const updatedPiece = await apos.doc.db.findOne({ _id: piece._id });
+    assert(updatedPage);
+    assert(updatedPiece);
+
+    const pageResponse = await apos.http.get(encodedOldPageUrl, {
+      followRedirect: false,
+      fullResponse: true,
+      redirect: 'manual',
+      jar
+    });
+    assert.strictEqual(pageResponse.status, 302);
+    assert.strictEqual(pageResponse.headers.location, `${apos.http.getBase()}${updatedPage.slug}`);
+
+    const pieceResponse = await apos.http.get(encodedOldPieceUrl, {
+      followRedirect: false,
+      fullResponse: true,
+      redirect: 'manual',
+      jar
+    });
+    assert.strictEqual(pieceResponse.status, 302);
+    assert.strictEqual(
+      pieceResponse.headers.location,
+      `${apos.http.getBase()}${pieceIndexSlug}/${updatedPiece.slug}`
+    );
+    apos.i18n.options.stripUrlAccents = false;
+  });
 });
 
 describe('private locales', function() {