carbon-tokenization

Running

tfrere HF Staff commited on Apr 13

Commit

0784389

1 Parent(s): 3616e87

feat: clean routing - /editor for auth, / for published article

- GET / serves published HTML if available, otherwise login page
- GET /editor requires HF OAuth, serves the SPA editor
- In dev mode (no SPACE_ID), / serves the editor directly
- Cleaner login page with styled "Sign in with HF" button

Made-with: Cursor

Files changed (1) hide show

backend/src/server.ts +66 -31

backend/src/server.ts CHANGED Viewed

@@ -260,50 +260,85 @@ const staticDir =
     ? join(__dirname, "..", "frontend-dist")
     : join(__dirname, "..", "..", "frontend", "dist");
 if (existsSync(staticDir)) {
   app.use(express.static(staticDir));
-  app.get("*", async (req, res) => {
-    // If OAuth is enabled, serve published HTML to unauthenticated visitors
     if (oauthEnabled) {
       const token = extractToken(req.headers.cookie);
       const user = await resolveUser(token);
       if (!user || !user.canEdit) {
-        // Try to serve published version
-        const docMatch = req.query.doc as string | undefined;
-        const docName = docMatch || "default";
-        const safeName = docName.replace(/[^a-zA-Z0-9_-]/g, "_");
-        const publishedPath = join(DATA_DIR, "published", safeName, "index.html");
-        if (existsSync(publishedPath)) {
-          res.sendFile(publishedPath);
-          return;
-        }
-        // No published version: show a simple message
-        if (!user) {
-          res.status(200).send(`
-            <!DOCTYPE html>
-            <html>
-            <head><title>Collab Editor</title></head>
-            <body style="display:flex;align-items:center;justify-content:center;height:100vh;margin:0;font-family:system-ui;background:#0a0a0a;color:#aaa;">
-              <div style="text-align:center;">
-                <h1 style="color:#fff;">This article is not yet published</h1>
-                <p>Log in with your Hugging Face account to edit.</p>
-                <a href="/oauth/authorize" style="color:#958DF1;">Log in</a>
-              </div>
-            </body>
-            </html>
-          `);
-          return;
-        }
       }
     }
-    // Authenticated editors get the SPA
     res.sendFile(join(staticDir, "index.html"));
   });
 }
 // ---------- Start ----------

     ? join(__dirname, "..", "frontend-dist")
     : join(__dirname, "..", "..", "frontend", "dist");
+function getDocName(req: express.Request): string {
+  const raw = (req.query.doc as string) || "default";
+  return raw.replace(/[^a-zA-Z0-9_-]/g, "_");
+}
+function getPublishedPath(docName: string): string {
+  return join(DATA_DIR, "published", docName, "index.html");
+}
+function sendLoginPage(res: express.Response) {
+  res.status(200).send(`<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>Collab Editor</title>
+  <style>
+    * { margin: 0; padding: 0; box-sizing: border-box; }
+    body { display: flex; align-items: center; justify-content: center; height: 100vh;
+           font-family: system-ui, -apple-system, sans-serif; background: #0a0a0a; color: #aaa; }
+    .card { text-align: center; max-width: 420px; padding: 2rem; }
+    h1 { color: #fff; font-size: 1.5rem; margin-bottom: 0.5rem; }
+    p { margin-bottom: 1.5rem; line-height: 1.5; }
+    a.btn { display: inline-block; padding: 0.6rem 1.5rem; border-radius: 8px;
+            background: #958DF1; color: #fff; text-decoration: none; font-weight: 500;
+            transition: opacity 0.15s; }
+    a.btn:hover { opacity: 0.85; }
+  </style>
+</head>
+<body>
+  <div class="card">
+    <h1>This article is not yet published</h1>
+    <p>Log in with your Hugging Face account to access the editor.</p>
+    <a class="btn" href="/oauth/authorize">Sign in with Hugging Face</a>
+  </div>
+</body>
+</html>`);
+}
 if (existsSync(staticDir)) {
   app.use(express.static(staticDir));
+  // GET /editor → requires auth, serves the SPA
+  app.get("/editor", async (req, res) => {
     if (oauthEnabled) {
       const token = extractToken(req.headers.cookie);
       const user = await resolveUser(token);
       if (!user || !user.canEdit) {
+        // Not logged in or no write access → redirect to OAuth login
+        const docParam = req.query.doc ? `?doc=${req.query.doc}` : "";
+        res.redirect(`/oauth/authorize`);
+        return;
       }
     }
     res.sendFile(join(staticDir, "index.html"));
   });
+  // GET / (and all other paths) → public article or login prompt
+  app.get("*", async (req, res) => {
+    if (!oauthEnabled) {
+      // Dev mode: serve editor directly
+      res.sendFile(join(staticDir, "index.html"));
+      return;
+    }
+    // In production with OAuth: serve the published article if it exists
+    const docName = getDocName(req);
+    const publishedPath = getPublishedPath(docName);
+    if (existsSync(publishedPath)) {
+      res.sendFile(publishedPath);
+      return;
+    }
+    // No published version → login page
+    sendLoginPage(res);
+  });
 }
 // ---------- Start ----------