ovr 7.0.0-next.15 → 7.0.0-next.17
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 +15 -0
- package/dist/auth/configure.d.ts +8 -0
- package/dist/auth/configure.d.ts.map +1 -1
- package/dist/auth/configure.js +71 -6
- package/dist/auth/index.d.ts +41 -0
- package/dist/auth/index.d.ts.map +1 -1
- package/dist/auth/index.js +19 -0
- package/dist/auth/passkey.d.ts +6 -0
- package/dist/auth/passkey.d.ts.map +1 -1
- package/dist/auth/passkey.js +4 -0
- package/dist/auth/storage.d.ts +38 -0
- package/dist/auth/storage.d.ts.map +1 -1
- package/dist/auth/storage.js +60 -3
- package/dist/form/index.d.ts.map +1 -1
- package/dist/form/index.js +37 -6
- package/package.json +1 -1
- package/src/auth/configure.ts +84 -8
- package/src/auth/index.ts +37 -0
- package/src/auth/passkey.ts +4 -0
- package/src/auth/storage.ts +66 -3
- package/src/form/index.ts +62 -6
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,20 @@
|
|
|
1
1
|
# ovr
|
|
2
2
|
|
|
3
|
+
## 7.0.0-next.17
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- 73ab2d5: - A date, date and time, month, week, time, or color field checks its value's format, and that a date is a real day. Before, any text passed, so an agent's `11/12/2026` reached the handler and failed there. It now gets an issue such as "Enter a date as YYYY-MM-DD".
|
|
8
|
+
- A sign-in link lasts five minutes, and `auth.link` no longer takes `minutes`.
|
|
9
|
+
|
|
10
|
+
## 7.0.0-next.16
|
|
11
|
+
|
|
12
|
+
### Minor Changes
|
|
13
|
+
|
|
14
|
+
- 9d8f561: - A passkey has what tells it apart in a list: `created`, the `origin` it was made at, and a `name`, which the `Add` form takes as an optional field.
|
|
15
|
+
- `auth.link(user, { origin, minutes })` makes a link that signs a user in once, for an origin where they have no passkey or after losing their device. It opens the authentication `page`, where `<Link />` from `auth.forms(c)` is the button that signs them in. Only the link's hash is stored, in the new `auth_links` table.
|
|
16
|
+
- `auth:1` changed for these, since v7 is not released: `auth_credentials` has three more columns and `auth_links` is new. A database migrated with an earlier prerelease needs the same changes made by hand, and the migration's checksum updated.
|
|
17
|
+
|
|
3
18
|
## 7.0.0-next.15
|
|
4
19
|
|
|
5
20
|
### Minor Changes
|
package/dist/auth/configure.d.ts
CHANGED
|
@@ -10,21 +10,29 @@ import type { Storage } from "./storage.js";
|
|
|
10
10
|
*/
|
|
11
11
|
export declare function configure<U extends Auth.Users>(options: Auth.Options<U>, storage: Storage, state: (c: State.Context) => State): {
|
|
12
12
|
routes: (Route.Used<Route.Get<"/_passkey/client.js", {}, Field.Shape>> | Route.Used<Route.Post<"/_passkey/options/add", {}, {
|
|
13
|
+
name: Field.Instance<string | undefined, "input", "text", undefined, undefined, undefined>;
|
|
13
14
|
bootstrap: Field.Instance<string, "input", "hidden", undefined, undefined, undefined>;
|
|
14
15
|
}>> | Route.Used<Route.Post<"/_passkey/options/login", {}, {
|
|
15
16
|
bootstrap: Field.Instance<string, "input", "hidden", undefined, undefined, undefined>;
|
|
16
17
|
}>> | Route.Used<Route.Post<"/_passkey/options/register", {}, {
|
|
17
18
|
bootstrap: Field.Instance<string, "input", "hidden", undefined, undefined, undefined>;
|
|
19
|
+
}>> | Route.Used<Route.Post<"/auth/link", {}, {
|
|
20
|
+
link: Field.Instance<string, "input", "hidden", undefined, undefined, undefined>;
|
|
18
21
|
}>> | Route.Used<Route.Post<"/auth/login", {}, {
|
|
19
22
|
credential: Field.Instance<unknown, "input", "hidden", undefined, undefined, undefined>;
|
|
20
23
|
ceremony: Field.Instance<string, "input", "hidden", undefined, undefined, undefined>;
|
|
21
24
|
}>> | Route.Used<Route.Post<"/auth/logout", {}, Field.Shape>> | Route.Used<Route.Post<"/auth/passkey", {}, {
|
|
22
25
|
credential: Field.Instance<unknown, "input", "hidden", undefined, undefined, undefined>;
|
|
23
26
|
ceremony: Field.Instance<string, "input", "hidden", undefined, undefined, undefined>;
|
|
27
|
+
name: Field.Instance<string | undefined, "input", "text", undefined, undefined, undefined>;
|
|
24
28
|
}>> | Route.Used<Route.Post<"/auth/register", {}, {
|
|
25
29
|
credential: Field.Instance<unknown, "input", "hidden", undefined, undefined, undefined>;
|
|
26
30
|
ceremony: Field.Instance<string, "input", "hidden", undefined, undefined, undefined>;
|
|
27
31
|
}>>)[];
|
|
32
|
+
/** Make a link that signs a user in once, see `Auth.link`. */
|
|
33
|
+
link(user: string, { origin }?: {
|
|
34
|
+
origin?: string;
|
|
35
|
+
}): Promise<string>;
|
|
28
36
|
/** Create forms in the handler before returning JSX, so ovr can set the binding cookie. */
|
|
29
37
|
forms(c: Auth.Context, props?: {
|
|
30
38
|
nonce?: string;
|
|
@@ -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;
|
|
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;AAG5C;;;;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;;;;;;;;;;;;;;;;;;;;;IA8TjC,8DAA8D;eAEvD,MAAM,eACiB;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAiBjD,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;EAqF9B"}
|
package/dist/auth/configure.js
CHANGED
|
@@ -6,6 +6,7 @@ import { Route } from "../route/index.js";
|
|
|
6
6
|
import { Header, Time, noStore } from "../util/index.js";
|
|
7
7
|
import { Issue } from "./issue.js";
|
|
8
8
|
import { Passkey } from "./passkey.js";
|
|
9
|
+
import { Token } from "./token.js";
|
|
9
10
|
/**
|
|
10
11
|
* Construct startup-complete handlers and request-scoped UI components.
|
|
11
12
|
*
|
|
@@ -36,6 +37,7 @@ export function configure(options, storage, state) {
|
|
|
36
37
|
login: "/auth/login",
|
|
37
38
|
logout: "/auth/logout",
|
|
38
39
|
passkey: "/auth/passkey",
|
|
40
|
+
link: "/auth/link",
|
|
39
41
|
options: "/_passkey/options",
|
|
40
42
|
};
|
|
41
43
|
const page = options.page ?? "/login";
|
|
@@ -86,7 +88,8 @@ export function configure(options, storage, state) {
|
|
|
86
88
|
c.redirect(target, 303);
|
|
87
89
|
};
|
|
88
90
|
const admit = async (c, method, prompt) => {
|
|
89
|
-
|
|
91
|
+
// a link signs in, so it shares a login's limit
|
|
92
|
+
const admission = await limits[method === "link" ? "login" : method].check(c, prompt ? "options" : "verify");
|
|
90
93
|
if (admission === true)
|
|
91
94
|
return true;
|
|
92
95
|
const now = Date.now();
|
|
@@ -213,10 +216,19 @@ export function configure(options, storage, state) {
|
|
|
213
216
|
action: paths.login,
|
|
214
217
|
});
|
|
215
218
|
});
|
|
219
|
+
/** What a person calls a passkey they add, such as "Laptop" */
|
|
220
|
+
const naming = {
|
|
221
|
+
name: Field.text()
|
|
222
|
+
.max(64)
|
|
223
|
+
.optional()
|
|
224
|
+
.label("Name")
|
|
225
|
+
.hint("Such as the device it is on"),
|
|
226
|
+
};
|
|
216
227
|
const add = Route.post(paths.passkey)
|
|
217
|
-
.fields(Passkey.shape)
|
|
228
|
+
.fields({ ...naming, ...Passkey.shape })
|
|
218
229
|
.use(guard("add"), async (c) => {
|
|
219
|
-
|
|
230
|
+
const input = await Issue.data(c);
|
|
231
|
+
if (!input || input.issues)
|
|
220
232
|
throw new Issue("passkey request");
|
|
221
233
|
const session = await state(c).session();
|
|
222
234
|
if (!session)
|
|
@@ -226,7 +238,10 @@ export function configure(options, storage, state) {
|
|
|
226
238
|
if (credential.user !== session.user)
|
|
227
239
|
throw new Issue("user");
|
|
228
240
|
await storage
|
|
229
|
-
.register(() => { },
|
|
241
|
+
.register(() => { }, {
|
|
242
|
+
...credential,
|
|
243
|
+
name: input.data.name?.trim() || null,
|
|
244
|
+
})
|
|
230
245
|
.catch((error) => {
|
|
231
246
|
// a passkey that is already an account's
|
|
232
247
|
if (Database.unique(error))
|
|
@@ -236,7 +251,8 @@ export function configure(options, storage, state) {
|
|
|
236
251
|
c.redirect(returning(c), 303);
|
|
237
252
|
});
|
|
238
253
|
const adding = Route.post(`${paths.options}/add`)
|
|
239
|
-
|
|
254
|
+
// the form's own field is sent with it, and saved when it submits
|
|
255
|
+
.fields({ ...naming, bootstrap: Field.hidden() })
|
|
240
256
|
.use(guard("add", true), async (c) => {
|
|
241
257
|
const input = await Issue.data(c);
|
|
242
258
|
if (!input || input.issues)
|
|
@@ -254,11 +270,26 @@ export function configure(options, storage, state) {
|
|
|
254
270
|
exclude: await storage.credentials.list(session.user),
|
|
255
271
|
});
|
|
256
272
|
});
|
|
273
|
+
/** The parameter of the authentication page a link's token is in */
|
|
274
|
+
const linked = "_link";
|
|
275
|
+
const link = Route.post(paths.link)
|
|
276
|
+
.fields({ link: Field.hidden() })
|
|
277
|
+
.use(guard("link"), async (c) => {
|
|
278
|
+
const input = await Issue.data(c);
|
|
279
|
+
if (!input || input.issues)
|
|
280
|
+
throw new Issue("link request");
|
|
281
|
+
// once, and only at the origin it was made for
|
|
282
|
+
const user = await storage.links.take(input.data.link, options.origin);
|
|
283
|
+
if (!user)
|
|
284
|
+
throw new Issue("link");
|
|
285
|
+
await enter(c, user);
|
|
286
|
+
});
|
|
257
287
|
const routes = [
|
|
258
288
|
register,
|
|
259
289
|
login,
|
|
260
290
|
logout,
|
|
261
291
|
add,
|
|
292
|
+
link,
|
|
262
293
|
registration,
|
|
263
294
|
assertion,
|
|
264
295
|
adding,
|
|
@@ -266,6 +297,22 @@ export function configure(options, storage, state) {
|
|
|
266
297
|
];
|
|
267
298
|
return {
|
|
268
299
|
routes,
|
|
300
|
+
/** Make a link that signs a user in once, see `Auth.link`. */
|
|
301
|
+
async link(user, { origin = options.origin } = {}) {
|
|
302
|
+
const target = new URL(page, origin);
|
|
303
|
+
if (target.protocol !== "https:" || target.origin !== origin)
|
|
304
|
+
throw new TypeError("A link's origin must be an HTTPS origin");
|
|
305
|
+
const token = Token.random();
|
|
306
|
+
await storage.links.set(token, {
|
|
307
|
+
user,
|
|
308
|
+
origin,
|
|
309
|
+
// long enough to copy and open, and no longer: it signs in
|
|
310
|
+
// without a passkey
|
|
311
|
+
expiration: Date.now() + 5 * Time.minute,
|
|
312
|
+
});
|
|
313
|
+
target.searchParams.set(linked, token);
|
|
314
|
+
return target.href;
|
|
315
|
+
},
|
|
269
316
|
/** Create forms in the handler before returning JSX, so ovr can set the binding cookie. */
|
|
270
317
|
forms(c, props = {}) {
|
|
271
318
|
const passkey = new Passkey(c, state(c));
|
|
@@ -297,7 +344,9 @@ export function configure(options, storage, state) {
|
|
|
297
344
|
? "Registration could not be completed. If you already registered, sign in; otherwise try again."
|
|
298
345
|
: method === "add"
|
|
299
346
|
? "The passkey could not be added. Try again."
|
|
300
|
-
:
|
|
347
|
+
: method === "link"
|
|
348
|
+
? "This link has expired or was already used."
|
|
349
|
+
: "Authentication failed. Try again."
|
|
301
350
|
: undefined),
|
|
302
351
|
});
|
|
303
352
|
// another passkey for the account signed in, such as on a new device
|
|
@@ -309,6 +358,21 @@ export function configure(options, storage, state) {
|
|
|
309
358
|
Register.Issue = error("register", Register.Issue);
|
|
310
359
|
Login.Issue = error("login", Login.Issue);
|
|
311
360
|
Add.Issue = error("add", Add.Issue);
|
|
361
|
+
// a link's token, from the address the link opened
|
|
362
|
+
const token = c.url.searchParams.get(linked);
|
|
363
|
+
const Link = Object.assign((props) => (token || failure === "link") &&
|
|
364
|
+
jsx(link.Form, {
|
|
365
|
+
...props,
|
|
366
|
+
children: [
|
|
367
|
+
token && [
|
|
368
|
+
jsx("input", { type: "hidden", name: "link", value: token }),
|
|
369
|
+
props.children ?? jsx("button", { children: "Sign in" }),
|
|
370
|
+
],
|
|
371
|
+
Link.Issue({}),
|
|
372
|
+
],
|
|
373
|
+
}), {
|
|
374
|
+
Issue: error("link", (props) => jsx("p", { role: "status", "aria-live": "polite", ...props })),
|
|
375
|
+
});
|
|
312
376
|
return {
|
|
313
377
|
Register: Object.assign(Register, {
|
|
314
378
|
Field: fields.Field,
|
|
@@ -316,6 +380,7 @@ export function configure(options, storage, state) {
|
|
|
316
380
|
}),
|
|
317
381
|
Login,
|
|
318
382
|
Add,
|
|
383
|
+
Link,
|
|
319
384
|
Logout: (props) => jsx(logout.Form, {
|
|
320
385
|
...props,
|
|
321
386
|
children: props.children ?? jsx("button", { children: "Log out" }),
|
package/dist/auth/index.d.ts
CHANGED
|
@@ -36,6 +36,14 @@ export declare namespace Auth {
|
|
|
36
36
|
Add: Route.Form<string> & {
|
|
37
37
|
Issue: (props: JSX.IntrinsicElements["p"]) => JSX.Element;
|
|
38
38
|
};
|
|
39
|
+
/**
|
|
40
|
+
* Signs in with a link from `auth.link`, on the authentication `page`
|
|
41
|
+
* the link opens. It is a button, so only a person uses the link, and
|
|
42
|
+
* renders nothing on a page opened without one.
|
|
43
|
+
*/
|
|
44
|
+
Link: ((props: JSX.IntrinsicElements["form"]) => JSX.Element) & {
|
|
45
|
+
Issue: (props: JSX.IntrinsicElements["p"]) => JSX.Element;
|
|
46
|
+
};
|
|
39
47
|
Logout: Route.Form<string>;
|
|
40
48
|
}
|
|
41
49
|
/** A revocable session with a fixed lifetime, from `c.session()`. */
|
|
@@ -159,6 +167,12 @@ export declare namespace Auth {
|
|
|
159
167
|
eligible: boolean;
|
|
160
168
|
/** Current backup state, which may change. */
|
|
161
169
|
backedUp: boolean;
|
|
170
|
+
/** When it was made, in milliseconds. */
|
|
171
|
+
created: number;
|
|
172
|
+
/** Origin it was made at, the only one it signs in at. */
|
|
173
|
+
origin: string;
|
|
174
|
+
/** What the person called it when adding it, such as "Laptop". */
|
|
175
|
+
name: string | null;
|
|
162
176
|
}
|
|
163
177
|
export {};
|
|
164
178
|
}
|
|
@@ -180,6 +194,9 @@ export declare class Auth<U extends Auth.Users = Auth.Users, P extends string =
|
|
|
180
194
|
counter: Schema<number>;
|
|
181
195
|
eligible: Schema<boolean>;
|
|
182
196
|
backedUp: Schema<boolean>;
|
|
197
|
+
created: Schema<number>;
|
|
198
|
+
origin: Schema<string>;
|
|
199
|
+
name: Schema<string | null>;
|
|
183
200
|
}, {}>, Table<"auth_sessions", {
|
|
184
201
|
id: Schema<string>;
|
|
185
202
|
user: Schema<string>;
|
|
@@ -211,6 +228,11 @@ export declare class Auth<U extends Auth.Users = Auth.Users, P extends string =
|
|
|
211
228
|
challenge: Schema<string | null>;
|
|
212
229
|
family: Schema<string>;
|
|
213
230
|
expiration: Schema<number>;
|
|
231
|
+
}, {}>, Table<"auth_links", {
|
|
232
|
+
id: Schema<string>;
|
|
233
|
+
user: Schema<string>;
|
|
234
|
+
origin: Schema<string>;
|
|
235
|
+
expiration: Schema<number>;
|
|
214
236
|
}, {}>];
|
|
215
237
|
/**
|
|
216
238
|
* Read an agent's authorization request on the consent page, with the form
|
|
@@ -223,6 +245,25 @@ export declare class Auth<U extends Auth.Users = Auth.Users, P extends string =
|
|
|
223
245
|
readonly forms: (c: Auth.Context, props?: {
|
|
224
246
|
nonce?: string;
|
|
225
247
|
}) => Auth.Forms<Auth.Fields<U>>;
|
|
248
|
+
/**
|
|
249
|
+
* Make a link that signs a user in once, for when they have no passkey
|
|
250
|
+
* where they need one: at another origin that shares the users table,
|
|
251
|
+
* such as production after registering on `localhost`, or after losing
|
|
252
|
+
* their device. It opens the authentication `page`, where `<Link />` from
|
|
253
|
+
* `auth.forms(c)` signs them in, and they add a passkey.
|
|
254
|
+
*
|
|
255
|
+
* Anyone who has the link is the user until it is used or expires, so
|
|
256
|
+
* make one only for a user your code has already identified, and send it
|
|
257
|
+
* the way you would a password. It is best kept to a script or an admin
|
|
258
|
+
* page, not a form any signed-in user can use in production.
|
|
259
|
+
*
|
|
260
|
+
* @param user ID of the user it signs in
|
|
261
|
+
* @param options The origin it is opened at, this one by default
|
|
262
|
+
* @returns The link, which lasts 5 minutes
|
|
263
|
+
*/
|
|
264
|
+
readonly link: (user: string, options?: {
|
|
265
|
+
origin?: string;
|
|
266
|
+
}) => Promise<string>;
|
|
226
267
|
/** Configure passkeys, session helpers, and automatic authentication rate limits. */
|
|
227
268
|
constructor(options: Auth.Options<U, P, R, C>);
|
|
228
269
|
/** Mounted by `app.use(auth)`, and lets every request read its session. */
|
package/dist/auth/index.d.ts.map
CHANGED
|
@@ -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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"}
|
package/dist/auth/index.js
CHANGED
|
@@ -24,6 +24,7 @@ export class Auth {
|
|
|
24
24
|
Storage.challenges,
|
|
25
25
|
Limiter.table,
|
|
26
26
|
Storage.tokens,
|
|
27
|
+
Storage.links,
|
|
27
28
|
];
|
|
28
29
|
#options;
|
|
29
30
|
#states = new WeakMap();
|
|
@@ -42,6 +43,23 @@ export class Auth {
|
|
|
42
43
|
[agents];
|
|
43
44
|
/** Prepare request-scoped UI in the handler before returning JSX. */
|
|
44
45
|
forms;
|
|
46
|
+
/**
|
|
47
|
+
* Make a link that signs a user in once, for when they have no passkey
|
|
48
|
+
* where they need one: at another origin that shares the users table,
|
|
49
|
+
* such as production after registering on `localhost`, or after losing
|
|
50
|
+
* their device. It opens the authentication `page`, where `<Link />` from
|
|
51
|
+
* `auth.forms(c)` signs them in, and they add a passkey.
|
|
52
|
+
*
|
|
53
|
+
* Anyone who has the link is the user until it is used or expires, so
|
|
54
|
+
* make one only for a user your code has already identified, and send it
|
|
55
|
+
* the way you would a password. It is best kept to a script or an admin
|
|
56
|
+
* page, not a form any signed-in user can use in production.
|
|
57
|
+
*
|
|
58
|
+
* @param user ID of the user it signs in
|
|
59
|
+
* @param options The origin it is opened at, this one by default
|
|
60
|
+
* @returns The link, which lasts 5 minutes
|
|
61
|
+
*/
|
|
62
|
+
link;
|
|
45
63
|
/** Configure passkeys, session helpers, and automatic authentication rate limits. */
|
|
46
64
|
constructor(options) {
|
|
47
65
|
const origin = new URL(options.origin);
|
|
@@ -77,6 +95,7 @@ export class Auth {
|
|
|
77
95
|
const signin = oauth(options, storage, (c) => this.#state(c), resources);
|
|
78
96
|
this.#routes = service.routes;
|
|
79
97
|
this.forms = service.forms;
|
|
98
|
+
this.link = service.link;
|
|
80
99
|
this.consent = signin.consent;
|
|
81
100
|
this[agents] = {
|
|
82
101
|
origin: options.origin,
|
package/dist/auth/passkey.d.ts
CHANGED
|
@@ -85,6 +85,9 @@ export declare class Passkey {
|
|
|
85
85
|
counter: number;
|
|
86
86
|
eligible: boolean;
|
|
87
87
|
backedUp: boolean;
|
|
88
|
+
created: number;
|
|
89
|
+
origin: string;
|
|
90
|
+
name: string | null;
|
|
88
91
|
}>;
|
|
89
92
|
/**
|
|
90
93
|
* Verify login and atomically update the credential.
|
|
@@ -102,6 +105,9 @@ export declare class Passkey {
|
|
|
102
105
|
user: string;
|
|
103
106
|
publicKey: string;
|
|
104
107
|
eligible: boolean;
|
|
108
|
+
created: number;
|
|
109
|
+
origin: string;
|
|
110
|
+
name: string | null;
|
|
105
111
|
}>;
|
|
106
112
|
}
|
|
107
113
|
//# sourceMappingURL=passkey.d.ts.map
|
|
@@ -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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"}
|
package/dist/auth/passkey.js
CHANGED
|
@@ -350,6 +350,10 @@ export class Passkey {
|
|
|
350
350
|
counter: data.counter,
|
|
351
351
|
eligible: Boolean(data.flags & 8),
|
|
352
352
|
backedUp: Boolean(data.flags & 16),
|
|
353
|
+
created: Date.now(),
|
|
354
|
+
origin: this.#auth.options.origin,
|
|
355
|
+
// what a person calls one they add
|
|
356
|
+
name: null,
|
|
353
357
|
};
|
|
354
358
|
}
|
|
355
359
|
/**
|
package/dist/auth/storage.d.ts
CHANGED
|
@@ -76,6 +76,16 @@ export declare class Storage {
|
|
|
76
76
|
counter: Schema<number>;
|
|
77
77
|
eligible: Schema<boolean>;
|
|
78
78
|
backedUp: Schema<boolean>;
|
|
79
|
+
created: Schema<number>;
|
|
80
|
+
origin: Schema<string>;
|
|
81
|
+
name: Schema<string | null>;
|
|
82
|
+
}, {}>;
|
|
83
|
+
/** One-time sign-in links, by the hash of their token. */
|
|
84
|
+
static readonly links: Table<"auth_links", {
|
|
85
|
+
id: Schema<string>;
|
|
86
|
+
user: Schema<string>;
|
|
87
|
+
origin: Schema<string>;
|
|
88
|
+
expiration: Schema<number>;
|
|
79
89
|
}, {}>;
|
|
80
90
|
/** Revocable sessions. */
|
|
81
91
|
static readonly sessions: Table<"auth_sessions", {
|
|
@@ -117,6 +127,9 @@ export declare class Storage {
|
|
|
117
127
|
counter: Schema<number>;
|
|
118
128
|
eligible: Schema<boolean>;
|
|
119
129
|
backedUp: Schema<boolean>;
|
|
130
|
+
created: Schema<number>;
|
|
131
|
+
origin: Schema<string>;
|
|
132
|
+
name: Schema<string | null>;
|
|
120
133
|
}, {}>, Table<"auth_sessions", {
|
|
121
134
|
id: Schema<string>;
|
|
122
135
|
user: Schema<string>;
|
|
@@ -133,6 +146,11 @@ export declare class Storage {
|
|
|
133
146
|
challenge: Schema<string | null>;
|
|
134
147
|
family: Schema<string>;
|
|
135
148
|
expiration: Schema<number>;
|
|
149
|
+
}, {}>, Table<"auth_links", {
|
|
150
|
+
id: Schema<string>;
|
|
151
|
+
user: Schema<string>;
|
|
152
|
+
origin: Schema<string>;
|
|
153
|
+
expiration: Schema<number>;
|
|
136
154
|
}, {}>];
|
|
137
155
|
/**
|
|
138
156
|
* @param db Database containing the authentication tables
|
|
@@ -181,6 +199,26 @@ export declare class Storage {
|
|
|
181
199
|
readonly challenges: Storage.Challenges;
|
|
182
200
|
readonly sessions: Storage.Sessions;
|
|
183
201
|
readonly credentials: Storage.Credentials;
|
|
202
|
+
readonly links: {
|
|
203
|
+
/**
|
|
204
|
+
* @param token Link's token, stored by its hash
|
|
205
|
+
* @param link Who it signs in, where, and until when
|
|
206
|
+
*/
|
|
207
|
+
set: (token: string, link: {
|
|
208
|
+
user: string;
|
|
209
|
+
origin: string;
|
|
210
|
+
expiration: number;
|
|
211
|
+
}) => Promise<void>;
|
|
212
|
+
/**
|
|
213
|
+
* Uses a link once: concurrent calls have one winner.
|
|
214
|
+
*
|
|
215
|
+
* @param token Link's token
|
|
216
|
+
* @param origin Origin it is opened at
|
|
217
|
+
* @returns The user it signs in, nothing when it is used, expired, or
|
|
218
|
+
* for another origin
|
|
219
|
+
*/
|
|
220
|
+
take: (token: string, origin: string) => Promise<string | undefined>;
|
|
221
|
+
};
|
|
184
222
|
/**
|
|
185
223
|
* Create the account and its first credential in one transaction.
|
|
186
224
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/auth/storage.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../../src/auth/storage.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/storage.js
CHANGED
|
@@ -15,6 +15,17 @@ export class Storage {
|
|
|
15
15
|
counter: Schema.number().int(),
|
|
16
16
|
eligible: Schema.boolean(),
|
|
17
17
|
backedUp: Schema.boolean(),
|
|
18
|
+
// what tells an account's passkeys apart
|
|
19
|
+
created: Schema.number().int(),
|
|
20
|
+
origin: Schema.string(),
|
|
21
|
+
name: Schema.string().nullable(),
|
|
22
|
+
});
|
|
23
|
+
/** One-time sign-in links, by the hash of their token. */
|
|
24
|
+
static links = new Table("auth_links", {
|
|
25
|
+
id: Schema.string(),
|
|
26
|
+
user: Schema.string(),
|
|
27
|
+
origin: Schema.string(),
|
|
28
|
+
expiration: Schema.number().int(),
|
|
18
29
|
});
|
|
19
30
|
/** Revocable sessions. */
|
|
20
31
|
static sessions = new Table("auth_sessions", {
|
|
@@ -64,7 +75,10 @@ export class Storage {
|
|
|
64
75
|
"publicKey" text NOT NULL,
|
|
65
76
|
counter bigint NOT NULL,
|
|
66
77
|
eligible boolean NOT NULL,
|
|
67
|
-
"backedUp" boolean NOT NULL
|
|
78
|
+
"backedUp" boolean NOT NULL,
|
|
79
|
+
created bigint NOT NULL,
|
|
80
|
+
origin text NOT NULL,
|
|
81
|
+
name text
|
|
68
82
|
);
|
|
69
83
|
CREATE INDEX auth_credentials_user ON auth_credentials ("user");
|
|
70
84
|
|
|
@@ -105,7 +119,16 @@ CREATE TABLE auth_tokens (
|
|
|
105
119
|
);
|
|
106
120
|
CREATE INDEX auth_tokens_family ON auth_tokens (family);
|
|
107
121
|
CREATE INDEX auth_tokens_user ON auth_tokens ("user");
|
|
108
|
-
CREATE INDEX auth_tokens_expiration ON auth_tokens (expiration)
|
|
122
|
+
CREATE INDEX auth_tokens_expiration ON auth_tokens (expiration);
|
|
123
|
+
|
|
124
|
+
CREATE TABLE auth_links (
|
|
125
|
+
id text PRIMARY KEY,
|
|
126
|
+
"user" text NOT NULL,
|
|
127
|
+
origin text NOT NULL,
|
|
128
|
+
expiration bigint NOT NULL
|
|
129
|
+
);
|
|
130
|
+
CREATE INDEX auth_links_user ON auth_links ("user");
|
|
131
|
+
CREATE INDEX auth_links_expiration ON auth_links (expiration);`,
|
|
109
132
|
},
|
|
110
133
|
];
|
|
111
134
|
/** Tables whose rows belong to a user, and must reference the users table. */
|
|
@@ -113,6 +136,7 @@ CREATE INDEX auth_tokens_expiration ON auth_tokens (expiration);`,
|
|
|
113
136
|
Storage.credentials,
|
|
114
137
|
Storage.sessions,
|
|
115
138
|
Storage.tokens,
|
|
139
|
+
Storage.links,
|
|
116
140
|
];
|
|
117
141
|
static {
|
|
118
142
|
for (const table of [...Storage.owners, Storage.challenges])
|
|
@@ -151,7 +175,11 @@ CREATE INDEX auth_tokens_expiration ON auth_tokens (expiration);`,
|
|
|
151
175
|
if (Math.abs(now - this.#pruned) < Time.minute)
|
|
152
176
|
return;
|
|
153
177
|
this.#pruned = now;
|
|
154
|
-
const tables = [
|
|
178
|
+
const tables = [
|
|
179
|
+
Storage.challenges,
|
|
180
|
+
Storage.sessions,
|
|
181
|
+
Storage.links,
|
|
182
|
+
];
|
|
155
183
|
if (this.#oauth)
|
|
156
184
|
tables.push(Storage.tokens);
|
|
157
185
|
for (const table of tables)
|
|
@@ -395,6 +423,35 @@ CREATE INDEX auth_tokens_expiration ON auth_tokens (expiration);`,
|
|
|
395
423
|
return rows.length === 1;
|
|
396
424
|
},
|
|
397
425
|
};
|
|
426
|
+
links = {
|
|
427
|
+
/**
|
|
428
|
+
* @param token Link's token, stored by its hash
|
|
429
|
+
* @param link Who it signs in, where, and until when
|
|
430
|
+
*/
|
|
431
|
+
set: async (token, link) => {
|
|
432
|
+
await this.#prune();
|
|
433
|
+
await this.#db
|
|
434
|
+
.sql `INSERT INTO ${Storage.links} ${this.#db.sql.values(Storage.links, { ...link, id: await Storage.hash(token) })}`;
|
|
435
|
+
},
|
|
436
|
+
/**
|
|
437
|
+
* Uses a link once: concurrent calls have one winner.
|
|
438
|
+
*
|
|
439
|
+
* @param token Link's token
|
|
440
|
+
* @param origin Origin it is opened at
|
|
441
|
+
* @returns The user it signs in, nothing when it is used, expired, or
|
|
442
|
+
* for another origin
|
|
443
|
+
*/
|
|
444
|
+
take: async (token, origin) => {
|
|
445
|
+
const { columns } = Storage.links;
|
|
446
|
+
const [row] = await this.#db.sql `
|
|
447
|
+
DELETE FROM ${Storage.links}
|
|
448
|
+
WHERE ${columns.id} = ${await Storage.hash(token)}
|
|
449
|
+
AND ${columns.origin} = ${origin} AND ${columns.expiration} > ${Date.now()}
|
|
450
|
+
RETURNING *
|
|
451
|
+
`.parse(Storage.links);
|
|
452
|
+
return row?.user;
|
|
453
|
+
},
|
|
454
|
+
};
|
|
398
455
|
/**
|
|
399
456
|
* Create the account and its first credential in one transaction.
|
|
400
457
|
*
|
package/dist/form/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/form/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,KAAK,GAAG,EAAO,MAAM,iBAAiB,CAAC;AAC1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EACN,MAAM,EACN,SAAS,EACT,QAAQ,EAKR,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAgC,KAAK,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE3E,6EAA6E;AAC7E,eAAO,MAAM,KAAK,eAAkB,CAAC;AAErC,sEAAsE;AACtE,eAAO,MAAM,KAAK,eAAkB,CAAC;AAErC,kEAAkE;AAClE,QAAA,MAAM,SAAS,eAAsB,CAAC;AACtC,QAAA,MAAM,MAAM,eAAmB,CAAC;AAEhC;;;GAGG;AACH,eAAO,MAAM,KAAK,4BAAmC,CAAC;AAStD;;;;;;;GAOG;AACH,qBAAa,IAAI,CAAC,KAAK,SAAS,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK;;IACxD,oDAAoD;IACpD,MAAM,CAAC,QAAQ,CAAC,MAAM,YAAI,SAAS,EAAE,OAAO,EAAW;IAiBvD,yBAAyB;IACzB,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;IAEtB,uCAAuC;IACvC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;IAKxC,uEAAuE;IACvE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEvB;;;;OAIG;IACH,YAAY,KAAK,EAAE,KAAK,EASvB;IAiBD,4EAA4E;IAC5E,CAAC,KAAK,CAAC,gBAIN;IAoSD;;;;;;OAMG;IACH,KAAK,WACI,QAAQ,GAAG,eAAe,GAAG,SAAS,SACxC,MAAM,CAAC,KAAK,CAAC,IAAI,KACrB,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAwGnC;IAEF;;;;;;;;;OASG;IACH,KAAK,yBAGF,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG;QACjC,MAAM,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;KAChD,iBAIG;IAEJ;;;;;;;;;OASG;IACH,MAAM,0BAIN,AADG,uCAAuC;IAC1C,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,GAAG;QACvC,MAAM,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;QAChD,gEAAgE;QAChE,OAAO,CAAC,EAAE,KAAK,CAAC;KAChB,mBAMC;IAEF;;;;;;;;;;;;;OAaG;IACH,SAAS,GAAI,CAAC,SAAS,SAAS,CAAC,IAAI,CAAC,KAAK,CAAC,wBAGzC;QAAE,IAAI,EAAE,CAAC,CAAA;KAAE,GAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,GAAG;QAC9C,MAAM,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;KAChD,KAAG,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAI1B;CACJ;AA6BD;;;;;;;;;GASG;AACH,cAAM,WAAW,CAChB,MAAM,GAAG,OAAO,EAChB,GAAG,SAAS,KAAK,CAAC,GAAG,GAAG,OAAO,EAC/B,IAAI,SAAS,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,EACpC,MAAM,SAAS,KAAK,CAAC,OAAO,GAAG,SAAS,GAAG,SAAS,EACpD,MAAM,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,EAC9C,IAAI,SAAS,KAAK,CAAC,IAAI,GAAG,SAAS,GAAG,SAAS,CAC9C,SAAQ,MAAM,CAAC,MAAM,CAAC;;IAIvB,iBAAiB;IACjB,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAIpB,gBAAgB;IAChB,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC;IAElB,oDAAoD;IACpD,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAEzB,8DAA8D;IAC9D,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC;IAEpB,iEAAiE;IACjE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IAEvB,gDAAgD;IAChD,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC;IAWvC;;;;;;;;;OASG;IACH,YACC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACjC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC,GAAG,EAEnC,IAAI,GAAE,KAAK,CAAC,IAAkD,EAC9D,KAAK,SAAI,EACT,MAAM,CAAC,EAAE,MAAM,EACf,OAAO,UAAQ,EAaf;IAwBD;;;;;OAKG;IACM,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,OAAO,GAAG,QAAQ;;;;;MA0BzC;IAED;;;;;OAKG;IACH,MAAM,CAAC,IAAI,CACV,KAAK,EAAE,KAAK,CAAC,GAAG,EAChB,IAAI,EAAE,QAAQ,GAAG,eAAe,EAChC,IAAI,EAAE,MAAM,eAGZ;IAED;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,sBAexD;IAED;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAkCzC;IAED;;;;OAIG;IACH,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,CAAC,CAE9D;IAED;;;;;;;;;;;OAWG;IACH,KAAK,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAE3E;IAED;;;;;;;;;;;;;;OAcG;IACH,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAE1E;IAUD;;;;;;;;;;;;;;OAcG;IACH,KAAK,CACJ,CAAC,SAAS,CAAC,GAAG,SAAS,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC,EAE3E,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,EAC1D,OAAO,EAAE,MAAM,GACb,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAKxD,0CAA0C;IAC1C,IAAI,CAAC,KAAK,CAAC,uBAEV;IAED;;;;;;;;;;OAUG;IACH,OAAO,CACN,UAAU,EAAE,GAAG,SAAS,QAAQ,GAC7B,KAAK,CAAC,KAAK,CAAC,MAAM,GAClB,GAAG,SAAS,UAAU,GACrB,KAAK,CAAC,KAAK,CAAC,QAAQ,GACpB,GAAG,SAAS,UAAU,GAEtB,KAAK,CAAC,KAAK,CAAC,IAAI,GAEhB,AADC,wBAAwB;IACzB,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG;QAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,KAAK,CAAA;KAAE,GAC/C,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAIzD;IAqCD;;;;;;;;;;OAUG;IACH,QAAQ,CACP,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,GACzD,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3D,QAAQ,CAAC,CAAC,SAAS,MAAM,EACxB,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,GACnE,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;IA6BrE;;;;;;;;;;;;OAYG;IACH,KAAK,CACJ,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,GAC5D,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;IAiC9D;;;;;;;;OAQG;IACH,OAAO,CACN,CAAC,SAAS,CAAC,GAAG,SAAS,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,CAAC,GAAG,IAAI,CAAC,EAE3E,IAAI,EAAE,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,GACxD,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAKxD;;;;;;OAMG;IACH,UAAmB,MAAM,CAAC,CAAC,EAC1B,GAAG,EAAE,MAAM,CAAC,GAAG,GACb,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAEpD;IAoCD;;;;OAIG;IACH,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,KAAK,EAChC,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,EACtC,KAAK,CAAC,EAAE,MAAM,EACd,SAAS,CAAC,EAAE,OAAO,GAAG,MAAM,GAC1B,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;IA4MzB;;;;OAIG;IACH,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,KAAK,EAC7B,KAAK,EAAE,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,EACtC,KAAK,CAAC,EAAE,MAAM,GACZ,GAAG,CAAC,OAAO,CA4Bb;IAyPD;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,UAE1C;IAED;;;OAGG;IACH,MAAM,CAAC,SAAS,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,WAEhC;CACD;AAoBD;;;GAGG;AACH,eAAO,MAAM,KAAK,UAAW,OAAO,KAAG,KAAK,IAAI,KAAK,CAAC,GACzB,CAAC;AAE9B,yBAAiB,KAAK,CAAC;IACtB,wDAAwD;IACxD,KAAY,KAAK,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAE9C,kDAAkD;IAClD,KAAY,KAAK,GAAG,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;IAE7E,UAAiB,KAAK,CAAC;QACtB,mDAAmD;QACnD,KAAY,IAAI,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,EAAE,CAAC;QAExD;;;;WAIG;QACH,KAAY,GAAG,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,IAAI,OAAO,CACjD,MAAM,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAChC,CAAC;QAEF;;;;;WAKG;QACH,KAAY,OAAO,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK,IAAI;YAC9C,QAAQ,EAAE,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO;SAC3C,CAAC;KACF;IAED;;;;OAIG;IACH,UAAiB,KAAK,CAAC,CAAC,SAAS,KAAK,GAAG,KAAK;QAC7C,8CAA8C;QAC9C,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAEpB,0CAA0C;QAC1C,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC;QAEpC,4CAA4C;QAC5C,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;KAC/B;IAED,UAAiB,KAAK,CAAC;QACtB;;;;WAIG;QACH,KAAK,cAAc,CAAC,CAAC,SAAS,KAAK,IAAI;aACrC,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,SAAS,KAAK,CAAC,QAAQ,CAC5C,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,EACH,MAAM,CAAC,EACP,GAAG,CACH,GACE,CAAC,SAAS,IAAI,GACb,KAAK,GACL,CAAC,GACF,KAAK;SACR,CAAC,MAAM,CAAC,CAAC,CAAC;QAEX;;;;WAIG;QACH,KAAK,cAAc,CAAC,CAAC,SAAS,KAAK,IAAI,IAAI,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QAElE;;;;WAIG;QACH,MAAM,MAAM,IAAI,CAAC,CAAC,SAAS,KAAK,IAAI,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QAEpE;;;;;WAKG;QACH,MAAM,MAAM,MAAM,CACjB,CAAC,SAAS,KAAK,EACf,CAAC,SAAS,MAAM,GAAG,EAAE,IAClB,MAAM,CAAC,KAAK,CAAC,MAAM,CACtB,IAAI,CAAC,CAAC,CAAC,EACP,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EACjB;YACC,4CAA4C;YAC5C,QAAQ,CAAC,MAAM,CAAC,EAAE,cAAc,CAAC,SAAS,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC;YAE7D;;;;;eAKG;YACH,QAAQ,CAAC,OAAO,EAAE,CACjB,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,KACjB,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;SAC9C,CACD,CAAC;QAEF;;;;WAIG;QACH,MAAM,MAAM,QAAQ,CAAC,CAAC,SAAS,KAAK,IAAI;YACvC,QAAQ,EAAE,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM;SAC1C,CAAC;QAEF,MAAM,WAAW,MAAM,CAAC;YACvB,kCAAkC;YAClC,KAAY,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;YAErD;;;;eAIG;YACH,KAAY,OAAO,CAAC,CAAC,SAAS,MAAM,GAAG,EAAE,IAAI;gBAC5C,2CAA2C;gBAC3C,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;gBAExB,6DAA6D;gBAC7D,QAAQ,CAAC,MAAM,CAAC,EAAE,KAAK,CAAC;aACxB,GAAG,CAAC,CAAC;SACN;;KACD;IAED;;;;;OAKG;IACH,UAAiB,MAAM,CACtB,CAAC,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,EACzC,CAAC,SAAS,GAAG,GAAG,GAAG;QAEnB;;;;WAIG;QACH,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;QAEjB,oDAAoD;QACpD,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QAErB,iDAAiD;QACjD,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,SAAS,CAAC;QAE/D,qDAAqD;QACrD,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAExB,sEAAsE;QACtE,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAEvB,mFAAmF;QACnF,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAExB,kCAAkC;QAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,CAAC;QAErB,kBAAkB;QAClB,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;KACnC;IAED;;;;;OAKG;IACH,KAAY,KAAK,GAAG,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;IAE7E,UAAiB,KAAK,CAAC;QACtB,qDAAqD;QACrD,KAAY,IAAI,GACf,kBAAkB,GAAG,kBAAkB,EAAE,GAAG,OAAO,GAAG,SAAS,CAAC;KACjE;IAED;;;;OAIG;IACH,KAAY,IAAI,GAAG,CAAC,IAAI,EAAE,QAAQ,GAAG,eAAe,EAAE,IAAI,EAAE,MAAM,KAAK,KAAK,CAAC;IAE7E,+DAA+D;IAC/D,KAAY,GAAG,GAAG,OAAO,GAAG,UAAU,GAAG,QAAQ,GAAG,UAAU,CAAC;IAE/D,yEAAyE;IACzE,KAAY,IAAI,GAAG,QAAQ,CAC1B,GAAG,EACH,OAAO,CAAC,GAAG,EAAE,UAAU,CAAC,EACxB,IAAI,EACJ,OAAO,GAAG,SAAS,CACnB,CAAC;IAEF,8DAA8D;IAC9D,KAAY,IAAI,GAAG,IAAI,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IAEzD,UAAiB,IAAI,CAAC;QACrB;;;;WAIG;QACH,KAAY,MAAM,CAAC,CAAC,SAAS,IAAI,IAChC,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,CAAC,GACtB,CAAC,GACD,CAAC,SAAS,MAAM,CAAC,MAAM,CAAC,KAAK,GAC5B,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAC9B,KAAK,CAAC;KACX;IAED,yBAAyB;IACzB,KAAY,IAAI,GAAG,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;IAE1D,8CAA8C;IAC9C,KAAY,OAAO,GAAG,SAAS,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC,CAAC;IAErD;;;;;OAKG;IACH,KAAY,OAAO,CAAC,CAAC,SAAS,MAAM,IACnC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;IAEpD;;;;;;;;;OASG;IACH,KAAY,QAAQ,CACnB,MAAM,GAAG,OAAO,EAChB,GAAG,SAAS,KAAK,CAAC,GAAG,GAAG,OAAO,EAC/B,IAAI,SAAS,KAAK,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,EACpC,MAAM,SAAS,KAAK,CAAC,OAAO,GAAG,SAAS,GAAG,SAAS,EACpD,MAAM,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,EAC9C,IAAI,SAAS,KAAK,CAAC,IAAI,GAAG,SAAS,GAAG,SAAS,IAC5C,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;IAEzD,0EAA0E;IAC1E,KAAY,GAAG,GAAG,QAAQ,CACzB,GAAG,EACH,GAAG,EACH,IAAI,EACJ,OAAO,GAAG,SAAS,EACnB,OAAO,GAAG,SAAS,EACnB,IAAI,GAAG,SAAS,CAChB,CAAC;IAEF;;;;OAIG;IACH,KAAY,KAAK,CAAC,CAAC,SAAS,GAAG,IAC9B,CAAC,SAAS,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,GAAG,SAAS,CAAC,GACpE,CAAC,GACD,GAAG,CAAC;IAER,UAAiB,SAAS,CAAC;QAC1B;;;;;;WAMG;QACH,KAAY,KAAK,CAAC,CAAC,SAAS,KAAK,CAAC,KAAK,EAAE,CAAC,SAAS,OAAO,GAAG,IAAI,IAAI;YACpE,2BAA2B;YAC3B,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAEjC;;;;;;;eAOG;YACH,QAAQ,CAAC,OAAO,CAAC,EAChB,SAAS,MAAM,EAAE,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;YAEvE;;;;;eAKG;YACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;YAEnC,iBAAiB;YACjB,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,SAAS,IAAI,GAAG,GAAG,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;SACrE,GAAG,KAAK,CAAC,KAAK,CAAC;QAEhB,2CAA2C;QAC3C,KAAY,IAAI,GAAG,GAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;QAEhD,UAAiB,IAAI,CAAC;YACrB,4BAA4B;YAC5B,KAAY,KAAK,GAAG,GAAG,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC;SACtD;QAED,yCAAyC;QACzC,KAAY,MAAM,GAAG,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,CAAC;QAErD,8CAA8C;QAC9C,KAAY,WAAW,GAAG,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAErD,wCAAwC;QACxC,KAAY,KAAK,GAAG,GAAG,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC;QAE/C;;;;WAIG;QACH,KAAY,OAAO,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,SAAS,UAAU,GACtD,GAAG,CAAC,iBAAiB,CAAC,UAAU,CAAC,GACjC,CAAC,SAAS,QAAQ,GACjB,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAC/B,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAEnC,UAAiB,OAAO,CAAC;YACxB;;;;;eAKG;YACH,KAAY,KAAK,CAAC,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,GAAG;gBAClE,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;aAC1B,CAAC;SACF;QAED,wCAAwC;QACxC,KAAY,KAAK,GAAG,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC;QAEnD,UAAiB,KAAK,CAAC;YACtB;;;;eAIG;YACH,KAAY,KAAK,CAAC,CAAC,SAAS,OAAO,IAAI,KAAK,GAAG;gBAC9C,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;aAC1B,CAAC;SACF;QAED;;;;WAIG;QACH,KAAY,MAAM,CAAC,CAAC,SAAS,OAAO,IAAI,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GAAG;YACzE,mBAAmB;YACnB,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;SAC1B,CAAC;QAEF,UAAiB,MAAM,CAAC;YACvB;;;;;;eAMG;YACH,KAAY,KAAK,CAAC,CAAC,SAAS,OAAO,IAAI,GAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,GAAG;gBACrE,mBAAmB;gBACnB,QAAQ,CAAC,KAAK,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC;aAC1B,CAAC;SACF;KACD;IAED;;;;;OAKG;IACH,KAAY,SAAS,CAAC,CAAC,SAAS,GAAG,IAAI,QAAQ,CAC9C;QACC;;;WAGG;QACH,WAAW,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,WAAW,KAAK,GAAG,CAAC,OAAO,CAAC;QAE5D;;;WAGG;QACH,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,KAAK,KAAK,GAAG,CAAC,OAAO,CAAC;KAChD,GAAG,CAAC,CAAC,SAAS;QAAE,QAAQ,CAAC,GAAG,EAAE,UAAU,CAAC;QAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;KAAE,GAEjE;QACC;;;WAGG;QACH,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,KAAK,GAAG,CAAC,OAAO,CAAC;QAEpD;;;WAGG;QACH,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC;QAElD;;;WAGG;QACH,IAAI,EAAE,SAAS,CAAC,CAAC,SAAS,IAAI,GAC3B,SAAS,CAAC,CAAC,CAAC,GACZ;YAAE,QAAQ,EAAE,CAAC,IAAI,MAAM,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;SAAE,CAAC,EAAE,CAAC;KAClE,GACA,CAAC,SAAS,QAAQ,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,GACrD,CAAC,SAAS,OAAO,GAEjB;QACC,2BAA2B;QAC3B,OAAO,EAAE,CAAC,CAAC;QAEX;;;WAGG;QACH,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,IAAI,KAAK,GAAG,CAAC,OAAO,CAAC;QAE9C;;;WAGG;QACH,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,KAAK,KAAK,GAAG,CAAC,OAAO,CAAC;QAEhD;;;WAGG;QACH,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC;QAE9D;;;WAGG;QACH,MAAM,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC;KACpD,GACA,KAAK,GACN,CAAC,SAAS,QAAQ,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,GACpD,CAAC,SAAS,OAAO,GAEjB;QACC,0BAA0B;QAC1B,OAAO,EAAE,CAAC,CAAC;QAEX;;;WAGG;QACH,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,IAAI,CAAC,KAAK,KAAK,GAAG,CAAC,OAAO,CAAC;QAEpD;;;WAGG;QACH,MAAM,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,MAAM,KAAK,GAAG,CAAC,OAAO,CAAC;QAElD;;;WAGG;QACH,KAAK,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC;QAExD;;;WAGG;QACH,OAAO,EAAE,CACR,KAAK,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,KACvC,GAAG,CAAC,OAAO,CAAC;QAEjB;;;WAGG;QACH,MAAM,EAAE,CAAC,KAAK,EAAE,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC;KAC1D,GAED;QACC;;;WAGG;QACH,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,IAAI,KAAK,GAAG,CAAC,OAAO,CAAC;QAE9C;;;WAGG;QACH,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,KAAK,KAAK,GAAG,CAAC,OAAO,CAAC;QAEhD;;;WAGG;QACH,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC;KAC7D,GAEF;QACC;;;WAGG;QACH,IAAI,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,IAAI,KAAK,GAAG,CAAC,OAAO,CAAC;QAE9C;;;WAGG;QACH,KAAK,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,KAAK,KAAK,GAAG,CAAC,OAAO,CAAC;QAEhD;;;WAGG;QACH,OAAO,EAAE,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC,OAAO,CAAC;KAChE,CAAC,CACN,CAAC;IAEF,sBAAsB;IACtB,KAAY,KAAK,GAAG,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC;IAEhE,UAAiB,KAAK,CAAC;QACtB;;;;WAIG;QACH,UAAU,OAAO;YAChB,8BAA8B;YAC9B,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,CAAC;YAEvB,iCAAiC;YACjC,QAAQ,CAAC,WAAW,CAAC,EAAE,KAAK,CAAC;SAC7B;QAED,iDAAiD;QACjD,MAAM,MAAM,KAAK,GAAG,GAAG,CAAC,iBAAiB,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC;QAE7D,iDAAiD;QACjD,MAAM,MAAM,MAAM,GAAG,GAAG,CAAC,iBAAiB,CAAC,QAAQ,CAAC,GACnD,OAAO,GAAG;YACT;;;;eAIG;YACH,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;SAC1C,CAAC;QAEH,mDAAmD;QACnD,MAAM,MAAM,QAAQ,GAAG,GAAG,CAAC,iBAAiB,CAAC,UAAU,CAAC,GAAG,OAAO,CAAC;QAEnE,2DAA2D;QAC3D,MAAM,MAAM,IAAI,GAAG;YAClB;;;;eAIG;YACH,QAAQ,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;SACnC,CAAC;;KACF;CACD;AAED,8BAA8B;AAC9B,qBAAa,KAAK;;IAejB;;OAEG;IACH,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAErD;IAED;;OAEG;IACH,MAAM,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,CAE7D;IAED;;OAEG;IACH,MAAM,CAAC,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAEzD;IAED;;OAEG;IACH,MAAM,CAAC,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAEnD;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAEvD;IAED;;OAEG;IACH,MAAM,CAAC,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAEzD;IAED;;OAEG;IACH,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAErD;IAED;;OAEG;IACH,MAAM,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAEnE;IAED;;OAEG;IACH,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAEvD;IAED;;OAEG;IACH,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAErD;IAED;;OAEG;IACH,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAErD;IAED;;;;;OAKG;IACH,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAEvE;IAED;;;;;OAKG;IACH,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAEnE;IAgCD;;;;OAIG;IACH,MAAM,CAAC,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAEzD;IAED;;;;OAIG;IACH,MAAM,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,CAAC,CAEvD;IAED;;;;;OAKG;IACH,MAAM,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,EAAE,OAAO,EAAE,UAAU,CAAC,CAM9D;IAED;;OAEG;IACH,MAAM,CAAC,IAAI,IAAI,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,CAUnD;IA8BD;;;;;;;;;;;;OAYG;IACH,MAAM,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,EACvC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GACnC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAShE;IAED;;;;OAIG;IACH,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,EAClC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GACnC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAI3D;IAED;;OAEG;IACH,MAAM,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,EAAE,UAAU,CAAC,CAEpD;IAED;;;;;;;;;;;;;;;OAeG;IACH,MAAM,CAAC,IAAI,CAAC,CAAC,SAAS,KAAK,CAAC,IAAI,EAC/B,IAAI,EAAE,CAAC,GACL,KAAK,CAAC,QAAQ,CAChB,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EACtB,UAAU,EACV,KAAK,CAAC,IAAI,EACV,SAAS,EACT,SAAS,EACT,CAAC,CACD,CAYA;IAED;;;;OAIG;IACH,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,SAAS,MAAM,EACnC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GACnC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAI/D;CACD"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/form/index.ts"],"names":[],"mappings":"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"}
|
package/dist/form/index.js
CHANGED
|
@@ -1200,6 +1200,32 @@ export class Field {
|
|
|
1200
1200
|
static #input(props) {
|
|
1201
1201
|
return new FieldSchema({ props }, Schema.string(required));
|
|
1202
1202
|
}
|
|
1203
|
+
/** A time as a browser's picker sends it, with seconds when it has them */
|
|
1204
|
+
static #clock = /^([01]\d|2[0-3]):[0-5]\d(:[0-5]\d(\.\d{1,3})?)?$/;
|
|
1205
|
+
/**
|
|
1206
|
+
* @param value Text
|
|
1207
|
+
* @returns `true` for a day of the calendar as YYYY-MM-DD
|
|
1208
|
+
*/
|
|
1209
|
+
static #day(value) {
|
|
1210
|
+
if (!/^\d{4}-\d{2}-\d{2}$/.test(value))
|
|
1211
|
+
return false;
|
|
1212
|
+
const date = new Date(`${value}T00:00:00Z`);
|
|
1213
|
+
// a day that is not one, such as the 31st of June, becomes another
|
|
1214
|
+
return (!Number.isNaN(date.getTime()) && date.toISOString().startsWith(value));
|
|
1215
|
+
}
|
|
1216
|
+
/**
|
|
1217
|
+
* A browser's picker only sends its own format, but an agent, or any
|
|
1218
|
+
* other client, sends what it likes, so the value is checked.
|
|
1219
|
+
*
|
|
1220
|
+
* @template T Input type
|
|
1221
|
+
* @param type Input type of the picker
|
|
1222
|
+
* @param message Issue message for a value in another format
|
|
1223
|
+
* @param valid Checks the value
|
|
1224
|
+
* @returns Input field for a picker's value
|
|
1225
|
+
*/
|
|
1226
|
+
static #picked(type, message, valid) {
|
|
1227
|
+
return Field.#input({ type }).refine(valid, message);
|
|
1228
|
+
}
|
|
1203
1229
|
/**
|
|
1204
1230
|
* @returns Text input field
|
|
1205
1231
|
*/
|
|
@@ -1228,7 +1254,7 @@ export class Field {
|
|
|
1228
1254
|
* @returns Color input field
|
|
1229
1255
|
*/
|
|
1230
1256
|
static color() {
|
|
1231
|
-
return Field.#
|
|
1257
|
+
return Field.#picked("color", "Enter a color as #rrggbb", (value) => /^#[0-9a-f]{6}$/i.test(value));
|
|
1232
1258
|
}
|
|
1233
1259
|
/**
|
|
1234
1260
|
* @returns Hidden input field
|
|
@@ -1240,31 +1266,36 @@ export class Field {
|
|
|
1240
1266
|
* @returns Date input field
|
|
1241
1267
|
*/
|
|
1242
1268
|
static date() {
|
|
1243
|
-
return Field.#
|
|
1269
|
+
return Field.#picked("date", "Enter a date as YYYY-MM-DD", (value) => Field.#day(value));
|
|
1244
1270
|
}
|
|
1245
1271
|
/**
|
|
1246
1272
|
* @returns Datetime input field
|
|
1247
1273
|
*/
|
|
1248
1274
|
static datetime() {
|
|
1249
|
-
return Field.#
|
|
1275
|
+
return Field.#picked("datetime-local", "Enter a date and time as YYYY-MM-DDTHH:mm", (value) => {
|
|
1276
|
+
const [day, time, more] = value.split("T");
|
|
1277
|
+
return (more === undefined &&
|
|
1278
|
+
Field.#day(day) &&
|
|
1279
|
+
Field.#clock.test(time ?? ""));
|
|
1280
|
+
});
|
|
1250
1281
|
}
|
|
1251
1282
|
/**
|
|
1252
1283
|
* @returns Month input field
|
|
1253
1284
|
*/
|
|
1254
1285
|
static month() {
|
|
1255
|
-
return Field.#
|
|
1286
|
+
return Field.#picked("month", "Enter a month as YYYY-MM", (value) => /^\d{4}-(0[1-9]|1[0-2])$/.test(value));
|
|
1256
1287
|
}
|
|
1257
1288
|
/**
|
|
1258
1289
|
* @returns Week input field
|
|
1259
1290
|
*/
|
|
1260
1291
|
static week() {
|
|
1261
|
-
return Field.#
|
|
1292
|
+
return Field.#picked("week", "Enter a week as YYYY-Www", (value) => /^\d{4}-W(0[1-9]|[1-4]\d|5[0-3])$/.test(value));
|
|
1262
1293
|
}
|
|
1263
1294
|
/**
|
|
1264
1295
|
* @returns Time input field
|
|
1265
1296
|
*/
|
|
1266
1297
|
static time() {
|
|
1267
|
-
return Field.#
|
|
1298
|
+
return Field.#picked("time", "Enter a time as HH:mm", (value) => Field.#clock.test(value));
|
|
1268
1299
|
}
|
|
1269
1300
|
/**
|
|
1270
1301
|
* Validates email string.
|
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.
|
|
4
|
+
"version": "7.0.0-next.17",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
7
7
|
"type": "git",
|
package/src/auth/configure.ts
CHANGED
|
@@ -11,6 +11,7 @@ import { Issue } from "./issue.js";
|
|
|
11
11
|
import { Passkey } from "./passkey.js";
|
|
12
12
|
import type { State } from "./state.js";
|
|
13
13
|
import type { Storage } from "./storage.js";
|
|
14
|
+
import { Token } from "./token.js";
|
|
14
15
|
|
|
15
16
|
/**
|
|
16
17
|
* Construct startup-complete handlers and request-scoped UI components.
|
|
@@ -53,6 +54,7 @@ export function configure<U extends Auth.Users>(
|
|
|
53
54
|
login: "/auth/login",
|
|
54
55
|
logout: "/auth/logout",
|
|
55
56
|
passkey: "/auth/passkey",
|
|
57
|
+
link: "/auth/link",
|
|
56
58
|
options: "/_passkey/options",
|
|
57
59
|
} as const;
|
|
58
60
|
const page = options.page ?? "/login";
|
|
@@ -119,10 +121,11 @@ export function configure<U extends Auth.Users>(
|
|
|
119
121
|
|
|
120
122
|
const admit = async (
|
|
121
123
|
c: Limiter.Context & Pick<Context, "text" | "redirect" | "url">,
|
|
122
|
-
method: "register" | "login" | "add",
|
|
124
|
+
method: "register" | "login" | "add" | "link",
|
|
123
125
|
prompt: boolean,
|
|
124
126
|
) => {
|
|
125
|
-
|
|
127
|
+
// a link signs in, so it shares a login's limit
|
|
128
|
+
const admission = await limits[method === "link" ? "login" : method].check(
|
|
126
129
|
c,
|
|
127
130
|
prompt ? "options" : "verify",
|
|
128
131
|
);
|
|
@@ -148,7 +151,10 @@ export function configure<U extends Auth.Users>(
|
|
|
148
151
|
c.redirect(state(c).resume(redirect), 303);
|
|
149
152
|
};
|
|
150
153
|
const guard =
|
|
151
|
-
(
|
|
154
|
+
(
|
|
155
|
+
method: "register" | "login" | "logout" | "add" | "link",
|
|
156
|
+
prompt = false,
|
|
157
|
+
) =>
|
|
152
158
|
async (
|
|
153
159
|
c: Limiter.Context & Pick<Context, "text" | "redirect" | "url">,
|
|
154
160
|
next: Middleware.Next,
|
|
@@ -260,17 +266,29 @@ export function configure<U extends Auth.Users>(
|
|
|
260
266
|
action: paths.login,
|
|
261
267
|
});
|
|
262
268
|
});
|
|
269
|
+
/** What a person calls a passkey they add, such as "Laptop" */
|
|
270
|
+
const naming = {
|
|
271
|
+
name: Field.text()
|
|
272
|
+
.max(64)
|
|
273
|
+
.optional()
|
|
274
|
+
.label("Name")
|
|
275
|
+
.hint("Such as the device it is on"),
|
|
276
|
+
};
|
|
263
277
|
const add = Route.post(paths.passkey)
|
|
264
|
-
.fields(Passkey.shape)
|
|
278
|
+
.fields({ ...naming, ...Passkey.shape })
|
|
265
279
|
.use(guard("add"), async (c) => {
|
|
266
|
-
|
|
280
|
+
const input = await Issue.data(c);
|
|
281
|
+
if (!input || input.issues) throw new Issue("passkey request");
|
|
267
282
|
const session = await state(c).session();
|
|
268
283
|
if (!session) throw new Issue("session");
|
|
269
284
|
const credential = await new Passkey(c, state(c)).register();
|
|
270
285
|
// the account that started the ceremony is still the one signed in
|
|
271
286
|
if (credential.user !== session.user) throw new Issue("user");
|
|
272
287
|
await storage
|
|
273
|
-
.register(() => {},
|
|
288
|
+
.register(() => {}, {
|
|
289
|
+
...credential,
|
|
290
|
+
name: input.data.name?.trim() || null,
|
|
291
|
+
})
|
|
274
292
|
.catch((error: unknown) => {
|
|
275
293
|
// a passkey that is already an account's
|
|
276
294
|
if (Database.unique(error)) throw new Issue("passkey");
|
|
@@ -279,7 +297,8 @@ export function configure<U extends Auth.Users>(
|
|
|
279
297
|
c.redirect(returning(c), 303);
|
|
280
298
|
});
|
|
281
299
|
const adding = Route.post(`${paths.options}/add`)
|
|
282
|
-
|
|
300
|
+
// the form's own field is sent with it, and saved when it submits
|
|
301
|
+
.fields({ ...naming, bootstrap: Field.hidden() })
|
|
283
302
|
.use(guard("add", true), async (c) => {
|
|
284
303
|
const input = await Issue.data(c);
|
|
285
304
|
if (!input || input.issues) throw new Issue("passkey request");
|
|
@@ -295,11 +314,24 @@ export function configure<U extends Auth.Users>(
|
|
|
295
314
|
exclude: await storage.credentials.list(session.user),
|
|
296
315
|
});
|
|
297
316
|
});
|
|
317
|
+
/** The parameter of the authentication page a link's token is in */
|
|
318
|
+
const linked = "_link";
|
|
319
|
+
const link = Route.post(paths.link)
|
|
320
|
+
.fields({ link: Field.hidden() })
|
|
321
|
+
.use(guard("link"), async (c) => {
|
|
322
|
+
const input = await Issue.data(c);
|
|
323
|
+
if (!input || input.issues) throw new Issue("link request");
|
|
324
|
+
// once, and only at the origin it was made for
|
|
325
|
+
const user = await storage.links.take(input.data.link, options.origin);
|
|
326
|
+
if (!user) throw new Issue("link");
|
|
327
|
+
await enter(c, user);
|
|
328
|
+
});
|
|
298
329
|
const routes = [
|
|
299
330
|
register,
|
|
300
331
|
login,
|
|
301
332
|
logout,
|
|
302
333
|
add,
|
|
334
|
+
link,
|
|
303
335
|
registration,
|
|
304
336
|
assertion,
|
|
305
337
|
adding,
|
|
@@ -307,6 +339,26 @@ export function configure<U extends Auth.Users>(
|
|
|
307
339
|
];
|
|
308
340
|
return {
|
|
309
341
|
routes,
|
|
342
|
+
/** Make a link that signs a user in once, see `Auth.link`. */
|
|
343
|
+
async link(
|
|
344
|
+
user: string,
|
|
345
|
+
{ origin = options.origin }: { origin?: string } = {},
|
|
346
|
+
) {
|
|
347
|
+
const target = new URL(page, origin);
|
|
348
|
+
if (target.protocol !== "https:" || target.origin !== origin)
|
|
349
|
+
throw new TypeError("A link's origin must be an HTTPS origin");
|
|
350
|
+
|
|
351
|
+
const token = Token.random();
|
|
352
|
+
await storage.links.set(token, {
|
|
353
|
+
user,
|
|
354
|
+
origin,
|
|
355
|
+
// long enough to copy and open, and no longer: it signs in
|
|
356
|
+
// without a passkey
|
|
357
|
+
expiration: Date.now() + 5 * Time.minute,
|
|
358
|
+
});
|
|
359
|
+
target.searchParams.set(linked, token);
|
|
360
|
+
return target.href;
|
|
361
|
+
},
|
|
310
362
|
/** Create forms in the handler before returning JSX, so ovr can set the binding cookie. */
|
|
311
363
|
forms(
|
|
312
364
|
c: Auth.Context,
|
|
@@ -345,7 +397,9 @@ export function configure<U extends Auth.Users>(
|
|
|
345
397
|
? "Registration could not be completed. If you already registered, sign in; otherwise try again."
|
|
346
398
|
: method === "add"
|
|
347
399
|
? "The passkey could not be added. Try again."
|
|
348
|
-
:
|
|
400
|
+
: method === "link"
|
|
401
|
+
? "This link has expired or was already used."
|
|
402
|
+
: "Authentication failed. Try again."
|
|
349
403
|
: undefined),
|
|
350
404
|
});
|
|
351
405
|
// another passkey for the account signed in, such as on a new device
|
|
@@ -357,6 +411,27 @@ export function configure<U extends Auth.Users>(
|
|
|
357
411
|
Register.Issue = error("register", Register.Issue);
|
|
358
412
|
Login.Issue = error("login", Login.Issue);
|
|
359
413
|
Add.Issue = error("add", Add.Issue);
|
|
414
|
+
// a link's token, from the address the link opened
|
|
415
|
+
const token = c.url.searchParams.get(linked);
|
|
416
|
+
const Link = Object.assign(
|
|
417
|
+
(props: Parameters<typeof link.Form>[0]) =>
|
|
418
|
+
(token || failure === "link") &&
|
|
419
|
+
jsx(link.Form, {
|
|
420
|
+
...props,
|
|
421
|
+
children: [
|
|
422
|
+
token && [
|
|
423
|
+
jsx("input", { type: "hidden", name: "link", value: token }),
|
|
424
|
+
props.children ?? jsx("button", { children: "Sign in" }),
|
|
425
|
+
],
|
|
426
|
+
Link.Issue({}),
|
|
427
|
+
],
|
|
428
|
+
}),
|
|
429
|
+
{
|
|
430
|
+
Issue: error("link", (props: Parameters<typeof Add.Issue>[0]) =>
|
|
431
|
+
jsx("p", { role: "status", "aria-live": "polite", ...props }),
|
|
432
|
+
),
|
|
433
|
+
},
|
|
434
|
+
);
|
|
360
435
|
return {
|
|
361
436
|
Register: Object.assign(Register, {
|
|
362
437
|
Field: fields.Field,
|
|
@@ -364,6 +439,7 @@ export function configure<U extends Auth.Users>(
|
|
|
364
439
|
}),
|
|
365
440
|
Login,
|
|
366
441
|
Add,
|
|
442
|
+
Link,
|
|
367
443
|
Logout: (props: Parameters<typeof logout.Form>[0]) =>
|
|
368
444
|
jsx(logout.Form, {
|
|
369
445
|
...props,
|
package/src/auth/index.ts
CHANGED
|
@@ -44,6 +44,14 @@ export namespace Auth {
|
|
|
44
44
|
Add: Route.Form<string> & {
|
|
45
45
|
Issue: (props: JSX.IntrinsicElements["p"]) => JSX.Element;
|
|
46
46
|
};
|
|
47
|
+
/**
|
|
48
|
+
* Signs in with a link from `auth.link`, on the authentication `page`
|
|
49
|
+
* the link opens. It is a button, so only a person uses the link, and
|
|
50
|
+
* renders nothing on a page opened without one.
|
|
51
|
+
*/
|
|
52
|
+
Link: ((props: JSX.IntrinsicElements["form"]) => JSX.Element) & {
|
|
53
|
+
Issue: (props: JSX.IntrinsicElements["p"]) => JSX.Element;
|
|
54
|
+
};
|
|
47
55
|
Logout: Route.Form<string>;
|
|
48
56
|
}
|
|
49
57
|
|
|
@@ -210,6 +218,12 @@ export namespace Auth {
|
|
|
210
218
|
eligible: boolean;
|
|
211
219
|
/** Current backup state, which may change. */
|
|
212
220
|
backedUp: boolean;
|
|
221
|
+
/** When it was made, in milliseconds. */
|
|
222
|
+
created: number;
|
|
223
|
+
/** Origin it was made at, the only one it signs in at. */
|
|
224
|
+
origin: string;
|
|
225
|
+
/** What the person called it when adding it, such as "Laptop". */
|
|
226
|
+
name: string | null;
|
|
213
227
|
}
|
|
214
228
|
}
|
|
215
229
|
|
|
@@ -234,6 +248,7 @@ export class Auth<
|
|
|
234
248
|
Storage.challenges,
|
|
235
249
|
Limiter.table,
|
|
236
250
|
Storage.tokens,
|
|
251
|
+
Storage.links,
|
|
237
252
|
] as const;
|
|
238
253
|
|
|
239
254
|
readonly #options: State.Options;
|
|
@@ -258,6 +273,27 @@ export class Auth<
|
|
|
258
273
|
props?: { nonce?: string },
|
|
259
274
|
) => Auth.Forms<Auth.Fields<U>>;
|
|
260
275
|
|
|
276
|
+
/**
|
|
277
|
+
* Make a link that signs a user in once, for when they have no passkey
|
|
278
|
+
* where they need one: at another origin that shares the users table,
|
|
279
|
+
* such as production after registering on `localhost`, or after losing
|
|
280
|
+
* their device. It opens the authentication `page`, where `<Link />` from
|
|
281
|
+
* `auth.forms(c)` signs them in, and they add a passkey.
|
|
282
|
+
*
|
|
283
|
+
* Anyone who has the link is the user until it is used or expires, so
|
|
284
|
+
* make one only for a user your code has already identified, and send it
|
|
285
|
+
* the way you would a password. It is best kept to a script or an admin
|
|
286
|
+
* page, not a form any signed-in user can use in production.
|
|
287
|
+
*
|
|
288
|
+
* @param user ID of the user it signs in
|
|
289
|
+
* @param options The origin it is opened at, this one by default
|
|
290
|
+
* @returns The link, which lasts 5 minutes
|
|
291
|
+
*/
|
|
292
|
+
readonly link: (
|
|
293
|
+
user: string,
|
|
294
|
+
options?: { origin?: string },
|
|
295
|
+
) => Promise<string>;
|
|
296
|
+
|
|
261
297
|
/** Configure passkeys, session helpers, and automatic authentication rate limits. */
|
|
262
298
|
constructor(options: Auth.Options<U, P, R, C>) {
|
|
263
299
|
const origin = new URL(options.origin);
|
|
@@ -298,6 +334,7 @@ export class Auth<
|
|
|
298
334
|
const signin = oauth(options, storage, (c) => this.#state(c), resources);
|
|
299
335
|
this.#routes = service.routes;
|
|
300
336
|
this.forms = service.forms;
|
|
337
|
+
this.link = service.link;
|
|
301
338
|
this.consent = signin.consent;
|
|
302
339
|
this[agents] = {
|
|
303
340
|
origin: options.origin,
|
package/src/auth/passkey.ts
CHANGED
|
@@ -500,6 +500,10 @@ export class Passkey {
|
|
|
500
500
|
counter: data.counter,
|
|
501
501
|
eligible: Boolean(data.flags & 8),
|
|
502
502
|
backedUp: Boolean(data.flags & 16),
|
|
503
|
+
created: Date.now(),
|
|
504
|
+
origin: this.#auth.options.origin,
|
|
505
|
+
// what a person calls one they add
|
|
506
|
+
name: null as string | null,
|
|
503
507
|
};
|
|
504
508
|
}
|
|
505
509
|
|
package/src/auth/storage.ts
CHANGED
|
@@ -95,6 +95,18 @@ export class Storage {
|
|
|
95
95
|
counter: Schema.number().int(),
|
|
96
96
|
eligible: Schema.boolean(),
|
|
97
97
|
backedUp: Schema.boolean(),
|
|
98
|
+
// what tells an account's passkeys apart
|
|
99
|
+
created: Schema.number().int(),
|
|
100
|
+
origin: Schema.string(),
|
|
101
|
+
name: Schema.string().nullable(),
|
|
102
|
+
});
|
|
103
|
+
|
|
104
|
+
/** One-time sign-in links, by the hash of their token. */
|
|
105
|
+
static readonly links = new Table("auth_links", {
|
|
106
|
+
id: Schema.string(),
|
|
107
|
+
user: Schema.string(),
|
|
108
|
+
origin: Schema.string(),
|
|
109
|
+
expiration: Schema.number().int(),
|
|
98
110
|
});
|
|
99
111
|
|
|
100
112
|
/** Revocable sessions. */
|
|
@@ -148,7 +160,10 @@ export class Storage {
|
|
|
148
160
|
"publicKey" text NOT NULL,
|
|
149
161
|
counter bigint NOT NULL,
|
|
150
162
|
eligible boolean NOT NULL,
|
|
151
|
-
"backedUp" boolean NOT NULL
|
|
163
|
+
"backedUp" boolean NOT NULL,
|
|
164
|
+
created bigint NOT NULL,
|
|
165
|
+
origin text NOT NULL,
|
|
166
|
+
name text
|
|
152
167
|
);
|
|
153
168
|
CREATE INDEX auth_credentials_user ON auth_credentials ("user");
|
|
154
169
|
|
|
@@ -189,7 +204,16 @@ CREATE TABLE auth_tokens (
|
|
|
189
204
|
);
|
|
190
205
|
CREATE INDEX auth_tokens_family ON auth_tokens (family);
|
|
191
206
|
CREATE INDEX auth_tokens_user ON auth_tokens ("user");
|
|
192
|
-
CREATE INDEX auth_tokens_expiration ON auth_tokens (expiration)
|
|
207
|
+
CREATE INDEX auth_tokens_expiration ON auth_tokens (expiration);
|
|
208
|
+
|
|
209
|
+
CREATE TABLE auth_links (
|
|
210
|
+
id text PRIMARY KEY,
|
|
211
|
+
"user" text NOT NULL,
|
|
212
|
+
origin text NOT NULL,
|
|
213
|
+
expiration bigint NOT NULL
|
|
214
|
+
);
|
|
215
|
+
CREATE INDEX auth_links_user ON auth_links ("user");
|
|
216
|
+
CREATE INDEX auth_links_expiration ON auth_links (expiration);`,
|
|
193
217
|
},
|
|
194
218
|
] as const;
|
|
195
219
|
|
|
@@ -198,6 +222,7 @@ CREATE INDEX auth_tokens_expiration ON auth_tokens (expiration);`,
|
|
|
198
222
|
Storage.credentials,
|
|
199
223
|
Storage.sessions,
|
|
200
224
|
Storage.tokens,
|
|
225
|
+
Storage.links,
|
|
201
226
|
] as const;
|
|
202
227
|
|
|
203
228
|
static {
|
|
@@ -245,7 +270,11 @@ CREATE INDEX auth_tokens_expiration ON auth_tokens (expiration);`,
|
|
|
245
270
|
if (Math.abs(now - this.#pruned) < Time.minute) return;
|
|
246
271
|
|
|
247
272
|
this.#pruned = now;
|
|
248
|
-
const tables: Table<string, any>[] = [
|
|
273
|
+
const tables: Table<string, any>[] = [
|
|
274
|
+
Storage.challenges,
|
|
275
|
+
Storage.sessions,
|
|
276
|
+
Storage.links,
|
|
277
|
+
];
|
|
249
278
|
if (this.#oauth) tables.push(Storage.tokens);
|
|
250
279
|
for (const table of tables)
|
|
251
280
|
await this.#db.sql`DELETE FROM ${table} WHERE expiration <= ${now}`;
|
|
@@ -554,6 +583,40 @@ CREATE INDEX auth_tokens_expiration ON auth_tokens (expiration);`,
|
|
|
554
583
|
},
|
|
555
584
|
};
|
|
556
585
|
|
|
586
|
+
readonly links = {
|
|
587
|
+
/**
|
|
588
|
+
* @param token Link's token, stored by its hash
|
|
589
|
+
* @param link Who it signs in, where, and until when
|
|
590
|
+
*/
|
|
591
|
+
set: async (
|
|
592
|
+
token: string,
|
|
593
|
+
link: { user: string; origin: string; expiration: number },
|
|
594
|
+
) => {
|
|
595
|
+
await this.#prune();
|
|
596
|
+
await this.#db
|
|
597
|
+
.sql`INSERT INTO ${Storage.links} ${this.#db.sql.values(Storage.links, { ...link, id: await Storage.hash(token) })}`;
|
|
598
|
+
},
|
|
599
|
+
/**
|
|
600
|
+
* Uses a link once: concurrent calls have one winner.
|
|
601
|
+
*
|
|
602
|
+
* @param token Link's token
|
|
603
|
+
* @param origin Origin it is opened at
|
|
604
|
+
* @returns The user it signs in, nothing when it is used, expired, or
|
|
605
|
+
* for another origin
|
|
606
|
+
*/
|
|
607
|
+
take: async (token: string, origin: string) => {
|
|
608
|
+
const { columns } = Storage.links;
|
|
609
|
+
const [row] = await this.#db.sql`
|
|
610
|
+
DELETE FROM ${Storage.links}
|
|
611
|
+
WHERE ${columns.id} = ${await Storage.hash(token)}
|
|
612
|
+
AND ${columns.origin} = ${origin} AND ${columns.expiration} > ${Date.now()}
|
|
613
|
+
RETURNING *
|
|
614
|
+
`.parse(Storage.links);
|
|
615
|
+
|
|
616
|
+
return row?.user;
|
|
617
|
+
},
|
|
618
|
+
};
|
|
619
|
+
|
|
557
620
|
/**
|
|
558
621
|
* Create the account and its first credential in one transaction.
|
|
559
622
|
*
|
package/src/form/index.ts
CHANGED
|
@@ -2288,6 +2288,41 @@ export class Field {
|
|
|
2288
2288
|
return new FieldSchema({ props }, Schema.string(required));
|
|
2289
2289
|
}
|
|
2290
2290
|
|
|
2291
|
+
/** A time as a browser's picker sends it, with seconds when it has them */
|
|
2292
|
+
static readonly #clock = /^([01]\d|2[0-3]):[0-5]\d(:[0-5]\d(\.\d{1,3})?)?$/;
|
|
2293
|
+
|
|
2294
|
+
/**
|
|
2295
|
+
* @param value Text
|
|
2296
|
+
* @returns `true` for a day of the calendar as YYYY-MM-DD
|
|
2297
|
+
*/
|
|
2298
|
+
static #day(value: string) {
|
|
2299
|
+
if (!/^\d{4}-\d{2}-\d{2}$/.test(value)) return false;
|
|
2300
|
+
|
|
2301
|
+
const date = new Date(`${value}T00:00:00Z`);
|
|
2302
|
+
// a day that is not one, such as the 31st of June, becomes another
|
|
2303
|
+
return (
|
|
2304
|
+
!Number.isNaN(date.getTime()) && date.toISOString().startsWith(value)
|
|
2305
|
+
);
|
|
2306
|
+
}
|
|
2307
|
+
|
|
2308
|
+
/**
|
|
2309
|
+
* A browser's picker only sends its own format, but an agent, or any
|
|
2310
|
+
* other client, sends what it likes, so the value is checked.
|
|
2311
|
+
*
|
|
2312
|
+
* @template T Input type
|
|
2313
|
+
* @param type Input type of the picker
|
|
2314
|
+
* @param message Issue message for a value in another format
|
|
2315
|
+
* @param valid Checks the value
|
|
2316
|
+
* @returns Input field for a picker's value
|
|
2317
|
+
*/
|
|
2318
|
+
static #picked<T extends NonNullable<Field.Type>>(
|
|
2319
|
+
type: T,
|
|
2320
|
+
message: string,
|
|
2321
|
+
valid: (value: string) => boolean,
|
|
2322
|
+
): Field.Instance<string, "input", T> {
|
|
2323
|
+
return Field.#input({ type }).refine(valid, message);
|
|
2324
|
+
}
|
|
2325
|
+
|
|
2291
2326
|
/**
|
|
2292
2327
|
* @returns Text input field
|
|
2293
2328
|
*/
|
|
@@ -2320,7 +2355,9 @@ export class Field {
|
|
|
2320
2355
|
* @returns Color input field
|
|
2321
2356
|
*/
|
|
2322
2357
|
static color(): Field.Instance<string, "input", "color"> {
|
|
2323
|
-
return Field.#
|
|
2358
|
+
return Field.#picked("color", "Enter a color as #rrggbb", (value) =>
|
|
2359
|
+
/^#[0-9a-f]{6}$/i.test(value),
|
|
2360
|
+
);
|
|
2324
2361
|
}
|
|
2325
2362
|
|
|
2326
2363
|
/**
|
|
@@ -2334,35 +2371,54 @@ export class Field {
|
|
|
2334
2371
|
* @returns Date input field
|
|
2335
2372
|
*/
|
|
2336
2373
|
static date(): Field.Instance<string, "input", "date"> {
|
|
2337
|
-
return Field.#
|
|
2374
|
+
return Field.#picked("date", "Enter a date as YYYY-MM-DD", (value) =>
|
|
2375
|
+
Field.#day(value),
|
|
2376
|
+
);
|
|
2338
2377
|
}
|
|
2339
2378
|
|
|
2340
2379
|
/**
|
|
2341
2380
|
* @returns Datetime input field
|
|
2342
2381
|
*/
|
|
2343
2382
|
static datetime(): Field.Instance<string, "input", "datetime-local"> {
|
|
2344
|
-
return Field.#
|
|
2383
|
+
return Field.#picked(
|
|
2384
|
+
"datetime-local",
|
|
2385
|
+
"Enter a date and time as YYYY-MM-DDTHH:mm",
|
|
2386
|
+
(value) => {
|
|
2387
|
+
const [day, time, more] = value.split("T");
|
|
2388
|
+
return (
|
|
2389
|
+
more === undefined &&
|
|
2390
|
+
Field.#day(day!) &&
|
|
2391
|
+
Field.#clock.test(time ?? "")
|
|
2392
|
+
);
|
|
2393
|
+
},
|
|
2394
|
+
);
|
|
2345
2395
|
}
|
|
2346
2396
|
|
|
2347
2397
|
/**
|
|
2348
2398
|
* @returns Month input field
|
|
2349
2399
|
*/
|
|
2350
2400
|
static month(): Field.Instance<string, "input", "month"> {
|
|
2351
|
-
return Field.#
|
|
2401
|
+
return Field.#picked("month", "Enter a month as YYYY-MM", (value) =>
|
|
2402
|
+
/^\d{4}-(0[1-9]|1[0-2])$/.test(value),
|
|
2403
|
+
);
|
|
2352
2404
|
}
|
|
2353
2405
|
|
|
2354
2406
|
/**
|
|
2355
2407
|
* @returns Week input field
|
|
2356
2408
|
*/
|
|
2357
2409
|
static week(): Field.Instance<string, "input", "week"> {
|
|
2358
|
-
return Field.#
|
|
2410
|
+
return Field.#picked("week", "Enter a week as YYYY-Www", (value) =>
|
|
2411
|
+
/^\d{4}-W(0[1-9]|[1-4]\d|5[0-3])$/.test(value),
|
|
2412
|
+
);
|
|
2359
2413
|
}
|
|
2360
2414
|
|
|
2361
2415
|
/**
|
|
2362
2416
|
* @returns Time input field
|
|
2363
2417
|
*/
|
|
2364
2418
|
static time(): Field.Instance<string, "input", "time"> {
|
|
2365
|
-
return Field.#
|
|
2419
|
+
return Field.#picked("time", "Enter a time as HH:mm", (value) =>
|
|
2420
|
+
Field.#clock.test(value),
|
|
2421
|
+
);
|
|
2366
2422
|
}
|
|
2367
2423
|
|
|
2368
2424
|
/**
|