@dbx-tools/tunnel 0.6.97 → 0.6.98
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/src/login-page.js +20 -7
- package/package.json +8 -8
- package/src/login-page.ts +19 -6
package/lib/src/login-page.js
CHANGED
|
@@ -117,6 +117,13 @@ export function loginPageHtml(options) {
|
|
|
117
117
|
return { ok: res.ok, status: res.status, data: data };
|
|
118
118
|
}
|
|
119
119
|
|
|
120
|
+
function errorText(data, fallback) {
|
|
121
|
+
// better-auth error shape: { message } or { error: { message } }.
|
|
122
|
+
if (data && data.error && data.error.message) return data.error.message;
|
|
123
|
+
if (data && data.message) return data.message;
|
|
124
|
+
return fallback;
|
|
125
|
+
}
|
|
126
|
+
|
|
120
127
|
emailForm.addEventListener("submit", async function (e) {
|
|
121
128
|
e.preventDefault();
|
|
122
129
|
email = emailInput.value.trim();
|
|
@@ -125,14 +132,15 @@ export function loginPageHtml(options) {
|
|
|
125
132
|
submit.disabled = true;
|
|
126
133
|
say("Sending…");
|
|
127
134
|
try {
|
|
128
|
-
|
|
129
|
-
|
|
135
|
+
// better-auth emailOTP native endpoint.
|
|
136
|
+
var r = await post("/email-otp/send-verification-otp", { email: email, type: "sign-in" });
|
|
137
|
+
if (r.ok) {
|
|
130
138
|
emailForm.classList.add("hidden");
|
|
131
139
|
codeForm.classList.remove("hidden");
|
|
132
140
|
codeInput.focus();
|
|
133
141
|
say("We emailed a code to " + email + ".");
|
|
134
142
|
} else {
|
|
135
|
-
say(r.data
|
|
143
|
+
say(errorText(r.data, "Could not send a code. Check the address and try again."), true);
|
|
136
144
|
}
|
|
137
145
|
} catch (_e) {
|
|
138
146
|
say("Network error. Try again.", true);
|
|
@@ -149,14 +157,19 @@ export function loginPageHtml(options) {
|
|
|
149
157
|
submit.disabled = true;
|
|
150
158
|
say("Verifying…");
|
|
151
159
|
try {
|
|
152
|
-
|
|
153
|
-
|
|
160
|
+
// better-auth sign-in with the OTP; sets the session cookie on success.
|
|
161
|
+
var r = await post("/sign-in/email-otp", {
|
|
162
|
+
email: email,
|
|
163
|
+
otp: code,
|
|
164
|
+
name: email.split("@")[0],
|
|
165
|
+
});
|
|
166
|
+
if (r.ok) {
|
|
154
167
|
say("Signed in. Loading…");
|
|
155
168
|
// The session cookie is set; reload so the now-authenticated request
|
|
156
169
|
// reaches the app.
|
|
157
170
|
window.location.reload();
|
|
158
171
|
} else {
|
|
159
|
-
say(r.data
|
|
172
|
+
say(errorText(r.data, "That code was not accepted. Try again."), true);
|
|
160
173
|
submit.disabled = false;
|
|
161
174
|
}
|
|
162
175
|
} catch (_e) {
|
|
@@ -187,4 +200,4 @@ const HTML_ESCAPES = {
|
|
|
187
200
|
function escapeHtml(value) {
|
|
188
201
|
return value.replace(/[&<>"']/g, (ch) => HTML_ESCAPES[ch] ?? ch);
|
|
189
202
|
}
|
|
190
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"login-page.js","sourceRoot":"","sources":["../../src/login-page.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAOxC,qFAAqF;AACrF,MAAM,UAAU,aAAa,CAAC,OAAyB;IACrD,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5C,6EAA6E;IAC7E,0DAA0D;IAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAC3C,OAAO;;;;;mBAKU,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBA6CH,KAAK;;;;;;;;;;;;;;;;;;;;;iBAqBT,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAoFf,CAAC;AACT,CAAC;AAED,MAAM,YAAY,GAA2B;IAC3C,GAAG,EAAE,OAAO;IACZ,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,QAAQ;IACb,GAAG,EAAE,OAAO;CACb,CAAC;AAEF,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;AACnE,CAAC","sourcesContent":["/**\n * A self-contained HTML login page the tunnel serves in front of an app that\n * does not embed the `<AuthGate>` React component (e.g. a WebSocket app fronted\n * by the CLI proxy).\n *\n * It speaks the same compatibility endpoints under {@link AUTH_PREFIX} that the\n * React client uses — `POST /request` to email a code, `POST /verify` to\n * exchange it for the `dbx-tools-auth` session cookie — with plain `fetch`, no\n * build step and no dependency. Passkeys are intentionally omitted: the WebAuthn\n * ceremony needs the better-auth client library, so passkey enrollment happens\n * inside the app after this email-OTP sign-in. On success the page reloads, and\n * the now-authenticated request reaches the app.\n *\n * @module\n */\n\nimport { AUTH_PREFIX } from \"./gate.ts\";\n\nexport interface LoginPageOptions {\n  /** Product/brand name shown in the heading. */\n  brandName: string;\n}\n\n/** The login page HTML for a `text/html` request to a gated path with no session. */\nexport function loginPageHtml(options: LoginPageOptions): string {\n  const brand = escapeHtml(options.brandName);\n  // AUTH_PREFIX is a fixed constant, not user input, but JSON-encode it so the\n  // inlined script is always valid regardless of its value.\n  const prefix = JSON.stringify(AUTH_PREFIX);\n  return `<!doctype html>\n<html lang=\"en\">\n<head>\n<meta charset=\"utf-8\">\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n<title>Sign in — ${brand}</title>\n<style>\n  :root {\n    color-scheme: light dark;\n    --bg: #ffffff; --fg: #1b1b1f; --muted: #6b7280; --border: #d9dce1;\n    --accent: #1a73e8; --accent-fg: #ffffff; --error: #c5221f; --field: #ffffff;\n  }\n  @media (prefers-color-scheme: dark) {\n    :root {\n      --bg: #16181d; --fg: #e8e6df; --muted: #9aa0aa; --border: #2c2f36;\n      --accent: #4c8dff; --accent-fg: #0b0f19; --error: #ff6b60; --field: #1e2128;\n    }\n  }\n  * { box-sizing: border-box; }\n  body {\n    margin: 0; min-height: 100vh; display: flex; align-items: center;\n    justify-content: center; background: var(--bg); color: var(--fg);\n    font-family: system-ui, -apple-system, \"Segoe UI\", sans-serif; padding: 24px;\n  }\n  .card {\n    width: 100%; max-width: 360px; border: 1px solid var(--border);\n    border-radius: 14px; padding: 28px; background: var(--bg);\n  }\n  h1 { font-size: 18px; margin: 0 0 4px; }\n  p.sub { margin: 0 0 20px; color: var(--muted); font-size: 13px; }\n  label { display: block; font-size: 12px; color: var(--muted); margin: 0 0 6px; }\n  input {\n    width: 100%; padding: 10px 12px; font-size: 15px; border-radius: 9px;\n    border: 1px solid var(--border); background: var(--field); color: var(--fg);\n  }\n  input:focus { outline: 2px solid var(--accent); outline-offset: -1px; }\n  button {\n    width: 100%; margin-top: 16px; padding: 10px 12px; font-size: 15px;\n    font-weight: 600; border: 0; border-radius: 9px; background: var(--accent);\n    color: var(--accent-fg); cursor: pointer;\n  }\n  button:disabled { opacity: 0.6; cursor: default; }\n  .msg { margin-top: 14px; font-size: 13px; min-height: 18px; }\n  .msg.error { color: var(--error); }\n  .hidden { display: none; }\n  .back { background: none; color: var(--muted); font-weight: 400; margin-top: 8px; }\n</style>\n</head>\n<body>\n  <main class=\"card\">\n    <h1>Sign in to ${brand}</h1>\n    <p class=\"sub\">Enter your email to receive a one-time code.</p>\n\n    <form id=\"email-form\">\n      <label for=\"email\">Email</label>\n      <input id=\"email\" name=\"email\" type=\"email\" autocomplete=\"email\" required autofocus>\n      <button id=\"email-submit\" type=\"submit\">Send code</button>\n    </form>\n\n    <form id=\"code-form\" class=\"hidden\">\n      <label for=\"code\">Verification code</label>\n      <input id=\"code\" name=\"code\" inputmode=\"numeric\" autocomplete=\"one-time-code\" required>\n      <button id=\"code-submit\" type=\"submit\">Verify</button>\n      <button id=\"back\" type=\"button\" class=\"back\">Use a different email</button>\n    </form>\n\n    <div id=\"msg\" class=\"msg\" role=\"status\" aria-live=\"polite\"></div>\n  </main>\n\n<script>\n(function () {\n  var PREFIX = ${prefix};\n  var emailForm = document.getElementById(\"email-form\");\n  var codeForm = document.getElementById(\"code-form\");\n  var emailInput = document.getElementById(\"email\");\n  var codeInput = document.getElementById(\"code\");\n  var back = document.getElementById(\"back\");\n  var msg = document.getElementById(\"msg\");\n  var email = \"\";\n\n  function say(text, isError) {\n    msg.textContent = text || \"\";\n    msg.className = \"msg\" + (isError ? \" error\" : \"\");\n  }\n\n  async function post(path, body) {\n    var res = await fetch(PREFIX + path, {\n      method: \"POST\",\n      credentials: \"include\",\n      headers: { \"content-type\": \"application/json\" },\n      body: JSON.stringify(body),\n    });\n    var data = {};\n    try { data = await res.json(); } catch (_e) { /* non-JSON */ }\n    return { ok: res.ok, status: res.status, data: data };\n  }\n\n  emailForm.addEventListener(\"submit\", async function (e) {\n    e.preventDefault();\n    email = emailInput.value.trim();\n    if (!email) return;\n    var submit = document.getElementById(\"email-submit\");\n    submit.disabled = true;\n    say(\"Sending…\");\n    try {\n      var r = await post(\"/request\", { email: email });\n      if (r.ok && r.data.ok) {\n        emailForm.classList.add(\"hidden\");\n        codeForm.classList.remove(\"hidden\");\n        codeInput.focus();\n        say(\"We emailed a code to \" + email + \".\");\n      } else {\n        say(r.data.error || \"Could not send a code. Check the address and try again.\", true);\n      }\n    } catch (_e) {\n      say(\"Network error. Try again.\", true);\n    } finally {\n      submit.disabled = false;\n    }\n  });\n\n  codeForm.addEventListener(\"submit\", async function (e) {\n    e.preventDefault();\n    var code = codeInput.value.trim();\n    if (!code) return;\n    var submit = document.getElementById(\"code-submit\");\n    submit.disabled = true;\n    say(\"Verifying…\");\n    try {\n      var r = await post(\"/verify\", { email: email, code: code });\n      if (r.ok && r.data.ok) {\n        say(\"Signed in. Loading…\");\n        // The session cookie is set; reload so the now-authenticated request\n        // reaches the app.\n        window.location.reload();\n      } else {\n        say(r.data.error || \"That code was not accepted. Try again.\", true);\n        submit.disabled = false;\n      }\n    } catch (_e) {\n      say(\"Network error. Try again.\", true);\n      submit.disabled = false;\n    }\n  });\n\n  back.addEventListener(\"click\", function () {\n    codeForm.classList.add(\"hidden\");\n    emailForm.classList.remove(\"hidden\");\n    codeInput.value = \"\";\n    say(\"\");\n    emailInput.focus();\n  });\n})();\n</script>\n</body>\n</html>`;\n}\n\nconst HTML_ESCAPES: Record<string, string> = {\n  \"&\": \"&amp;\",\n  \"<\": \"&lt;\",\n  \">\": \"&gt;\",\n  '\"': \"&quot;\",\n  \"'\": \"&#39;\",\n};\n\nfunction escapeHtml(value: string): string {\n  return value.replace(/[&<>\"']/g, (ch) => HTML_ESCAPES[ch] ?? ch);\n}\n"]}
|
|
203
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"login-page.js","sourceRoot":"","sources":["../../src/login-page.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AAOxC,qFAAqF;AACrF,MAAM,UAAU,aAAa,CAAC,OAAyB;IACrD,MAAM,KAAK,GAAG,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5C,6EAA6E;IAC7E,0DAA0D;IAC1D,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;IAC3C,OAAO;;;;;mBAKU,KAAK;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBA6CH,KAAK;;;;;;;;;;;;;;;;;;;;;iBAqBT,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;QAiGf,CAAC;AACT,CAAC;AAED,MAAM,YAAY,GAA2B;IAC3C,GAAG,EAAE,OAAO;IACZ,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,MAAM;IACX,GAAG,EAAE,QAAQ;IACb,GAAG,EAAE,OAAO;CACb,CAAC;AAEF,SAAS,UAAU,CAAC,KAAa;IAC/B,OAAO,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;AACnE,CAAC","sourcesContent":["/**\n * A self-contained HTML login page the tunnel serves in front of an app that\n * does not embed the `<AuthGate>` React component (e.g. a WebSocket app fronted\n * by the CLI proxy).\n *\n * It speaks the same compatibility endpoints under {@link AUTH_PREFIX} that the\n * React client uses — `POST /request` to email a code, `POST /verify` to\n * exchange it for the `dbx-tools-auth` session cookie — with plain `fetch`, no\n * build step and no dependency. Passkeys are intentionally omitted: the WebAuthn\n * ceremony needs the better-auth client library, so passkey enrollment happens\n * inside the app after this email-OTP sign-in. On success the page reloads, and\n * the now-authenticated request reaches the app.\n *\n * @module\n */\n\nimport { AUTH_PREFIX } from \"./gate.ts\";\n\nexport interface LoginPageOptions {\n  /** Product/brand name shown in the heading. */\n  brandName: string;\n}\n\n/** The login page HTML for a `text/html` request to a gated path with no session. */\nexport function loginPageHtml(options: LoginPageOptions): string {\n  const brand = escapeHtml(options.brandName);\n  // AUTH_PREFIX is a fixed constant, not user input, but JSON-encode it so the\n  // inlined script is always valid regardless of its value.\n  const prefix = JSON.stringify(AUTH_PREFIX);\n  return `<!doctype html>\n<html lang=\"en\">\n<head>\n<meta charset=\"utf-8\">\n<meta name=\"viewport\" content=\"width=device-width, initial-scale=1\">\n<title>Sign in — ${brand}</title>\n<style>\n  :root {\n    color-scheme: light dark;\n    --bg: #ffffff; --fg: #1b1b1f; --muted: #6b7280; --border: #d9dce1;\n    --accent: #1a73e8; --accent-fg: #ffffff; --error: #c5221f; --field: #ffffff;\n  }\n  @media (prefers-color-scheme: dark) {\n    :root {\n      --bg: #16181d; --fg: #e8e6df; --muted: #9aa0aa; --border: #2c2f36;\n      --accent: #4c8dff; --accent-fg: #0b0f19; --error: #ff6b60; --field: #1e2128;\n    }\n  }\n  * { box-sizing: border-box; }\n  body {\n    margin: 0; min-height: 100vh; display: flex; align-items: center;\n    justify-content: center; background: var(--bg); color: var(--fg);\n    font-family: system-ui, -apple-system, \"Segoe UI\", sans-serif; padding: 24px;\n  }\n  .card {\n    width: 100%; max-width: 360px; border: 1px solid var(--border);\n    border-radius: 14px; padding: 28px; background: var(--bg);\n  }\n  h1 { font-size: 18px; margin: 0 0 4px; }\n  p.sub { margin: 0 0 20px; color: var(--muted); font-size: 13px; }\n  label { display: block; font-size: 12px; color: var(--muted); margin: 0 0 6px; }\n  input {\n    width: 100%; padding: 10px 12px; font-size: 15px; border-radius: 9px;\n    border: 1px solid var(--border); background: var(--field); color: var(--fg);\n  }\n  input:focus { outline: 2px solid var(--accent); outline-offset: -1px; }\n  button {\n    width: 100%; margin-top: 16px; padding: 10px 12px; font-size: 15px;\n    font-weight: 600; border: 0; border-radius: 9px; background: var(--accent);\n    color: var(--accent-fg); cursor: pointer;\n  }\n  button:disabled { opacity: 0.6; cursor: default; }\n  .msg { margin-top: 14px; font-size: 13px; min-height: 18px; }\n  .msg.error { color: var(--error); }\n  .hidden { display: none; }\n  .back { background: none; color: var(--muted); font-weight: 400; margin-top: 8px; }\n</style>\n</head>\n<body>\n  <main class=\"card\">\n    <h1>Sign in to ${brand}</h1>\n    <p class=\"sub\">Enter your email to receive a one-time code.</p>\n\n    <form id=\"email-form\">\n      <label for=\"email\">Email</label>\n      <input id=\"email\" name=\"email\" type=\"email\" autocomplete=\"email\" required autofocus>\n      <button id=\"email-submit\" type=\"submit\">Send code</button>\n    </form>\n\n    <form id=\"code-form\" class=\"hidden\">\n      <label for=\"code\">Verification code</label>\n      <input id=\"code\" name=\"code\" inputmode=\"numeric\" autocomplete=\"one-time-code\" required>\n      <button id=\"code-submit\" type=\"submit\">Verify</button>\n      <button id=\"back\" type=\"button\" class=\"back\">Use a different email</button>\n    </form>\n\n    <div id=\"msg\" class=\"msg\" role=\"status\" aria-live=\"polite\"></div>\n  </main>\n\n<script>\n(function () {\n  var PREFIX = ${prefix};\n  var emailForm = document.getElementById(\"email-form\");\n  var codeForm = document.getElementById(\"code-form\");\n  var emailInput = document.getElementById(\"email\");\n  var codeInput = document.getElementById(\"code\");\n  var back = document.getElementById(\"back\");\n  var msg = document.getElementById(\"msg\");\n  var email = \"\";\n\n  function say(text, isError) {\n    msg.textContent = text || \"\";\n    msg.className = \"msg\" + (isError ? \" error\" : \"\");\n  }\n\n  async function post(path, body) {\n    var res = await fetch(PREFIX + path, {\n      method: \"POST\",\n      credentials: \"include\",\n      headers: { \"content-type\": \"application/json\" },\n      body: JSON.stringify(body),\n    });\n    var data = {};\n    try { data = await res.json(); } catch (_e) { /* non-JSON */ }\n    return { ok: res.ok, status: res.status, data: data };\n  }\n\n  function errorText(data, fallback) {\n    // better-auth error shape: { message } or { error: { message } }.\n    if (data && data.error && data.error.message) return data.error.message;\n    if (data && data.message) return data.message;\n    return fallback;\n  }\n\n  emailForm.addEventListener(\"submit\", async function (e) {\n    e.preventDefault();\n    email = emailInput.value.trim();\n    if (!email) return;\n    var submit = document.getElementById(\"email-submit\");\n    submit.disabled = true;\n    say(\"Sending…\");\n    try {\n      // better-auth emailOTP native endpoint.\n      var r = await post(\"/email-otp/send-verification-otp\", { email: email, type: \"sign-in\" });\n      if (r.ok) {\n        emailForm.classList.add(\"hidden\");\n        codeForm.classList.remove(\"hidden\");\n        codeInput.focus();\n        say(\"We emailed a code to \" + email + \".\");\n      } else {\n        say(errorText(r.data, \"Could not send a code. Check the address and try again.\"), true);\n      }\n    } catch (_e) {\n      say(\"Network error. Try again.\", true);\n    } finally {\n      submit.disabled = false;\n    }\n  });\n\n  codeForm.addEventListener(\"submit\", async function (e) {\n    e.preventDefault();\n    var code = codeInput.value.trim();\n    if (!code) return;\n    var submit = document.getElementById(\"code-submit\");\n    submit.disabled = true;\n    say(\"Verifying…\");\n    try {\n      // better-auth sign-in with the OTP; sets the session cookie on success.\n      var r = await post(\"/sign-in/email-otp\", {\n        email: email,\n        otp: code,\n        name: email.split(\"@\")[0],\n      });\n      if (r.ok) {\n        say(\"Signed in. Loading…\");\n        // The session cookie is set; reload so the now-authenticated request\n        // reaches the app.\n        window.location.reload();\n      } else {\n        say(errorText(r.data, \"That code was not accepted. Try again.\"), true);\n        submit.disabled = false;\n      }\n    } catch (_e) {\n      say(\"Network error. Try again.\", true);\n      submit.disabled = false;\n    }\n  });\n\n  back.addEventListener(\"click\", function () {\n    codeForm.classList.add(\"hidden\");\n    emailForm.classList.remove(\"hidden\");\n    codeInput.value = \"\";\n    say(\"\");\n    emailInput.focus();\n  });\n})();\n</script>\n</body>\n</html>`;\n}\n\nconst HTML_ESCAPES: Record<string, string> = {\n  \"&\": \"&amp;\",\n  \"<\": \"&lt;\",\n  \">\": \"&gt;\",\n  '\"': \"&quot;\",\n  \"'\": \"&#39;\",\n};\n\nfunction escapeHtml(value: string): string {\n  return value.replace(/[&<>\"']/g, (ch) => HTML_ESCAPES[ch] ?? ch);\n}\n"]}
|
package/package.json
CHANGED
|
@@ -18,21 +18,21 @@
|
|
|
18
18
|
"projen": "projen"
|
|
19
19
|
},
|
|
20
20
|
"devDependencies": {
|
|
21
|
-
"@dbx-tools/email": "0.6.
|
|
21
|
+
"@dbx-tools/email": "0.6.98",
|
|
22
22
|
"@types/bun": "^1.3.14",
|
|
23
23
|
"@types/node": "^24.6.0",
|
|
24
24
|
"typescript": "^5.9.3"
|
|
25
25
|
},
|
|
26
26
|
"peerDependencies": {
|
|
27
|
-
"@dbx-tools/email": "0.6.
|
|
27
|
+
"@dbx-tools/email": "0.6.98"
|
|
28
28
|
},
|
|
29
29
|
"dependencies": {
|
|
30
30
|
"@databricks/appkit": "^0.43.0",
|
|
31
|
-
"@dbx-tools/appkit": "0.6.
|
|
32
|
-
"@dbx-tools/auth": "0.6.
|
|
33
|
-
"@dbx-tools/core": "0.6.
|
|
34
|
-
"@dbx-tools/shared-auth": "0.6.
|
|
35
|
-
"@dbx-tools/shared-core": "0.6.
|
|
31
|
+
"@dbx-tools/appkit": "0.6.98",
|
|
32
|
+
"@dbx-tools/auth": "0.6.98",
|
|
33
|
+
"@dbx-tools/core": "0.6.98",
|
|
34
|
+
"@dbx-tools/shared-auth": "0.6.98",
|
|
35
|
+
"@dbx-tools/shared-core": "0.6.98"
|
|
36
36
|
},
|
|
37
37
|
"main": "./lib/index.js",
|
|
38
38
|
"license": "UNLICENSED",
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"./package.json": "./package.json"
|
|
49
49
|
}
|
|
50
50
|
},
|
|
51
|
-
"version": "0.6.
|
|
51
|
+
"version": "0.6.98",
|
|
52
52
|
"types": "./lib/index.d.ts",
|
|
53
53
|
"type": "module",
|
|
54
54
|
"exports": {
|
package/src/login-page.ts
CHANGED
|
@@ -124,6 +124,13 @@ export function loginPageHtml(options: LoginPageOptions): string {
|
|
|
124
124
|
return { ok: res.ok, status: res.status, data: data };
|
|
125
125
|
}
|
|
126
126
|
|
|
127
|
+
function errorText(data, fallback) {
|
|
128
|
+
// better-auth error shape: { message } or { error: { message } }.
|
|
129
|
+
if (data && data.error && data.error.message) return data.error.message;
|
|
130
|
+
if (data && data.message) return data.message;
|
|
131
|
+
return fallback;
|
|
132
|
+
}
|
|
133
|
+
|
|
127
134
|
emailForm.addEventListener("submit", async function (e) {
|
|
128
135
|
e.preventDefault();
|
|
129
136
|
email = emailInput.value.trim();
|
|
@@ -132,14 +139,15 @@ export function loginPageHtml(options: LoginPageOptions): string {
|
|
|
132
139
|
submit.disabled = true;
|
|
133
140
|
say("Sending…");
|
|
134
141
|
try {
|
|
135
|
-
|
|
136
|
-
|
|
142
|
+
// better-auth emailOTP native endpoint.
|
|
143
|
+
var r = await post("/email-otp/send-verification-otp", { email: email, type: "sign-in" });
|
|
144
|
+
if (r.ok) {
|
|
137
145
|
emailForm.classList.add("hidden");
|
|
138
146
|
codeForm.classList.remove("hidden");
|
|
139
147
|
codeInput.focus();
|
|
140
148
|
say("We emailed a code to " + email + ".");
|
|
141
149
|
} else {
|
|
142
|
-
say(r.data
|
|
150
|
+
say(errorText(r.data, "Could not send a code. Check the address and try again."), true);
|
|
143
151
|
}
|
|
144
152
|
} catch (_e) {
|
|
145
153
|
say("Network error. Try again.", true);
|
|
@@ -156,14 +164,19 @@ export function loginPageHtml(options: LoginPageOptions): string {
|
|
|
156
164
|
submit.disabled = true;
|
|
157
165
|
say("Verifying…");
|
|
158
166
|
try {
|
|
159
|
-
|
|
160
|
-
|
|
167
|
+
// better-auth sign-in with the OTP; sets the session cookie on success.
|
|
168
|
+
var r = await post("/sign-in/email-otp", {
|
|
169
|
+
email: email,
|
|
170
|
+
otp: code,
|
|
171
|
+
name: email.split("@")[0],
|
|
172
|
+
});
|
|
173
|
+
if (r.ok) {
|
|
161
174
|
say("Signed in. Loading…");
|
|
162
175
|
// The session cookie is set; reload so the now-authenticated request
|
|
163
176
|
// reaches the app.
|
|
164
177
|
window.location.reload();
|
|
165
178
|
} else {
|
|
166
|
-
say(r.data
|
|
179
|
+
say(errorText(r.data, "That code was not accepted. Try again."), true);
|
|
167
180
|
submit.disabled = false;
|
|
168
181
|
}
|
|
169
182
|
} catch (_e) {
|