@lifeaitools/clauth 0.3.10 → 0.3.11

package/cli/commands/serve.js

@@ -221,36 +221,32 @@ const KEY_URLS = {
 };
 
 // ── OAuth import config ─────────────────────
-// Services where Google downloads a JSON file. jsonFields = keys to extract
-// from the downloaded JSON (top-level or under an "installed"/"web" wrapper).
-// extra = additional fields the user must provide separately.
-const OAUTH_IMPORT = {
-  "gmail": {
-    jsonFields: ["client_id", "client_secret"],
-    extra: [{ key: "refresh_token", label: "Refresh Token", hint: "From Google OAuth Playground or your app's auth callback" }]
-  }
+// OAuth services with atomic fields — each field saved as clauth.<service>.<key>
+// No JSON blob parsing. Each field is its own vault secret.
+const OAUTH_FIELDS = {
+  "gmail": [
+    { key: "client_id",     label: "Client ID",     hint: "From Google Cloud Console → APIs & Services → Credentials → OAuth client", required: true },
+    { key: "client_secret", label: "Client Secret", hint: "From Google Cloud Console OAuth client",                                    required: true },
+    { key: "refresh_token", label: "Refresh Token", hint: "From Google OAuth Playground or your app's auth callback",                 required: true },
+    { key: "from_address",  label: "From Address",  hint: "Gmail address to send from (e.g. dave@life.ai)",                           required: false },
+  ]
 };
 
 function renderSetPanel(name) {
-  const imp = OAUTH_IMPORT[name];
-  if (imp) {
-    const extraHtml = imp.extra.map(f => \`
+  const fields = OAUTH_FIELDS[name];
+  if (fields) {
+    const fieldsHtml = fields.map(f => \`
       <div class="oauth-field">
-        <label class="oauth-label">\${f.label}</label>
+        <label class="oauth-label">\${f.label}\${f.required ? "" : " <span style='color:#475569'>(optional)</span>"}</label>
         \${f.hint ? \`<div class="oauth-hint">\${f.hint}</div>\` : ""}
         <input type="text" class="oauth-input" id="ofield-\${name}-\${f.key}" placeholder="Paste \${f.label}…" spellcheck="false" autocomplete="off">
       </div>
     \`).join("");
     return \`
       <div class="set-panel" id="set-panel-\${name}">
-        <label>Set <strong>\${name}</strong> credentials — paste directly from Google, never in chat</label>
+        <label>Set <strong>\${name}</strong> credentials — paste directly from source, never in chat</label>
         <div class="oauth-fields">
-          <div class="oauth-field">
-            <label class="oauth-label">OAuth JSON from Google Cloud Console</label>
-            <div class="oauth-hint">Download from APIs & Services → Credentials → your OAuth client → ↓ Download JSON</div>
-            <textarea class="set-input" id="ofield-\${name}-json" placeholder='{"installed":{"client_id":"…","client_secret":"…",...}}' spellcheck="false" rows="3"></textarea>
-          </div>
-          \${extraHtml}
+          \${fieldsHtml}
         </div>
         <div class="set-foot">
           <button class="btn btn-save" onclick="saveKey('\${name}')">Save</button>
@@ -453,63 +449,68 @@ function toggleSet(name) {
 
 async function saveKey(name) {
   const msg = document.getElementById("set-msg-" + name);
-  const imp = OAUTH_IMPORT[name];
-  let value;
-
-  if (imp) {
-    const jsonEl = document.getElementById("ofield-" + name + "-json");
-    const raw = jsonEl ? jsonEl.value.trim() : "";
-    if (!raw) { msg.className = "set-msg fail"; msg.textContent = "Paste the OAuth JSON first."; return; }
-    let parsed;
-    try { parsed = JSON.parse(raw); } catch { msg.className = "set-msg fail"; msg.textContent = "Invalid JSON — copy the full file content."; return; }
-    // Google wraps fields under "installed" or "web"
-    const src = parsed.installed || parsed.web || parsed;
-    const obj = {};
-    for (const k of imp.jsonFields) {
-      if (!src[k]) { msg.className = "set-msg fail"; msg.textContent = k + " not found in JSON."; return; }
-      obj[k] = src[k];
-    }
-    for (const f of imp.extra) {
+  const fields = OAUTH_FIELDS[name];
+
+  if (fields) {
+    // Validate required fields first
+    for (const f of fields) {
+      if (!f.required) continue;
       const el = document.getElementById("ofield-" + name + "-" + f.key);
-      const v = el ? el.value.trim() : "";
-      if (!v) { msg.className = "set-msg fail"; msg.textContent = f.label + " is required."; return; }
-      obj[f.key] = v;
+      if (!el || !el.value.trim()) {
+        msg.className = "set-msg fail"; msg.textContent = f.label + " is required."; return;
+      }
+    }
+    // Save each field as an atomic vault key: clauth.<service>.<key>
+    msg.className = "set-msg"; msg.textContent = "Saving…";
+    try {
+      for (const f of fields) {
+        const el = document.getElementById("ofield-" + name + "-" + f.key);
+        const v = el ? el.value.trim() : "";
+        if (!v) continue; // skip optional empty fields
+        const r = await fetch(BASE + "/set/" + name + "." + f.key, {
+          method: "POST",
+          headers: { "Content-Type": "application/json" },
+          body: JSON.stringify({ value: v })
+        }).then(r => r.json());
+        if (r.locked) { showLockScreen(); return; }
+        if (r.error) throw new Error(r.error);
+      }
+      msg.className = "set-msg ok"; msg.textContent = "✓ Saved";
+      fields.forEach(f => { const el = document.getElementById("ofield-" + name + "-" + f.key); if (el) el.value = ""; });
+    } catch (e) {
+      msg.className = "set-msg fail"; msg.textContent = e.message || "Save failed";
+      return;
     }
-    value = JSON.stringify(obj);
   } else {
     const input = document.getElementById("set-input-" + name);
-    value = input ? input.value.trim() : "";
+    const value = input ? input.value.trim() : "";
     if (!value) { msg.className = "set-msg fail"; msg.textContent = "Value is empty."; return; }
-  }
 
-  msg.className = "set-msg"; msg.textContent = "Saving…";
-  try {
-    const r = await fetch(BASE + "/set/" + name, {
-      method: "POST",
-      headers: { "Content-Type": "application/json" },
-      body: JSON.stringify({ value })
-    }).then(r => r.json());
-
-    if (r.locked) { showLockScreen(); return; }
-    if (r.error) throw new Error(r.error);
-    msg.className = "set-msg ok"; msg.textContent = "✓ Saved";
-    if (imp) {
-      const jsonEl = document.getElementById("ofield-" + name + "-json");
-      if (jsonEl) jsonEl.value = "";
-      imp.extra.forEach(f => { const el = document.getElementById("ofield-" + name + "-" + f.key); if (el) el.value = ""; });
-    } else {
+    msg.className = "set-msg"; msg.textContent = "Saving…";
+    try {
+      const r = await fetch(BASE + "/set/" + name, {
+        method: "POST",
+        headers: { "Content-Type": "application/json" },
+        body: JSON.stringify({ value })
+      }).then(r => r.json());
+
+      if (r.locked) { showLockScreen(); return; }
+      if (r.error) throw new Error(r.error);
+      msg.className = "set-msg ok"; msg.textContent = "✓ Saved";
       const inp = document.getElementById("set-input-" + name);
       if (inp) inp.value = "";
+    } catch (e) {
+      msg.className = "set-msg fail"; msg.textContent = e.message || "Save failed";
+      return;
     }
-    const dot = document.getElementById("sdot-" + name);
-    if (dot) { dot.className = "status-dot"; dot.title = ""; }
-    setTimeout(() => {
-      document.getElementById("set-panel-" + name).style.display = "none";
-      msg.textContent = "";
-    }, 1800);
-  } catch (e) {
-    msg.className = "set-msg fail"; msg.textContent = "✗ " + e.message;
   }
+
+  const dot = document.getElementById("sdot-" + name);
+  if (dot) { dot.className = "status-dot"; dot.title = ""; }
+  setTimeout(() => {
+    document.getElementById("set-panel-" + name).style.display = "none";
+    msg.textContent = "";
+  }, 1800);
 }
 
 // ── Enable / Disable service ────────────────
@@ -771,7 +772,7 @@ function createServer(initPassword, whitelist, port) {
     }
 
     // GET /get/:service
-    const getMatch = reqPath.match(/^\/get\/([a-zA-Z0-9_-]+)$/);
+    const getMatch = reqPath.match(/^\/get\/([a-zA-Z0-9_.-]+)$/);
     if (method === "GET" && getMatch) {
       if (lockedGuard(res)) return;
       const service = getMatch[1].toLowerCase();
@@ -917,7 +918,7 @@ function createServer(initPassword, whitelist, port) {
     }
 
     // POST /set/:service — write a new key value into vault
-    const setMatch = reqPath.match(/^\/set\/([a-zA-Z0-9_-]+)$/);
+    const setMatch = reqPath.match(/^\/set\/([a-zA-Z0-9_.-]+)$/);
     if (method === "POST" && setMatch) {
       if (lockedGuard(res)) return;
       const service = setMatch[1].toLowerCase();

package/cli/index.js

@@ -11,7 +11,7 @@ import * as api from "./api.js";
 import os from "os";
 
 const config = new Conf({ projectName: "clauth" });
-const VERSION = "0.3.10";
+const VERSION = "0.3.11";
 
 // ============================================================
 // Password prompt helper

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lifeaitools/clauth",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "Hardware-bound credential vault for the LIFEAI infrastructure stack",
   "type": "module",
   "bin": {