fix: it should handle already encoded parts in the URL when redirecting

Author: omBratteng

__tests__/redirector.ts

@@ -105,6 +105,22 @@ describe('GET /r/:postId', () => {
       .expect(302)
       .expect('Location', 'http://localhost:5002/posts/p1-p1');
   });
+
+  it('should not escape already encoded URL', async () => {
+    await con
+      .getRepository(ArticlePost)
+      .update(
+        { id: 'p1' },
+        { url: 'http://p1.com/hello%world/%f0%9f%9a%80-to-the-🌔' },
+      );
+    return request(app.server)
+      .get('/r/p1')
+      .expect(302)
+      .expect(
+        'Location',
+        'http://p1.com/hello%world/%f0%9f%9a%80-to-the-%F0%9F%8C%94?ref=dailydev',
+      );
+  });
 });
 
 describe('GET /:id/profile-image', () => {

package.json

@@ -96,6 +96,7 @@
     "deepmerge": "^4.3.1",
     "dotenv": "17.2.2",
     "emoji-regex": "^10.5.0",
+    "encodeurl": "^2.0.0",
     "eventsource": "^2.0.2",
     "fast-json-stringify": "^6.0.1",
     "fastify": "^5.6.0",
@@ -148,6 +149,7 @@
     "@faker-js/faker": "^9.8.0",
     "@fastify/static": "^8.2.0",
     "@swc/core": "^1.13.5",
+    "@types/encodeurl": "^1.0.3",
     "@types/express": "^5.0.3",
     "@types/humanize-duration": "^3.27.4",
     "@types/jest": "^29.5.14",

pnpm-lock.yaml

@@ -1,5 +1,6 @@
 import { URL } from 'url';
 import { FastifyInstance } from 'fastify';
+import encodeurl from 'encodeurl';
 import { ArticlePost, Post } from '../entity';
 import { getDiscussionLink, notifyView } from '../common';
 import createOrGetConnection from '../db';
@@ -35,7 +36,7 @@ export default async function (fastify: FastifyInstance): Promise<void> {
       }
       const url = new URL(post.url);
       url.searchParams.append('ref', 'dailydev');
-      const encodedUri = encodeURI(url.href);
+      const encodedUri = encodeurl(url.href);
       if (req.isBot) {
         return res.status(302).redirect(encodedUri);
       }