feat: password protected page

Author: tiensonqin

deps/publish/src/logseq/publish/meta_store.cljs

@@ -22,6 +22,7 @@
                                   "owner_sub TEXT,"
                                   "created_at INTEGER,"
                                   "updated_at INTEGER,"
+                                  "password_hash TEXT,"
                                   "PRIMARY KEY (graph_uuid, page_uuid)"
                                   ");"))
     (let [cols (publish-common/get-sql-rows (publish-common/sql-exec sql "PRAGMA table_info(pages);"))
@@ -31,7 +32,9 @@
       (when-not (contains? col-names "page_tags")
         (publish-common/sql-exec sql "ALTER TABLE pages ADD COLUMN page_tags TEXT;"))
       (when-not (contains? col-names "short_id")
-        (publish-common/sql-exec sql "ALTER TABLE pages ADD COLUMN short_id TEXT;")))
+        (publish-common/sql-exec sql "ALTER TABLE pages ADD COLUMN short_id TEXT;"))
+      (when-not (contains? col-names "password_hash")
+        (publish-common/sql-exec sql "ALTER TABLE pages ADD COLUMN password_hash TEXT;")))
     (let [cols (publish-common/get-sql-rows (publish-common/sql-exec sql "PRAGMA table_info(page_refs);"))
           col-names (set (map #(aget % "name") cols))]
       (when (seq col-names)
@@ -109,8 +112,9 @@
                                               "owner_sub,"
                                               "created_at,"
                                               "updated_at,"
-                                              "short_id"
-                                              ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
+                                              "short_id,"
+                                              "password_hash"
+                                              ") VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)"
                                               " ON CONFLICT(graph_uuid, page_uuid) DO UPDATE SET"
                                               " page_uuid=excluded.page_uuid,"
                                               " page_title=excluded.page_title,"
@@ -122,7 +126,8 @@
                                               " r2_key=excluded.r2_key,"
                                               " owner_sub=excluded.owner_sub,"
                                               " updated_at=excluded.updated_at,"
-                                              " short_id=excluded.short_id;")
+                                              " short_id=excluded.short_id,"
+                                              " password_hash=excluded.password_hash;")
                                          (aget body "page_uuid")
                                          (aget body "page_title")
                                          (aget body "page_tags")
@@ -135,7 +140,8 @@
                                          (aget body "owner_sub")
                                          (aget body "created_at")
                                          (aget body "updated_at")
-                                         (aget body "short_id"))
+                                         (aget body "short_id")
+                                         (aget body "password_hash"))
                 (let [refs (aget body "refs")
                       tagged-nodes (aget body "tagged_nodes")
                       graph-uuid (aget body "graph")
@@ -244,6 +250,18 @@
                 row (first rows)]
             (publish-common/json-response {:page (when row (js->clj row :keywordize-keys false))}))
 
+          (= (nth parts 4 nil) "password")
+          (let [rows (publish-common/get-sql-rows
+                      (publish-common/sql-exec sql
+                                               (str "SELECT password_hash "
+                                                    "FROM pages WHERE graph_uuid = ? AND page_uuid = ? LIMIT 1;")
+                                               graph-uuid
+                                               page-uuid))
+                row (first rows)]
+            (if-not row
+              (publish-common/not-found)
+              (publish-common/json-response {:password_hash (aget row "password_hash")})))
+
           (= (nth parts 4 nil) "refs")
           (let [rows (publish-common/get-sql-rows
                       (publish-common/sql-exec sql

deps/publish/src/logseq/publish/publish.css

@@ -339,6 +339,51 @@ a:hover {
   letter-spacing: 0.12em;
 }
 
+.password-card {
+  margin: 20px auto 0;
+  max-width: 460px;
+  padding: 24px;
+  border-radius: 18px;
+  border: 1px solid var(--border);
+  background: #fff7ee;
+  box-shadow: 0 14px 24px rgba(217, 125, 63, 0.12);
+  text-align: center;
+}
+
+.password-form {
+  margin-top: 18px;
+  display: grid;
+  gap: 12px;
+}
+
+.password-label {
+  font-size: 12px;
+  text-transform: uppercase;
+  letter-spacing: 0.14em;
+  color: var(--muted);
+}
+
+.password-input {
+  width: 100%;
+  padding: 10px 12px;
+  border-radius: 10px;
+  border: 1px solid rgba(31, 26, 20, 0.2);
+  font-size: 15px;
+  font-family: inherit;
+}
+
+.password-input:focus {
+  outline: 2px solid rgba(217, 125, 63, 0.4);
+  border-color: rgba(217, 125, 63, 0.6);
+}
+
+.password-error {
+  margin: 8px 0 0;
+  color: #b42318;
+  font-size: 13px;
+  font-weight: 600;
+}
+
 .not-found {
   text-align: center;
   padding: 32px 16px 8px;

deps/publish/src/logseq/publish/publish.js

@@ -1,19 +1,27 @@
 import katexPkg from "https://esm.sh/katex@0.16.10?bundle";
+
+// Core CodeMirror pieces
+import { EditorState } from "https://esm.sh/@codemirror/state@6";
 import {
-  EditorState,
   EditorView,
-  basicSetup,
-  defaultHighlightStyle,
+  lineNumbers,
+} from "https://esm.sh/@codemirror/view@6";
+
+// Highlighting
+import {
   syntaxHighlighting,
-  javascript,
-  python,
-  html,
-  css,
-  json,
-  markdown,
-  sql,
-  clojure,
-} from "https://esm.sh/@codemirror/basic-setup@0.20.0?bundle";
+  defaultHighlightStyle,
+} from "https://esm.sh/@codemirror/language@6";
+
+// Languages
+import { javascript } from "https://esm.sh/@codemirror/lang-javascript@6";
+import { python } from "https://esm.sh/@codemirror/lang-python@6";
+import { html } from "https://esm.sh/@codemirror/lang-html@6";
+import { json } from "https://esm.sh/@codemirror/lang-json@6";
+import { markdown } from "https://esm.sh/@codemirror/lang-markdown@6";
+import { sql } from "https://esm.sh/@codemirror/lang-sql@6";
+import { css } from "https://esm.sh/@codemirror/lang-css@6";
+import { clojure } from "https://esm.sh/@nextjournal/lang-clojure";
 
 const katex = katexPkg.default || katexPkg;
 
@@ -54,6 +62,7 @@ const initPublish = () => {
     const codeEl = block.querySelector("code");
     const doc = codeEl ? codeEl.textContent : "";
     block.textContent = "";
+
     const lang = (block.dataset.lang || "").toLowerCase();
     const langExt = (() => {
       if (!lang) return null;
@@ -62,24 +71,28 @@ const initPublish = () => {
       }
       if (["py", "python"].includes(lang)) return python();
       if (["html", "htm"].includes(lang)) return html();
-      if (["css", "scss"].includes(lang)) return css();
       if (["json"].includes(lang)) return json();
       if (["md", "markdown"].includes(lang)) return markdown();
       if (["sql"].includes(lang)) return sql();
+      if (["css", "scss"].includes(lang)) return css();
       if (["clj", "cljc", "cljs", "clojure"].includes(lang)) return clojure();
       return null;
     })();
+
     const extensions = [
-      basicSetup,
+      lineNumbers(),
       syntaxHighlighting(defaultHighlightStyle),
       EditorView.editable.of(false),
       EditorView.lineWrapping,
     ];
+
     if (langExt) extensions.push(langExt);
+
     const state = EditorState.create({
       doc,
       extensions,
     });
+
     new EditorView({ state, parent: block });
   });
 };

deps/publish/src/logseq/publish/render.cljs

@@ -696,6 +696,37 @@
                [:p.tag-sub "This page hasn't been published yet."]]]]]
     (str "<!doctype html>" (render-hiccup doc))))
 
