ovr 7.0.0-next.30 → 7.0.0-next.31

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.31
4
+
5
+ ### Minor Changes
6
+
7
+ - cff818b: `auth.agents(c)` lists the agents the signed-in user has connected, each with its `id`, the `name` it gave when it was approved, when it was `connected`, and when the connection `expires`. It replaces querying `auth_tokens` yourself. `auth_tokens` has a `name` column for it, in the `auth:1` migration.
8
+
3
9
  ## 7.0.0-next.30
4
10
 
5
11
  ### Minor Changes
@@ -157,6 +157,17 @@ export declare namespace Auth {
157
157
  readonly Form: (props: JSX.IntrinsicElements["form"]) => JSX.Element;
158
158
  }
159
159
  /** Stored ES256 passkey, including state updated after each login. */
160
+ /** An agent the user has connected */
161
+ export interface Agent {
162
+ /** Client ID, the URL of the agent's metadata document, which `disconnect` takes */
163
+ readonly id: string;
164
+ /** Name the agent gave itself when the user approved it, not verified */
165
+ readonly name: string;
166
+ /** When the user approved it, in milliseconds */
167
+ readonly connected: number;
168
+ /** When the connection ends and the user connects it again, in milliseconds */
169
+ readonly expires: number;
170
+ }
160
171
  export interface Credential {
161
172
  id: string;
162
173
  user: string;
@@ -222,6 +233,7 @@ export declare class Auth<U extends Auth.Users = Auth.Users, P extends string =
222
233
  kind: Schema<"access" | "code" | "refresh" | "spent">;
223
234
  user: Schema<string>;
224
235
  client: Schema<string>;
236
+ name: Schema<string>;
225
237
  resource: Schema<string>;
226
238
  scope: Schema<string>;
227
239
  redirect: Schema<string | null>;
@@ -276,13 +288,22 @@ export declare class Auth<U extends Auth.Users = Auth.Users, P extends string =
276
288
  }>;
277
289
  /** Revoke the current session and expire its cookie. Always await this method. */
278
290
  readonly logout: (c: Pick<Auth.Context, "url" | "cookie" | "res">) => Promise<null>;
291
+ /**
292
+ * The agents the signed-in user has connected, to list on an account page
293
+ * with a way to disconnect each.
294
+ *
295
+ * @param c Request context of the signed-in user
296
+ * @returns Each agent once, by its latest connection
297
+ * @throws When nobody is signed in
298
+ */
299
+ readonly agents: (c: Pick<Auth.Context, "url" | "cookie" | "res">) => Promise<Auth.Agent[]>;
279
300
  /**
280
301
  * Disconnect one of the signed-in user's agents. Once it resolves, the
281
302
  * agent's codes and tokens no longer work, including ones a refresh was
282
303
  * issuing meanwhile, and connecting again needs the user's consent.
283
304
  *
284
305
  * @param c Request context of the signed-in user
285
- * @param client Agent's client ID, from `auth_tokens`
306
+ * @param client Agent's client ID, an agent's `id` from `auth.agents(c)`
286
307
  * @throws When nobody is signed in
287
308
  */
288
309
  readonly disconnect: (c: Pick<Auth.Context, "url" | "cookie" | "res">, client: string) => Promise<void>;
@@ -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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"}
@@ -5,7 +5,7 @@ import { Limiter } from "../limiter/index.js";
5
5
  import { Codec, noStore } from "../util/index.js";
6
6
  import { configure } from "./configure.js";
7
7
  import { Metadata } from "./metadata.js";
8
- import { oauth } from "./oauth.js";
8
+ import { lifetime, oauth } from "./oauth.js";
9
9
  import { State } from "./state.js";
10
10
  import { Storage } from "./storage.js";
11
11
  /**
@@ -153,13 +153,34 @@ export class Auth {
153
153
  logout = (c) => {
154
154
  return this.#state(c).logout();
155
155
  };
156
+ /**
157
+ * The agents the signed-in user has connected, to list on an account page
158
+ * with a way to disconnect each.
159
+ *
160
+ * @param c Request context of the signed-in user
161
+ * @returns Each agent once, by its latest connection
162
+ * @throws When nobody is signed in
163
+ */
164
+ agents = async (c) => {
165
+ const session = await this.#state(c).session();
166
+ if (!session)
167
+ throw new Error("Sign in to list agents");
168
+ return (await this.#storage.tokens.agents(session.user)).map((row) => ({
169
+ id: row.client,
170
+ // one connected before names were kept
171
+ name: row.name || new URL(row.client).host,
172
+ // a connection lasts a fixed time from its approval
173
+ connected: row.expiration - lifetime.refresh,
174
+ expires: row.expiration,
175
+ }));
176
+ };
156
177
  /**
157
178
  * Disconnect one of the signed-in user's agents. Once it resolves, the
158
179
  * agent's codes and tokens no longer work, including ones a refresh was
159
180
  * issuing meanwhile, and connecting again needs the user's consent.
160
181
  *
161
182
  * @param c Request context of the signed-in user
162
- * @param client Agent's client ID, from `auth_tokens`
183
+ * @param client Agent's client ID, an agent's `id` from `auth.agents(c)`
163
184
  * @throws When nobody is signed in
164
185
  */
