🐛 Removed /share suffix from shared URLs

Author: peterzimon

apps/portal/src/components/pages/share-modal.js

@@ -398,8 +398,22 @@ const getTwitterCreator = () => {
     return getHostDocument().querySelector('meta[name="twitter:creator"]')?.content || '';
 };
 
+const normalizeShareUrl = (url) => {
+    if (!url) {
+        return '';
+    }
+
+    try {
+        const normalized = new URL(url, getHostWindow().location.href);
+        normalized.pathname = normalized.pathname.replace(/\/share\/?$/, '/');
+        return normalized.href;
+    } catch (_) {
+        return url;
+    }
+};
+
 const getShareUrl = () => {
-    return getCanonicalUrl() || getHostWindow().location.href;
+    return normalizeShareUrl(getCanonicalUrl()) || normalizeShareUrl(getHostWindow().location.href);
 };
 
 const getShareTitle = () => {

apps/portal/test/unit/components/pages/share-modal.test.js

@@ -24,6 +24,7 @@ describe('ShareModal', () => {
         vi.clearAllMocks();
         document.title = '';
         document.head.innerHTML = '';
+        window.history.pushState({}, '', '/post/test/share/?ref=mail');
     });
 
     afterEach(() => {
@@ -190,8 +191,9 @@ describe('ShareModal', () => {
 
         const linkedInLink = getByRole('link', {name: 'LinkedIn'});
         const linkedInUrl = new URL(linkedInLink.getAttribute('href'));
+        const expectedShareUrl = `${window.location.origin}/post/test/?ref=mail`;
 
-        expect(linkedInUrl.searchParams.get('url')).toBe(window.location.href);
+        expect(linkedInUrl.searchParams.get('url')).toBe(expectedShareUrl);
 
         const twitterLink = getByRole('link', {name: 'X (Twitter)'});
         const twitterUrl = new URL(twitterLink.getAttribute('href'));
@@ -245,7 +247,7 @@ describe('ShareModal', () => {
         fireEvent.click(copyButton);
 
         await waitFor(() => {
-            expect(copyTextToClipboard).toHaveBeenCalledWith(window.location.href);
+            expect(copyTextToClipboard).toHaveBeenCalledWith(`${window.location.origin}/post/test/?ref=mail`);
             expect(getByRole('button', {name: 'Copied'})).toBeInTheDocument();
         });
 
@@ -255,4 +257,20 @@ describe('ShareModal', () => {
             expect(getByRole('button', {name: 'Copy link'})).toBeInTheDocument();
         });
     });
+
+    test('normalizes canonical share URL by removing /share suffix', () => {
+        addHeadTag({
+            tagName: 'link',
+            attrs: {
+                rel: 'canonical',
+                href: 'https://example.com/post/share/?ref=test'
+            }
+        });
+
+        const {getByRole} = setup();
+        const twitterLink = getByRole('link', {name: 'X (Twitter)'});
+        const twitterUrl = new URL(twitterLink.getAttribute('href'));
+
+        expect(twitterUrl.searchParams.get('url')).toBe('https://example.com/post/?ref=test');
+    });
 });