+(defn render-password-html
+  [graph-uuid page-uuid wrong?]
+  (let [title "Protected page"
+        doc [:html
+             [:head
+              [:meta {:charset "utf-8"}]
+              [:meta {:name "viewport" :content "width=device-width,initial-scale=1"}]
+              [:title title]
+              [:link {:rel "stylesheet" :href "/static/publish.css"}]]
+             [:body
+              [:main.wrap
+               [:div.page-toolbar
+                (when graph-uuid
+                  [:a.toolbar-btn {:href (str "/graph/" graph-uuid)} "Home"])]
+               [:div.password-card
+                [:h1 title]
+                [:p.tag-sub "This page is password protected."]
+                (when wrong?
+                  [:p.password-error "Incorrect password."])
+                [:form.password-form {:method "GET"}
+                 (when page-uuid
+                   [:input {:type "hidden" :name "page" :value page-uuid}])
+                 [:label.password-label {:for "publish-password"} "Enter password"]
+                 [:input.password-input {:id "publish-password"
+                                         :name "password"
+                                         :type "password"
+                                         :placeholder "Password"
+                                         :required true}]
+                 [:button.toolbar-btn {:type "submit"} "Unlock"]]]]]]]
+    (str "<!doctype html>" (render-hiccup doc))))
+
 (defn render-404-html
   []
   (let [title "Page not found"