165
186
  disconnect = async (c, client) => {
@@ -3,6 +3,13 @@ import { Route } from "../route/index.js";
3
3
  import type { Auth } from "./index.js";
4
4
  import type { State } from "./state.js";
5
5
  import { Storage } from "./storage.js";
6
+ /** Lifetimes */
7
+ export declare const lifetime: {
8
+ consent: number;
9
+ code: number;
10
+ access: number;
11
+ refresh: number;
12
+ };
6
13
  /**
7
14
  * OAuth 2.1 authorization server for agents. The user signs in with a passkey
8
15
  * and approves the agent on the app's consent page; the agent receives tokens.
@@ -1 +1 @@
1
- {"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../src/auth/oauth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAKnD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAgEvC;;;;;;;;GAQG;AACH,wBAAgB,KAAK,CACpB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAC1B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,KAAK,KAAK,EAClC,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC;;IAwlB7B;;;OAGG;eACc,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IAmC5D;;;;OAIG;cAEC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,YACb,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;EAgBhC"}
1
+ {"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../../src/auth/oauth.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAKnD,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE1C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIvC,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAkCvC,gBAAgB;AAChB,eAAO,MAAM,QAAQ;IACpB,OAAO;IACP,IAAI;IACJ,MAAM;IACN,OAAO;CACP,CAAC;AAwBF;;;;;;;;GAQG;AACH,wBAAgB,KAAK,CACpB,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAC1B,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,OAAO,KAAK,KAAK,EAClC,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC;;IA0lB7B;;;OAGG;eACc,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IAmC5D;;;;OAIG;cAEC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,YACb,MAAM,GACd,OAAO,CAAC,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;EAgBhC"}
@@ -19,7 +19,7 @@ const paths = {
19
19
  token: "/oauth/token",
20
20
  };
21
21
  /** Lifetimes */
22
- const lifetime = {
22
+ export const lifetime = {
23
23
  consent: 10 * Time.minute,
24
24
  code: Time.minute,
25
25
  access: Time.hour,
@@ -372,6 +372,7 @@ export function oauth(options, storage, state, resources) {
372
372
  kind: "code",
373
373
  user: pending.user,
374
374
  client: pending.client,
375
+ name: pending.name,
375
376
  resource: pending.resource,
376
377
  scope: "",
377
378
  // compared at the exchange only when the request named it (OAuth 2.1)
@@ -524,6 +525,7 @@ export function oauth(options, storage, state, resources) {
524
525
  const row = {
525
526
  user: token.user,
526
527
  client: token.client,
528
+ name: token.name,
527
529
  resource: token.resource,
528
530
  scope: token.scope,
529
531
  };
@@ -48,6 +48,8 @@ export declare namespace Storage {
48
48
  readonly kind: "code" | "access" | "refresh";
49
49
  readonly user: string;
50
50
  readonly client: string;
51
+ /** Name the agent gave itself when the user approved it */
52
+ readonly name: string;
51
53
  readonly resource: string;
52
54
  readonly scope: string;
53
55
  readonly expiration: number;
@@ -112,6 +114,7 @@ export declare class Storage {
112
114
  kind: Schema<"access" | "code" | "refresh" | "spent">;
113
115
  user: Schema<string>;
114
116
  client: Schema<string>;
117
+ name: Schema<string>;
115
118
  resource: Schema<string>;
116
119
  scope: Schema<string>;
117
120
  redirect: Schema<string | null>;
@@ -140,6 +143,7 @@ export declare class Storage {
140
143
  kind: Schema<"access" | "code" | "refresh" | "spent">;
141
144
  user: Schema<string>;
142
145
  client: Schema<string>;
146
+ name: Schema<string>;
143
147
  resource: Schema<string>;
144
148
  scope: Schema<string>;
145
149
  redirect: Schema<string | null>;
@@ -182,6 +186,16 @@ export declare class Storage {
182
186
  * @returns `true` if the tokens were issued
183
187
  */
184
188
  exchange: (token: string, kind: "code" | "refresh", exchange: (row: Storage.Token) => Promise<Record<string, Storage.Token> | undefined>) => Promise<boolean>;
189
+ /**
190
+ * @param user User ID
191
+ * @returns The agents the user has connected, each by its latest
192
+ * connection: a refresh token lasts as long as its connection does
193
+ */
194
+ agents: (user: string) => Promise<Schema.Object.Infer<{
195
+ client: Schema<string>;
196
+ name: Schema<string>;
197
+ expiration: Schema<number>;
198
+ }>[]>;
185
199
  /**
186
200
  * Disconnect one of a user's agents: its codes, access tokens, and
187
201
  * refresh tokens, including ones an exchange is issuing at the same time.
@@ -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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"}
@@ -53,6 +53,7 @@ export class Storage {
53
53
  kind: Schema.enum(["code", "access", "refresh", "spent"]),
54
54
  user: Schema.string(),
55
55
  client: Schema.string(),
56
+ name: Schema.string(),
56
57
  resource: Schema.string(),
57
58
  scope: Schema.string(),
58
59
  redirect: Schema.string().nullable(),
@@ -110,6 +111,7 @@ CREATE TABLE auth_tokens (
110
111
  kind text NOT NULL,
111
112
  "user" text NOT NULL,
112
113
  client text NOT NULL,
114
+ name text NOT NULL,
113
115
  resource text NOT NULL,
114
116
  scope text NOT NULL,
115
117
  redirect text,
@@ -266,6 +268,24 @@ CREATE INDEX auth_links_expiration ON auth_links (expiration);`,
266
268
  throw error;
267
269
  });
268
270
  },
271
+ /**
272
+ * @param user User ID
273
+ * @returns The agents the user has connected, each by its latest
274
+ * connection: a refresh token lasts as long as its connection does
275
+ */
276
+ agents: async (user) => {
277
+ const { columns } = Storage.tokens;
278
+ return this.#db.sql `
279
+ SELECT DISTINCT ON (${columns.client}) ${columns.client}, ${columns.name}, ${columns.expiration}
280
+ FROM ${Storage.tokens}
281
+ WHERE ${columns.user} = ${user} AND ${columns.kind} = 'refresh' AND ${columns.expiration} > ${Date.now()}
282
+ ORDER BY ${columns.client}, ${columns.expiration} DESC
283
+ `.parse(Schema.object({
284
+ client: Schema.string(),
285
+ name: Schema.string(),
286
+ expiration: Schema.number().int(),
287
+ }));
288
+ },
269
289
  /**
270
290
  * Disconnect one of a user's agents: its codes, access tokens, and
271
291
  * refresh tokens, including ones an exchange is issuing at the same time.
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.30",
4
+ "version": "7.0.0-next.31",
5
5
  "license": "MIT",
6
6
  "repository": {
7
7
  "type": "git",
package/src/auth/index.ts CHANGED
@@ -11,7 +11,7 @@ import type { Table } from "../table/index.js";
11
11
  import { Codec, noStore } from "../util/index.js";
12
12
  import { configure } from "./configure.js";
13
13
  import { Metadata } from "./metadata.js";
14
- import { oauth } from "./oauth.js";
14
+ import { lifetime, oauth } from "./oauth.js";
15
15
  import { State } from "./state.js";
16
16
  import { Storage } from "./storage.js";
17
17
 
@@ -213,6 +213,18 @@ export namespace Auth {
213
213
  }
214
214
 
215
215
  /** Stored ES256 passkey, including state updated after each login. */
216
+ /** An agent the user has connected */
217
+ export interface Agent {
218
+ /** Client ID, the URL of the agent's metadata document, which `disconnect` takes */
219
+ readonly id: string;
220
+ /** Name the agent gave itself when the user approved it, not verified */
221
+ readonly name: string;
222
+ /** When the user approved it, in milliseconds */
223
+ readonly connected: number;
224
+ /** When the connection ends and the user connects it again, in milliseconds */
225
+ readonly expires: number;
226
+ }
227
+
216
228
  export interface Credential {
217
229
  id: string;
218
230
  user: string;
@@ -416,13 +428,37 @@ export class Auth<
416
428
  return this.#state(c).logout();
417
429
  };
418
430
 
431
+ /**
432
+ * The agents the signed-in user has connected, to list on an account page
433
+ * with a way to disconnect each.
434
+ *
435
+ * @param c Request context of the signed-in user
436
+ * @returns Each agent once, by its latest connection
437
+ * @throws When nobody is signed in
438
+ */
439
+ readonly agents = async (
440
+ c: Pick<Auth.Context, "url" | "cookie" | "res">,
441
+ ): Promise<Auth.Agent[]> => {
442
+ const session = await this.#state(c).session();
443
+ if (!session) throw new Error("Sign in to list agents");
444
+
445
+ return (await this.#storage.tokens.agents(session.user)).map((row) => ({
446
+ id: row.client,
447
+ // one connected before names were kept
448
+ name: row.name || new URL(row.client).host,
449
+ // a connection lasts a fixed time from its approval
450
+ connected: row.expiration - lifetime.refresh,
451
+ expires: row.expiration,
452
+ }));
453
+ };
454
+
419
455
  /**
420
456
  * Disconnect one of the signed-in user's agents. Once it resolves, the
421
457
  * agent's codes and tokens no longer work, including ones a refresh was
422
458
  * issuing meanwhile, and connecting again needs the user's consent.
423
459
  *
424
460
  * @param c Request context of the signed-in user
425
- * @param client Agent's client ID, from `auth_tokens`
461
+ * @param client Agent's client ID, an agent's `id` from `auth.agents(c)`
426
462
  * @throws When nobody is signed in
427
463
  */
428
464
  readonly disconnect = async (
package/src/auth/oauth.ts CHANGED
@@ -46,7 +46,7 @@ const paths = {
46
46
  } as const;
47
47
 
48
48
  /** Lifetimes */
49
- const lifetime = {
49
+ export const lifetime = {
50
50
  consent: 10 * Time.minute,
51
51
  code: Time.minute,
52
52
  access: Time.hour,
@@ -463,6 +463,7 @@ export function oauth(
463
463
  kind: "code",
464
464
  user: pending.user,
465
465
  client: pending.client,
466
+ name: pending.name,
466
467
  resource: pending.resource,
467
468
  scope: "",
468
469
  // compared at the exchange only when the request named it (OAuth 2.1)
@@ -664,6 +665,7 @@ export function oauth(
664
665
  const row = {
665
666
  user: token.user,
666
667
  client: token.client,
668
+ name: token.name,
667
669
  resource: token.resource,
668
670
  scope: token.scope,
669
671
  };
@@ -60,6 +60,8 @@ export namespace Storage {
60
60
  readonly kind: "code" | "access" | "refresh";
61
61
  readonly user: string;
62
62
  readonly client: string;
63
+ /** Name the agent gave itself when the user approved it */
64
+ readonly name: string;
63
65
  readonly resource: string;
64
66
  readonly scope: string;
65
67
  readonly expiration: number;
@@ -137,6 +139,7 @@ export class Storage {
137
139
  kind: Schema.enum(["code", "access", "refresh", "spent"]),
138
140
  user: Schema.string(),
139
141
  client: Schema.string(),
142
+ name: Schema.string(),
140
143
  resource: Schema.string(),
141
144
  scope: Schema.string(),
142
145
  redirect: Schema.string().nullable(),
@@ -195,6 +198,7 @@ CREATE TABLE auth_tokens (
195
198
  kind text NOT NULL,
196
199
  "user" text NOT NULL,
197
200
  client text NOT NULL,
201
+ name text NOT NULL,
198
202
  resource text NOT NULL,
199
203
  scope text NOT NULL,
200
204
  redirect text,
@@ -384,6 +388,26 @@ CREATE INDEX auth_links_expiration ON auth_links (expiration);`,
384
388
  throw error;
385
389
  });
386
390
  },
391
+ /**
392
+ * @param user User ID
393
+ * @returns The agents the user has connected, each by its latest
394
+ * connection: a refresh token lasts as long as its connection does
395
+ */
396
+ agents: async (user: string) => {
397
+ const { columns } = Storage.tokens;
398
+ return this.#db.sql`
399
+ SELECT DISTINCT ON (${columns.client}) ${columns.client}, ${columns.name}, ${columns.expiration}
400
+ FROM ${Storage.tokens}
401
+ WHERE ${columns.user} = ${user} AND ${columns.kind} = 'refresh' AND ${columns.expiration} > ${Date.now()}
402
+ ORDER BY ${columns.client}, ${columns.expiration} DESC
403
+ `.parse(
404
+ Schema.object({
405
+ client: Schema.string(),
406
+ name: Schema.string(),
407
+ expiration: Schema.number().int(),
408
+ }),
409
+ );
410
+ },
387
411
  /**
388
412
  * Disconnect one of a user's agents: its codes, access tokens, and
389
413
  * refresh tokens, including ones an exchange is issuing at the same time.