ovr 7.0.0-next.14 → 7.0.0-next.15

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/CHANGELOG.md CHANGED
@@ -1,5 +1,11 @@
1
1
  # ovr
2
2
 
3
+ ## 7.0.0-next.15
4
+
5
+ ### Minor Changes
6
+
7
+ - 3d16902: `auth.forms(c)` has an `Add` form that adds another passkey to the account signed in, such as for a second device or one that replaces a lost device. It asks for a passkey for the same account, skips an authenticator that already holds one of the account's, and returns to the page it is on. The docs show how to remove a passkey and how to sign a user in once at a new origin so they can add one there.
8
+
3
9
  ## 7.0.0-next.14
4
10
 
5
11
  ### Patch Changes
@@ -9,14 +9,19 @@ import type { Storage } from "./storage.js";
9
9
  * @template U Users table
10
10
  */
11
11
  export declare function configure<U extends Auth.Users>(options: Auth.Options<U>, storage: Storage, state: (c: State.Context) => State): {
12
- routes: (Route.Used<Route.Get<"/_passkey/client.js", {}, Field.Shape>> | Route.Used<Route.Post<"/_passkey/options/login", {}, {
12
+ routes: (Route.Used<Route.Get<"/_passkey/client.js", {}, Field.Shape>> | Route.Used<Route.Post<"/_passkey/options/add", {}, {
13
+ bootstrap: Field.Instance<string, "input", "hidden", undefined, undefined, undefined>;
14
+ }>> | Route.Used<Route.Post<"/_passkey/options/login", {}, {
13
15
  bootstrap: Field.Instance<string, "input", "hidden", undefined, undefined, undefined>;
14
16
  }>> | Route.Used<Route.Post<"/_passkey/options/register", {}, {
15
17
  bootstrap: Field.Instance<string, "input", "hidden", undefined, undefined, undefined>;
16
18
  }>> | Route.Used<Route.Post<"/auth/login", {}, {
17
19
  credential: Field.Instance<unknown, "input", "hidden", undefined, undefined, undefined>;
18
20
  ceremony: Field.Instance<string, "input", "hidden", undefined, undefined, undefined>;
19
- }>> | Route.Used<Route.Post<"/auth/logout", {}, Field.Shape>> | Route.Used<Route.Post<"/auth/register", {}, {
21
+ }>> | Route.Used<Route.Post<"/auth/logout", {}, Field.Shape>> | Route.Used<Route.Post<"/auth/passkey", {}, {
22
+ credential: Field.Instance<unknown, "input", "hidden", undefined, undefined, undefined>;
23
+ ceremony: Field.Instance<string, "input", "hidden", undefined, undefined, undefined>;
24
+ }>> | Route.Used<Route.Post<"/auth/register", {}, {
20
25
  credential: Field.Instance<unknown, "input", "hidden", undefined, undefined, undefined>;
21
26
  ceremony: Field.Instance<string, "input", "hidden", undefined, undefined, undefined>;
22
27
  }>>)[];
@@ -1 +1 @@
1
- {"version":3,"file":"configure.d.ts","sourceRoot":"","sources":["../../src/auth/configure.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAsB,MAAM,kBAAkB,CAAC;AAI7D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,IAAI,CAAC,KAAK,EAC7C,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EACxB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,KAAK,KAAK;;;;;;;;;;;;IAuOjC,2FAA2F;aAEvF,IAAI,CAAC,OAAO,UACR;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GACvB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;EAmD9B"}
1
+ {"version":3,"file":"configure.d.ts","sourceRoot":"","sources":["../../src/auth/configure.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAsB,MAAM,kBAAkB,CAAC;AAI7D,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C;;;;GAIG;AACH,wBAAgB,SAAS,CAAC,CAAC,SAAS,IAAI,CAAC,KAAK,EAC7C,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EACxB,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,KAAK,KAAK;;;;;;;;;;;;;;;;;IA+RjC,2FAA2F;aAEvF,IAAI,CAAC,OAAO,UACR;QAAE,KAAK,CAAC,EAAE,MAAM,CAAA;KAAE,GACvB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;EA6D9B"}
@@ -29,11 +29,13 @@ export function configure(options, storage, state) {
29
29
  const limits = {
30
30
  register: limiter("register", 5, 10 * Time.minute),
31
31
  login: limiter("login", 20, Time.minute),
32
+ add: limiter("add", 5, 10 * Time.minute),
32
33
  };
33
34
  const paths = {
34
35
  register: "/auth/register",
35
36
  login: "/auth/login",
36
37
  logout: "/auth/logout",
38
+ passkey: "/auth/passkey",
37
39
  options: "/_passkey/options",
38
40
  };
39
41
  const page = options.page ?? "/login";
@@ -68,8 +70,16 @@ export function configure(options, storage, state) {
68
70
  }
69
71
  return used;
70
72
  };
73
+ /** @returns The page a form was on, if it said, or where a login goes */
74
+ const returning = (c) => {
75
+ const target = new URL(c.url.searchParams.get(Form.params[0]) ?? redirect, options.origin);
76
+ return target.origin === options.origin
77
+ ? target
78
+ : new URL(redirect, options.origin);
79
+ };
71
80
  const back = (c, method, retry = 0) => {
72
- const target = new URL(page, options.origin);
81
+ // a passkey is added from a page of the account, not the login page
82
+ const target = method === "add" ? returning(c) : new URL(page, options.origin);
73
83
  target.searchParams.set("_auth", method);
74
84
  if (retry)
75
85
  target.searchParams.set("_retry", String(retry));
@@ -203,12 +213,55 @@ export function configure(options, storage, state) {
203
213
  action: paths.login,
204
214
  });
205
215
  });
216
+ const add = Route.post(paths.passkey)
217
+ .fields(Passkey.shape)
218
+ .use(guard("add"), async (c) => {
219
+ if (!(await Issue.data(c)))
220
+ throw new Issue("passkey request");
221
+ const session = await state(c).session();
222
+ if (!session)
223
+ throw new Issue("session");
224
+ const credential = await new Passkey(c, state(c)).register();
225
+ // the account that started the ceremony is still the one signed in
226
+ if (credential.user !== session.user)
227
+ throw new Issue("user");
228
+ await storage
229
+ .register(() => { }, credential)
230
+ .catch((error) => {
231
+ // a passkey that is already an account's
232
+ if (Database.unique(error))
233
+ throw new Issue("passkey");
234
+ throw error;
235
+ });
236
+ c.redirect(returning(c), 303);
237
+ });
238
+ const adding = Route.post(`${paths.options}/add`)
239
+ .fields({ bootstrap: Field.hidden() })
240
+ .use(guard("add", true), async (c) => {
241
+ const input = await Issue.data(c);
242
+ if (!input || input.issues)
243
+ throw new Issue("passkey request");
244
+ const session = await state(c).session();
245
+ if (!session)
246
+ return c.text("Sign in to add a passkey.", 401);
247
+ const [account] = await options.database
248
+ .sql `SELECT * FROM ${users} WHERE ${users.columns.id} = ${session.user}`;
249
+ await Passkey.issue(c, state(c), input.data.bootstrap, {
250
+ method: "register",
251
+ action: paths.passkey,
252
+ name: name((account ?? {})),
253
+ user: session.user,
254
+ exclude: await storage.credentials.list(session.user),
255
+ });
256
+ });
206
257
  const routes = [
207
258
  register,
208
259
  login,
209
260
  logout,
261
+ add,
210
262
  registration,
211
263
  assertion,
264
+ adding,
212
265
  Passkey.client,
213
266
  ];
214
267
  return {
@@ -242,17 +295,27 @@ export function configure(options, storage, state) {
242
295
  ? `Too many authentication requests. ${wait ? `Try again in ${wait} seconds.` : "Try again now."}${method === "register" ? " If you already registered, sign in." : ""}`
243
296
  : method === "register"
244
297
  ? "Registration could not be completed. If you already registered, sign in; otherwise try again."
245
- : "Authentication failed. Try again."
298
+ : method === "add"
299
+ ? "The passkey could not be added. Try again."
300
+ : "Authentication failed. Try again."
246
301
  : undefined),
247
302
  });
303
+ // another passkey for the account signed in, such as on a new device
304
+ const Add = passkey.form(add, "register", {
305
+ ...props,
306
+ endpoint: adding.url(),
307
+ submit: "Add passkey",
308
+ });
248
309
  Register.Issue = error("register", Register.Issue);
249
310
  Login.Issue = error("login", Login.Issue);
311
+ Add.Issue = error("add", Add.Issue);
250
312
  return {
251
313
  Register: Object.assign(Register, {
252
314
  Field: fields.Field,
253
315
  Fields: fields.Fields,
254
316
  }),
255
317
  Login,
318
+ Add,
256
319
  Logout: (props) => jsx(logout.Form, {
257
320
  ...props,
258
321
  children: props.children ?? jsx("button", { children: "Log out" }),
@@ -29,6 +29,13 @@ export declare namespace Auth {
29
29
  Login: Route.Form<string> & {
30
30
  Issue: (props: JSX.IntrinsicElements["p"]) => JSX.Element;
31
31
  };
32
+ /**
33
+ * Adds another passkey to the account signed in, such as on a new
34
+ * device. Pass `state={c.url}` to return to the page it is on.
35
+ */
36
+ Add: Route.Form<string> & {
37
+ Issue: (props: JSX.IntrinsicElements["p"]) => JSX.Element;
38
+ };
32
39
  Logout: Route.Form<string>;
33
40
  }
34
41
  /** A revocable session with a fixed lifetime, from `c.session()`. */
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"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"}
@@ -32,6 +32,8 @@ export declare namespace Passkey {
32
32
  readonly nonce?: string;
33
33
  /** Form fields the ceremony is for, from `Passkey.fields`, checked when it starts. */
34
34
  readonly fields?: string;
35
+ /** Text of the form's own button, in place of the method's. */
36
+ readonly submit?: string;
35
37
  }
36
38
  /** The ceremony a signed form may start. */
37
39
  type Expected = {
@@ -43,6 +45,10 @@ export declare namespace Passkey {
43
45
  method: "register";
44
46
  /** Name of the new passkey, at most 256 characters, not blank */
45
47
  name: string;
48
+ /** The account the passkey is added to, a new account without it */
49
+ user?: string;
50
+ /** Credential IDs the account has, which the authenticator skips */
51
+ exclude?: readonly string[];
46
52
  } | {
47
53
  method: "login";
48
54
  /** Credential IDs a login is limited to, for a user already known */
@@ -1 +1 @@
1
- {"version":3,"file":"passkey.d.ts","sourceRoot":"","sources":["../../src/auth/passkey.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"passkey.d.ts","sourceRoot":"","sources":["../../src/auth/passkey.ts"],"names":[],"mappings":"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"}
@@ -75,7 +75,8 @@ export class Passkey {
75
75
  props.children ?? [
76
76
  route.Fields?.(),
77
77
  jsx("button", {
78
- children: method === "register" ? "Create account" : "Log in",
78
+ children: options.submit ??
79
+ (method === "register" ? "Create account" : "Log in"),
79
80
  }),
80
81
  ],
81
82
  // A supplied Issue component takes precedence over this accessible fallback.
@@ -155,8 +156,9 @@ export class Passkey {
155
156
  throw new Issue("bootstrap binding");
156
157
  // the same method as the form's, checked above
157
158
  const register = expected.method === "register";
158
- if (register &&
159
- (!bootstrap.user || Codec.encode(bootstrap.user).length > 64))
159
+ // an account that is signed in, or the new one the form was made for
160
+ const user = (register && expected.user) || bootstrap.user;
161
+ if (register && (!user || Codec.encode(user).length > 64))
160
162
  throw new Issue("user");
161
163
  const rp = new URL(auth.options.origin).hostname;
162
164
  const ceremony = crypto.randomUUID();
@@ -168,7 +170,7 @@ export class Passkey {
168
170
  action: bootstrap.action,
169
171
  origin: bootstrap.origin,
170
172
  expiration: Date.now() + 2 * Time.minute,
171
- ...(bootstrap.user ? { user: bootstrap.user } : {}),
173
+ ...(user ? { user } : {}),
172
174
  ...(expected.fields ? { fields: expected.fields } : {}),
173
175
  })) === false) {
174
176
  return Issue.limited(c, 60);
@@ -181,11 +183,18 @@ export class Passkey {
181
183
  challenge,
182
184
  rp: { id: rp, name: rp },
183
185
  user: {
184
- id: Codec.Base64Url.encode(Codec.encode(bootstrap.user)),
186
+ id: Codec.Base64Url.encode(Codec.encode(user)),
185
187
  name: expected.name,
186
188
  displayName: expected.name,
187
189
  },
188
190
  pubKeyCredParams: [{ type: "public-key", alg: -7 }],
191
+ // an authenticator that holds one of the account's makes no other
192
+ ...(expected.exclude?.length && {
193
+ excludeCredentials: expected.exclude.map((id) => ({
194
+ type: "public-key",
195
+ id,
196
+ })),
197
+ }),
189
198
  authenticatorSelection: {
190
199
  residentKey: "required",
191
200
  requireResidentKey: true,
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "ovr",
3
3
  "description": "Web apps anyone can use. Each route serves people a page and agents Markdown and MCP tools, with forms, Postgres, and passkey sign-in built in.",
4
- "version": "7.0.0-next.14",
4
+ "version": "7.0.0-next.15",
5
5
  "license": "MIT",
6
6
  "repository": {
7
7
  "type": "git",
@@ -46,11 +46,13 @@ export function configure<U extends Auth.Users>(
46
46
  const limits = {
47
47
  register: limiter("register", 5, 10 * Time.minute),
48
48
  login: limiter("login", 20, Time.minute),
49
+ add: limiter("add", 5, 10 * Time.minute),
49
50
  };
50
51
  const paths = {
51
52
  register: "/auth/register",
52
53
  login: "/auth/login",
53
54
  logout: "/auth/logout",
55
+ passkey: "/auth/passkey",
54
56
  options: "/_passkey/options",
55
57
  } as const;
56
58
  const page = options.page ?? "/login";
@@ -91,16 +93,33 @@ export function configure<U extends Auth.Users>(
91
93
  return used;
92
94
  };
93
95
 
94
- const back = (c: Pick<Context, "redirect">, method: string, retry = 0) => {
95
- const target = new URL(page, options.origin);
96
+ /** @returns The page a form was on, if it said, or where a login goes */
97
+ const returning = (c: Pick<Context, "url">) => {
98
+ const target = new URL(
99
+ c.url.searchParams.get(Form.params[0]) ?? redirect,
100
+ options.origin,
101
+ );
102
+ return target.origin === options.origin
103
+ ? target
104
+ : new URL(redirect, options.origin);
105
+ };
106
+
107
+ const back = (
108
+ c: Pick<Context, "redirect" | "url">,
109
+ method: string,
110
+ retry = 0,
111
+ ) => {
112
+ // a passkey is added from a page of the account, not the login page
113
+ const target =
114
+ method === "add" ? returning(c) : new URL(page, options.origin);
96
115
  target.searchParams.set("_auth", method);
97
116
  if (retry) target.searchParams.set("_retry", String(retry));
98
117
  c.redirect(target, 303);
99
118
  };
100
119
 
101
120
  const admit = async (
102
- c: Limiter.Context & Pick<Context, "text" | "redirect">,
103
- method: "register" | "login",
121
+ c: Limiter.Context & Pick<Context, "text" | "redirect" | "url">,
122
+ method: "register" | "login" | "add",
104
123
  prompt: boolean,
105
124
  ) => {
106
125
  const admission = await limits[method].check(
@@ -129,9 +148,9 @@ export function configure<U extends Auth.Users>(
129
148
  c.redirect(state(c).resume(redirect), 303);
130
149
  };
131
150
  const guard =
132
- (method: "register" | "login" | "logout", prompt = false) =>
151
+ (method: "register" | "login" | "logout" | "add", prompt = false) =>
133
152
  async (
134
- c: Limiter.Context & Pick<Context, "text" | "redirect">,
153
+ c: Limiter.Context & Pick<Context, "text" | "redirect" | "url">,
135
154
  next: Middleware.Next,
136
155
  ) => {
137
156
  noStore(c.res.headers);
@@ -241,12 +260,49 @@ export function configure<U extends Auth.Users>(
241
260
  action: paths.login,
242
261
  });
243
262
  });
263
+ const add = Route.post(paths.passkey)
264
+ .fields(Passkey.shape)
265
+ .use(guard("add"), async (c) => {
266
+ if (!(await Issue.data(c))) throw new Issue("passkey request");
267
+ const session = await state(c).session();
268
+ if (!session) throw new Issue("session");
269
+ const credential = await new Passkey(c, state(c)).register();
270
+ // the account that started the ceremony is still the one signed in
271
+ if (credential.user !== session.user) throw new Issue("user");
272
+ await storage
273
+ .register(() => {}, credential)
274
+ .catch((error: unknown) => {
275
+ // a passkey that is already an account's
276
+ if (Database.unique(error)) throw new Issue("passkey");
277
+ throw error;
278
+ });
279
+ c.redirect(returning(c), 303);
280
+ });
281
+ const adding = Route.post(`${paths.options}/add`)
282
+ .fields({ bootstrap: Field.hidden() })
283
+ .use(guard("add", true), async (c) => {
284
+ const input = await Issue.data(c);
285
+ if (!input || input.issues) throw new Issue("passkey request");
286
+ const session = await state(c).session();
287
+ if (!session) return c.text("Sign in to add a passkey.", 401);
288
+ const [account] = await options.database
289
+ .sql`SELECT * FROM ${users} WHERE ${users.columns.id!} = ${session.user}`;
290
+ await Passkey.issue(c, state(c), input.data.bootstrap, {
291
+ method: "register",
292
+ action: paths.passkey,
293
+ name: name((account ?? {}) as Field.Parse.Data<Shape>),
294
+ user: session.user,
295
+ exclude: await storage.credentials.list(session.user),
296
+ });
297
+ });
244
298
  const routes = [
245
299
  register,
246
300
  login,
247
301
  logout,
302
+ add,
248
303
  registration,
249
304
  assertion,
305
+ adding,
250
306
  Passkey.client,
251
307
  ];
252
308
  return {
@@ -287,17 +343,27 @@ export function configure<U extends Auth.Users>(
287
343
  ? `Too many authentication requests. ${wait ? `Try again in ${wait} seconds.` : "Try again now."}${method === "register" ? " If you already registered, sign in." : ""}`
288
344
  : method === "register"
289
345
  ? "Registration could not be completed. If you already registered, sign in; otherwise try again."
290
- : "Authentication failed. Try again."
346
+ : method === "add"
347
+ ? "The passkey could not be added. Try again."
348
+ : "Authentication failed. Try again."
291
349
  : undefined),
292
350
  });
351
+ // another passkey for the account signed in, such as on a new device
352
+ const Add = passkey.form(add, "register", {
353
+ ...props,
354
+ endpoint: adding.url(),
355
+ submit: "Add passkey",
356
+ });
293
357
  Register.Issue = error("register", Register.Issue);
294
358
  Login.Issue = error("login", Login.Issue);
359
+ Add.Issue = error("add", Add.Issue);
295
360
  return {
296
361
  Register: Object.assign(Register, {
297
362
  Field: fields.Field,
298
363
  Fields: fields.Fields,
299
364
  }),
300
365
  Login,
366
+ Add,
301
367
  Logout: (props: Parameters<typeof logout.Form>[0]) =>
302
368
  jsx(logout.Form, {
303
369
  ...props,
package/src/auth/index.ts CHANGED
@@ -37,6 +37,13 @@ export namespace Auth {
37
37
  Login: Route.Form<string> & {
38
38
  Issue: (props: JSX.IntrinsicElements["p"]) => JSX.Element;
39
39
  };
40
+ /**
41
+ * Adds another passkey to the account signed in, such as on a new
42
+ * device. Pass `state={c.url}` to return to the page it is on.
43
+ */
44
+ Add: Route.Form<string> & {
45
+ Issue: (props: JSX.IntrinsicElements["p"]) => JSX.Element;
46
+ };
40
47
  Logout: Route.Form<string>;
41
48
  }
42
49
 
@@ -44,6 +44,8 @@ export namespace Passkey {
44
44
  readonly nonce?: string;
45
45
  /** Form fields the ceremony is for, from `Passkey.fields`, checked when it starts. */
46
46
  readonly fields?: string;
47
+ /** Text of the form's own button, in place of the method's. */
48
+ readonly submit?: string;
47
49
  }
48
50
  /** The ceremony a signed form may start. */
49
51
  export type Expected = {
@@ -56,6 +58,10 @@ export namespace Passkey {
56
58
  method: "register";
57
59
  /** Name of the new passkey, at most 256 characters, not blank */
58
60
  name: string;
61
+ /** The account the passkey is added to, a new account without it */
62
+ user?: string;
63
+ /** Credential IDs the account has, which the authenticator skips */
64
+ exclude?: readonly string[];
59
65
  }
60
66
  | {
61
67
  method: "login";
@@ -138,7 +144,9 @@ export class Passkey {
138
144
  props.children ?? [
139
145
  route.Fields?.(),
140
146
  jsx("button", {
141
- children: method === "register" ? "Create account" : "Log in",
147
+ children:
148
+ options.submit ??
149
+ (method === "register" ? "Create account" : "Log in"),
142
150
  }),
143
151
  ],
144
152
  // A supplied Issue component takes precedence over this accessible fallback.
@@ -244,10 +252,9 @@ export class Passkey {
244
252
  throw new Issue("bootstrap binding");
245
253
  // the same method as the form's, checked above
246
254
  const register = expected.method === "register";
247
- if (
248
- register &&
249
- (!bootstrap.user || Codec.encode(bootstrap.user).length > 64)
250
- )
255
+ // an account that is signed in, or the new one the form was made for
256
+ const user = (register && expected.user) || bootstrap.user;
257
+ if (register && (!user || Codec.encode(user).length > 64))
251
258
  throw new Issue("user");
252
259
  const rp = new URL(auth.options.origin).hostname;
253
260
  const ceremony = crypto.randomUUID();
@@ -260,7 +267,7 @@ export class Passkey {
260
267
  action: bootstrap.action,
261
268
  origin: bootstrap.origin,
262
269
  expiration: Date.now() + 2 * Time.minute,
263
- ...(bootstrap.user ? { user: bootstrap.user } : {}),
270
+ ...(user ? { user } : {}),
264
271
  ...(expected.fields ? { fields: expected.fields } : {}),
265
272
  })) === false
266
273
  ) {
@@ -274,11 +281,18 @@ export class Passkey {
274
281
  challenge,
275
282
  rp: { id: rp, name: rp },
276
283
  user: {
277
- id: Codec.Base64Url.encode(Codec.encode(bootstrap.user!)),
284
+ id: Codec.Base64Url.encode(Codec.encode(user!)),
278
285
  name: expected.name,
279
286
  displayName: expected.name,
280
287
  },
281
288
  pubKeyCredParams: [{ type: "public-key", alg: -7 }],
289
+ // an authenticator that holds one of the account's makes no other
290
+ ...(expected.exclude?.length && {
291
+ excludeCredentials: expected.exclude.map((id) => ({
292
+ type: "public-key" as const,
293
+ id,
294
+ })),
295
+ }),
282
296
  authenticatorSelection: {
283
297
  residentKey: "required",
284
298
  requireResidentKey: true,