Changeset f735304 in Klonkt

Timestamp:

06/18/2026 03:46:25 AM (3 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

94a876f

Parents:

586f9dd

Message:

Hub: /sites/:slug → 301 to canonical /user/:slug (single URL scheme)

resolveSite permanently redirects the legacy /sites/ form to /user/ (preserves
path + querystring; hub mode only; does not affect /admin/sites). The only
internal /sites/ link (admin-sites list) now points directly to /user/.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@…>

Location:

src

Files:

• middleware/site.js (modified) (1 diff)
• views/pages/admin-sites.ejs (modified) (1 diff)

src/middleware/site.js

@@ -33 +33 @@
   // pinnen altijd op de primaire site.
   if (tenancy === 'hub') {
-    // Een Klonkt-site is bereikbaar via /user/:slug (canoniek) én /sites/:slug (legacy).
+    // Een Klonkt-site is canoniek bereikbaar via /user/:slug. /sites/:slug is een
+    // legacy-alias → 301 naar de canonieke vorm zodat er één URL-schema overblijft
+    // (behoudt pad + querystring; raakt /admin/sites NIET, dat begint met /admin/).
     const m = req.path.match(/^\/(sites|user)\/([a-zA-Z0-9_-]+)(\/.*)?$/);
     if (m) {
+      if (m[1] === 'sites') {
+        return res.redirect(301, req.originalUrl.replace(/^\/sites\//, '/user/'));
+      }
       const site = db.prepare('SELECT * FROM sites WHERE slug = ?').get(m[2]);
       if (site) {
         res.locals.site = site;
-        req.url = (m[3] || '/'); // strip /<prefix>/:slug zodat downstream de rest ziet
-        res.locals.siteUrlBase = `/${m[1]}/${m[2]}`;
+        req.url = (m[3] || '/'); // strip /user/:slug zodat downstream de rest ziet
+        res.locals.siteUrlBase = `/user/${m[2]}`;
         return next();
       }

src/views/pages/admin-sites.ejs

@@ -35 +35 @@
             <div class="ax-site-meta">
               <div class="ax-site-name">
-                <a href="/sites/<%= s.slug %>"><%= s.title %></a>
+                <a href="/user/<%= s.slug %>"><%= s.title %></a>
                 <% if (s.is_primary) { %>
                   <span class="ax-pill ax-pill-primary" title="Hoofd-/labelsite van deze installatie">★ primair</span>