Changeset 6351545 in Klonkt for src/middleware

Timestamp:

06/14/2026 08:18:50 AM (3 months ago)

Author:

roboburr <roboburr@…>

Branches:

main

Children:

07775b7

Parents:

9e27d64

Message:

tenancy: runtime Solo/Hub mode + mode-aware /admin (Phase 1)

Admin can switch live between modes in Admin -> Settings:

• solo: exactly one site (the primary/owner site), no /sites routing, leaner /admin.
• hub: main site + /sites/:slug routing (company; /gebruikers + assignment flow = Phase 2).

Switching is non-destructive (hides only, deletes nothing).

• app_settings (key/value singleton) + SettingsService (cached getTenancy/setTenancy).
• resolveSite: solo pins to the primary site + disables /sites/:slug + host mapping.
• /admin/settings (god-only) toggle; /admin dashboard rewritten, mode-aware.

Tested on the demo: solo/hub dashboard tiles, /sites routing per mode, toggle back/forth.

Co-Authored-By: Claude <noreply@…>

File:

• src/middleware/site.js (modified) (1 diff)

src/middleware/site.js

@@ -11 +11 @@
 
 import db from '../config/database.js';
+import { getTenancy } from '../services/SettingsService.js';
 
 export function resolveSite(req, res, next) {
-  // Try /sites/:slug pattern
-  const m = req.path.match(/^\/sites\/([a-zA-Z0-9_-]+)(\/.*)?$/);
-  if (m) {
-    const slug = m[1];
-    const site = db.prepare('SELECT * FROM sites WHERE slug = ?').get(slug);
-    if (site) {
-      res.locals.site = site;
-      // Strip /sites/:slug from req.url so downstream routes see the rest
-      req.url = (m[2] || '/');
-      // Also rewrite originalUrl for redirect targets to keep the prefix
-      res.locals.siteUrlBase = `/sites/${slug}`;
-      return next();
+  const tenancy = getTenancy();
+  res.locals.tenancy = tenancy; // ook beschikbaar voor views
+
+  // In HUB-mode mapt /sites/:slug en (later) een subdomein naar een specifieke
+  // site. In SOLO-mode bestaat er maar één site: we slaan die routing over en
+  // pinnen altijd op de primaire site.
+  if (tenancy === 'hub') {
+    const m = req.path.match(/^\/sites\/([a-zA-Z0-9_-]+)(\/.*)?$/);
+    if (m) {
+      const site = db.prepare('SELECT * FROM sites WHERE slug = ?').get(m[1]);
+      if (site) {
+        res.locals.site = site;
+        req.url = (m[2] || '/'); // strip /sites/:slug zodat downstream de rest ziet
+        res.locals.siteUrlBase = `/sites/${m[1]}`;
+        return next();
+      }
+    }
+    const host = req.get('host')?.toLowerCase().replace(/:\d+$/, '');
+    if (host) {
+      const site = db.prepare('SELECT * FROM sites WHERE slug = ?').get(host);
+      if (site) {
+        res.locals.site = site;
+        res.locals.siteUrlBase = '';
+        return next();
+      }
     }
   }
 
-  // Future: subdomain mapping
-  const host = req.get('host')?.toLowerCase().replace(/:\d+$/, '');
-  if (host) {
-    const site = db.prepare('SELECT * FROM sites WHERE slug = ?').get(host);
-    if (site) {
-      res.locals.site = site;
-      res.locals.siteUrlBase = '';
-      return next();
-    }
-  }
-
-  // Default: pick first site
+  // Solo (of hub zonder match): de primaire/owner-site (eerste aangemaakte).
   const defaultSite = db.prepare('SELECT * FROM sites ORDER BY created_at ASC LIMIT 1').get();
   if (defaultSite) {