@bbthorson/atproto-cf-auth 0.1.0 → 0.2.0
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/README.md +52 -4
- package/dist/server/auth.d.ts +5 -3
- package/dist/server/auth.js +2 -2
- package/dist/server/auth.js.map +1 -1
- package/dist/server/index.d.ts +1 -0
- package/dist/server/index.js +1 -0
- package/dist/server/index.js.map +1 -1
- package/dist/server/lock.d.ts +65 -0
- package/dist/server/lock.js +97 -0
- package/dist/server/lock.js.map +1 -0
- package/dist/server/runtime.d.ts +1 -1
- package/dist/server/runtime.js +4 -1
- package/dist/server/runtime.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -42,12 +42,60 @@ With Astro: call `auth.handle(context.request)` from middleware or from an
|
|
|
42
42
|
(default `atproto`, which proves identity only; add `transition:generic` to write
|
|
43
43
|
to the user's PDS), `sessionTtlSeconds` (default 30 days), `cookieName`,
|
|
44
44
|
`metadata` (logo, terms and privacy URLs for the consent screen), `onSignIn`,
|
|
45
|
-
`handleResolver` and `requestLock
|
|
45
|
+
`handleResolver` and `requestLock` (see [Lock](#lock)).
|
|
46
46
|
|
|
47
47
|
**To call the user's PDS:** `const session = await auth.getOAuthSession(request)`,
|
|
48
|
-
then `new Agent(session)` from `@atproto/api`. Tokens refresh on demand.
|
|
49
|
-
|
|
50
|
-
|
|
48
|
+
then `new Agent(session)` from `@atproto/api`. Tokens refresh on demand. Before
|
|
49
|
+
you do this from concurrent requests (two `fetch`es from one page is enough),
|
|
50
|
+
add the lock below.
|
|
51
|
+
|
|
52
|
+
### Lock
|
|
53
|
+
|
|
54
|
+
A refresh token can be used once. When two requests for the same user land on
|
|
55
|
+
different isolates and both find the access token stale, both refresh it; the
|
|
56
|
+
one that loses holds a spent token, and the session is deleted. The user is
|
|
57
|
+
signed out.
|
|
58
|
+
|
|
59
|
+
Without `requestLock`, restores are serialised within one isolate, and a refresh
|
|
60
|
+
raced by another isolate is recovered from where the store shows the winner's
|
|
61
|
+
tokens in time. `durableObjectLock` closes the race: each user's restores queue
|
|
62
|
+
at one Durable Object, wherever they run.
|
|
63
|
+
|
|
64
|
+
```ts
|
|
65
|
+
import { AuthLock, createBlueskyAuth, durableObjectLock } from "@bbthorson/atproto-cf-auth/server";
|
|
66
|
+
|
|
67
|
+
export { AuthLock }; // the Durable Object class, exported from your Worker's entry
|
|
68
|
+
|
|
69
|
+
auth ??= createBlueskyAuth({
|
|
70
|
+
// ...
|
|
71
|
+
requestLock: durableObjectLock(env.AUTH_LOCK),
|
|
72
|
+
});
|
|
73
|
+
```
|
|
74
|
+
|
|
75
|
+
```toml
|
|
76
|
+
# wrangler.toml
|
|
77
|
+
[[durable_objects.bindings]]
|
|
78
|
+
name = "AUTH_LOCK"
|
|
79
|
+
class_name = "AuthLock"
|
|
80
|
+
|
|
81
|
+
[[migrations]]
|
|
82
|
+
tag = "atproto-cf-auth-lock-v1"
|
|
83
|
+
new_sqlite_classes = ["AuthLock"]
|
|
84
|
+
```
|
|
85
|
+
|
|
86
|
+
`new_sqlite_classes` works on every plan (the Free plan allows no other kind);
|
|
87
|
+
the lock keeps nothing in storage either way.
|
|
88
|
+
|
|
89
|
+
It costs two Durable Object requests per `getOAuthSession` (acquire and
|
|
90
|
+
release), because the OAuth client takes the lock on every restore, not only on
|
|
91
|
+
a refresh. A holder that never releases (an isolate that died mid-refresh) loses
|
|
92
|
+
the lock after `leaseMs`, 30 seconds by default. If the Durable Object can't be
|
|
93
|
+
reached, the restore goes ahead without it and logs a warning: an outage of the
|
|
94
|
+
lock doesn't sign anyone out.
|
|
95
|
+
|
|
96
|
+
The lock decides who refreshes; the store decides whether the next request
|
|
97
|
+
sees the new tokens. Use `d1Store` with it for a guarantee. With `kvStore`, a
|
|
98
|
+
request at another location may read the old tokens for up to a minute.
|
|
51
99
|
|
|
52
100
|
### Storage
|
|
53
101
|
|
package/dist/server/auth.d.ts
CHANGED
|
@@ -24,9 +24,11 @@ export interface BlueskyAuthOptions {
|
|
|
24
24
|
*/
|
|
25
25
|
handleResolver?: HandleResolver | string | URL;
|
|
26
26
|
/**
|
|
27
|
-
* Serialises
|
|
28
|
-
*
|
|
29
|
-
*
|
|
27
|
+
* Serialises session restores for one DID, so only one request refreshes
|
|
28
|
+
* its tokens at a time. Without one, restores are serialised within an
|
|
29
|
+
* isolate and a refresh raced by another isolate is recovered from where
|
|
30
|
+
* the store allows. Pass `durableObjectLock(env.AUTH_LOCK)` once you call
|
|
31
|
+
* the PDS with `getOAuthSession` from concurrent requests.
|
|
30
32
|
*/
|
|
31
33
|
requestLock?: RuntimeLock;
|
|
32
34
|
/** Extra client metadata shown on the consent screen. */
|
package/dist/server/auth.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { AtprotoDohHandleResolver, OAuthCallbackError, OAuthClient,
|
|
1
|
+
import { AtprotoDohHandleResolver, OAuthCallbackError, OAuthClient, } from "@atproto/oauth-client";
|
|
2
2
|
import { AUTH_ERROR_MESSAGES, AUTH_ERROR_PARAM, isValidHandle, normalizeHandle, safeReturnTo, } from "../shared.js";
|
|
3
3
|
import { appendSetCookie, clearCookie, readCookie, serializeCookie } from "./cookies.js";
|
|
4
4
|
import { webRuntime, sessionStore, stateStore } from "./runtime.js";
|
|
@@ -28,7 +28,7 @@ export function createBlueskyAuth(options) {
|
|
|
28
28
|
const sealer = new Sealer(options.secret);
|
|
29
29
|
const store = options.store;
|
|
30
30
|
const handleResolver = options.handleResolver ?? new AtprotoDohHandleResolver({ dohEndpoint: "https://cloudflare-dns.com/dns-query" });
|
|
31
|
-
const runtimeImplementation = webRuntime(options.requestLock
|
|
31
|
+
const runtimeImplementation = webRuntime(options.requestLock);
|
|
32
32
|
const clients = new Map();
|
|
33
33
|
function clientMetadata(origin) {
|
|
34
34
|
const url = new URL(origin);
|
package/dist/server/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/server/auth.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/server/auth.ts"],"names":[],"mappings":"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"}
|
package/dist/server/index.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export { createBlueskyAuth, type BlueskyAuth, type BlueskyAuthOptions } from "./auth.js";
|
|
2
2
|
export type { AuthStore } from "./stores/types.js";
|
|
3
|
+
export { AuthLock, durableObjectLock, type DurableObjectLockOptions, type DurableObjectNamespaceLike, } from "./lock.js";
|
|
3
4
|
export { d1Store, type D1DatabaseLike, type D1PreparedStatementLike } from "./stores/d1.js";
|
|
4
5
|
export { kvStore, type KVNamespaceLike } from "./stores/kv.js";
|
|
5
6
|
export { memoryStore } from "./stores/memory.js";
|
package/dist/server/index.js
CHANGED
package/dist/server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAA6C,MAAM,WAAW,CAAC;AAEzF,OAAO,EAAE,OAAO,EAAqD,MAAM,gBAAgB,CAAC;AAC5F,OAAO,EAAE,OAAO,EAAwB,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,SAAS,EACT,eAAe,EACf,aAAa,EACb,eAAe,GAGhB,MAAM,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/server/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAA6C,MAAM,WAAW,CAAC;AAEzF,OAAO,EACL,QAAQ,EACR,iBAAiB,GAGlB,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,OAAO,EAAqD,MAAM,gBAAgB,CAAC;AAC5F,OAAO,EAAE,OAAO,EAAwB,MAAM,gBAAgB,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EACL,mBAAmB,EACnB,gBAAgB,EAChB,SAAS,EACT,eAAe,EACf,aAAa,EACb,eAAe,GAGhB,MAAM,cAAc,CAAC"}
|
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
import type { RuntimeLock } from "@atproto/oauth-client";
|
|
2
|
+
/**
|
|
3
|
+
* A lock that holds across isolates, for `requestLock`.
|
|
4
|
+
*
|
|
5
|
+
* `@atproto/oauth-client` takes the lock around every session restore, keyed
|
|
6
|
+
* by DID, and refreshes tokens inside it. A refresh token can be used once,
|
|
7
|
+
* so two isolates refreshing the same session at once leave one of them
|
|
8
|
+
* holding a spent token, and the session is deleted: the user is signed out.
|
|
9
|
+
* The client's own lock covers one isolate; this one is a Durable Object per
|
|
10
|
+
* lock name, so every isolate in every location queues at the same place.
|
|
11
|
+
*
|
|
12
|
+
* The cost is two Durable Object requests per restore (acquire, release).
|
|
13
|
+
*
|
|
14
|
+
* Wire it up:
|
|
15
|
+
*
|
|
16
|
+
* ```ts
|
|
17
|
+
* // worker entry
|
|
18
|
+
* export { AuthLock } from "@bbthorson/atproto-cf-auth/server";
|
|
19
|
+
* createBlueskyAuth({ ..., requestLock: durableObjectLock(env.AUTH_LOCK) });
|
|
20
|
+
* ```
|
|
21
|
+
*
|
|
22
|
+
* ```toml
|
|
23
|
+
* # wrangler.toml
|
|
24
|
+
* [[durable_objects.bindings]]
|
|
25
|
+
* name = "AUTH_LOCK"
|
|
26
|
+
* class_name = "AuthLock"
|
|
27
|
+
*
|
|
28
|
+
* [[migrations]]
|
|
29
|
+
* tag = "atproto-cf-auth-lock-v1"
|
|
30
|
+
* new_sqlite_classes = ["AuthLock"]
|
|
31
|
+
* ```
|
|
32
|
+
*/
|
|
33
|
+
/** The slice of a Durable Object namespace binding this lock uses. */
|
|
34
|
+
export interface DurableObjectNamespaceLike {
|
|
35
|
+
idFromName(name: string): unknown;
|
|
36
|
+
get(id: never): {
|
|
37
|
+
fetch(input: string, init?: RequestInit): Promise<Response>;
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
export interface DurableObjectLockOptions {
|
|
41
|
+
/**
|
|
42
|
+
* How long a holder keeps the lock if it never releases it (an isolate
|
|
43
|
+
* that died mid-refresh), in milliseconds. Default 30 seconds, the
|
|
44
|
+
* client's own limit on one restore.
|
|
45
|
+
*/
|
|
46
|
+
leaseMs?: number;
|
|
47
|
+
}
|
|
48
|
+
/** A `RuntimeLock` backed by the `AuthLock` Durable Object bound as `namespace`. */
|
|
49
|
+
export declare function durableObjectLock(namespace: DurableObjectNamespaceLike, options?: DurableObjectLockOptions): RuntimeLock;
|
|
50
|
+
/**
|
|
51
|
+
* The Durable Object behind `durableObjectLock`: one instance per lock name,
|
|
52
|
+
* holding at most one lease. Waiters are queued in memory, which is enough:
|
|
53
|
+
* an instance stays alive while any request to it is open, and a lease lasts
|
|
54
|
+
* seconds.
|
|
55
|
+
*
|
|
56
|
+
* A plain class with `fetch`, so importing it needs no `cloudflare:workers`.
|
|
57
|
+
*/
|
|
58
|
+
export declare class AuthLock {
|
|
59
|
+
#private;
|
|
60
|
+
constructor(_state?: unknown, _env?: unknown);
|
|
61
|
+
fetch(request: Request): Promise<Response>;
|
|
62
|
+
acquire(leaseMs: number): Promise<string>;
|
|
63
|
+
/** Only the current holder can release: a lapsed holder must not free its successor. */
|
|
64
|
+
release(token: string): void;
|
|
65
|
+
}
|
|
@@ -0,0 +1,97 @@
|
|
|
1
|
+
const DEFAULT_LEASE_MS = 30_000;
|
|
2
|
+
const ORIGIN = "https://atproto-cf-auth.lock";
|
|
3
|
+
/** A `RuntimeLock` backed by the `AuthLock` Durable Object bound as `namespace`. */
|
|
4
|
+
export function durableObjectLock(namespace, options = {}) {
|
|
5
|
+
const leaseMs = options.leaseMs ?? DEFAULT_LEASE_MS;
|
|
6
|
+
return async (name, fn) => {
|
|
7
|
+
const stub = namespace.get(namespace.idFromName(name));
|
|
8
|
+
let token = null;
|
|
9
|
+
try {
|
|
10
|
+
const res = await stub.fetch(`${ORIGIN}/acquire`, {
|
|
11
|
+
method: "POST",
|
|
12
|
+
body: JSON.stringify({ leaseMs }),
|
|
13
|
+
});
|
|
14
|
+
if (!res.ok)
|
|
15
|
+
throw new Error(`acquire answered ${res.status}`);
|
|
16
|
+
token = (await res.json()).token;
|
|
17
|
+
}
|
|
18
|
+
catch (e) {
|
|
19
|
+
// Open rather than closed: a lock that cannot be reached must not
|
|
20
|
+
// sign everyone out. Without it, a restore is only as safe as before.
|
|
21
|
+
console.warn("atproto-cf-auth: the lock is unreachable; restoring without it.", e);
|
|
22
|
+
}
|
|
23
|
+
try {
|
|
24
|
+
return await fn();
|
|
25
|
+
}
|
|
26
|
+
finally {
|
|
27
|
+
if (token) {
|
|
28
|
+
await stub
|
|
29
|
+
.fetch(`${ORIGIN}/release`, { method: "POST", body: JSON.stringify({ token }) })
|
|
30
|
+
.catch((e) => console.warn("atproto-cf-auth: release failed; the lease will lapse.", e));
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
};
|
|
34
|
+
}
|
|
35
|
+
/**
|
|
36
|
+
* The Durable Object behind `durableObjectLock`: one instance per lock name,
|
|
37
|
+
* holding at most one lease. Waiters are queued in memory, which is enough:
|
|
38
|
+
* an instance stays alive while any request to it is open, and a lease lasts
|
|
39
|
+
* seconds.
|
|
40
|
+
*
|
|
41
|
+
* A plain class with `fetch`, so importing it needs no `cloudflare:workers`.
|
|
42
|
+
*/
|
|
43
|
+
export class AuthLock {
|
|
44
|
+
#lease = null;
|
|
45
|
+
#wakers = new Set();
|
|
46
|
+
// Durable Objects are constructed with (state, env); this one needs neither.
|
|
47
|
+
constructor(_state, _env) { }
|
|
48
|
+
async fetch(request) {
|
|
49
|
+
const route = new URL(request.url).pathname;
|
|
50
|
+
if (request.method !== "POST")
|
|
51
|
+
return new Response(null, { status: 405 });
|
|
52
|
+
if (route === "/acquire") {
|
|
53
|
+
const body = (await request.json().catch(() => ({})));
|
|
54
|
+
const leaseMs = typeof body.leaseMs === "number" && body.leaseMs > 0 ? Math.min(body.leaseMs, 5 * 60_000) : DEFAULT_LEASE_MS;
|
|
55
|
+
return Response.json({ token: await this.acquire(leaseMs) });
|
|
56
|
+
}
|
|
57
|
+
if (route === "/release") {
|
|
58
|
+
const body = (await request.json().catch(() => ({})));
|
|
59
|
+
if (typeof body.token === "string")
|
|
60
|
+
this.release(body.token);
|
|
61
|
+
return new Response(null, { status: 204 });
|
|
62
|
+
}
|
|
63
|
+
return new Response(null, { status: 404 });
|
|
64
|
+
}
|
|
65
|
+
async acquire(leaseMs) {
|
|
66
|
+
// Woken by a release or by the lease running out, whichever is first; then
|
|
67
|
+
// look again, since another waiter may have taken it in between.
|
|
68
|
+
while (this.#lease && this.#lease.expires > Date.now()) {
|
|
69
|
+
await this.#wait(this.#lease.expires - Date.now());
|
|
70
|
+
}
|
|
71
|
+
const token = crypto.randomUUID();
|
|
72
|
+
this.#lease = { token, expires: Date.now() + leaseMs };
|
|
73
|
+
return token;
|
|
74
|
+
}
|
|
75
|
+
/** Only the current holder can release: a lapsed holder must not free its successor. */
|
|
76
|
+
release(token) {
|
|
77
|
+
if (this.#lease?.token !== token)
|
|
78
|
+
return;
|
|
79
|
+
this.#lease = null;
|
|
80
|
+
const wakers = [...this.#wakers];
|
|
81
|
+
this.#wakers.clear();
|
|
82
|
+
for (const wake of wakers)
|
|
83
|
+
wake();
|
|
84
|
+
}
|
|
85
|
+
#wait(ms) {
|
|
86
|
+
return new Promise((resolve) => {
|
|
87
|
+
const wake = () => {
|
|
88
|
+
clearTimeout(timer);
|
|
89
|
+
this.#wakers.delete(wake);
|
|
90
|
+
resolve();
|
|
91
|
+
};
|
|
92
|
+
const timer = setTimeout(wake, Math.max(0, ms));
|
|
93
|
+
this.#wakers.add(wake);
|
|
94
|
+
});
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
//# sourceMappingURL=lock.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"lock.js","sourceRoot":"","sources":["../../src/server/lock.ts"],"names":[],"mappings":"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"}
|
package/dist/server/runtime.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ import type { AuthStore } from "./stores/types.js";
|
|
|
7
7
|
* base client directly means no `nodejs_compat` flag and no Node handle
|
|
8
8
|
* resolver (whose undici SSRF guard throws on Workers).
|
|
9
9
|
*/
|
|
10
|
-
export declare function webRuntime(requestLock
|
|
10
|
+
export declare function webRuntime(requestLock?: RuntimeLock): RuntimeImplementation;
|
|
11
11
|
/** Authorization state only has to survive one trip to the PDS and back. */
|
|
12
12
|
export declare const STATE_TTL_SECONDS: number;
|
|
13
13
|
/** Long enough for a refresh token; the PDS decides the real lifetime. */
|
package/dist/server/runtime.js
CHANGED
|
@@ -7,7 +7,10 @@ import { JoseKey } from "@atproto/jwk-jose";
|
|
|
7
7
|
*/
|
|
8
8
|
export function webRuntime(requestLock) {
|
|
9
9
|
return {
|
|
10
|
-
|
|
10
|
+
// Left unset rather than defaulted: the client then locks within the
|
|
11
|
+
// isolate itself *and* knows the lock is only local, so it recovers from
|
|
12
|
+
// a refresh raced by another isolate instead of deleting the session.
|
|
13
|
+
...(requestLock ? { requestLock } : {}),
|
|
11
14
|
createKey: (algs) => JoseKey.generate(algs),
|
|
12
15
|
getRandomValues: (length) => crypto.getRandomValues(new Uint8Array(length)),
|
|
13
16
|
digest: async (bytes, algorithm) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/server/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAa5C;;;;;GAKG;AACH,MAAM,UAAU,UAAU,CAAC,
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/server/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAa5C;;;;;GAKG;AACH,MAAM,UAAU,UAAU,CAAC,WAAyB;IAClD,OAAO;QACL,qEAAqE;QACrE,yEAAyE;QACzE,sEAAsE;QACtE,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACvC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC;QAC3C,eAAe,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,IAAI,UAAU,CAAC,MAAM,CAAC,CAAC;QAC3E,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,EAAE;YACjC,MAAM,IAAI,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACzF,OAAO,IAAI,UAAU,CAAC,MAAM,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;QACjE,CAAC;KACF,CAAC;AACJ,CAAC;AAED,4EAA4E;AAC5E,MAAM,CAAC,MAAM,iBAAiB,GAAG,EAAE,GAAG,EAAE,CAAC;AACzC,0EAA0E;AAC1E,MAAM,CAAC,MAAM,yBAAyB,GAAG,GAAG,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;AAI5D;;;GAGG;AACH,SAAS,SAAS,CAChB,KAAgB,EAChB,MAAc,EACd,MAAc,EACd,UAAkB;IAElB,OAAO;QACL,KAAK,CAAC,GAAG,CAAC,GAAW;YACnB,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,IAAI,CAAY,MAAM,KAAK,CAAC,GAAG,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC,CAAC;YAC3E,IAAI,CAAC,MAAM;gBAAE,OAAO,SAAS,CAAC;YAC9B,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC;YACpC,OAAO,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,EAAkB,CAAC;QAC9E,CAAC;QACD,KAAK,CAAC,GAAG,CAAC,GAAW,EAAE,EAAE,OAAO,EAAE,GAAG,IAAI,EAAK;YAC5C,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,CAAC;YACnC,IAAI,CAAC,OAAO;gBAAE,MAAM,IAAI,KAAK,CAAC,8CAA8C,CAAC,CAAC;YAC9E,MAAM,KAAK,CAAC,GAAG,CAAC,MAAM,GAAG,GAAG,EAAE,MAAM,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,CAAC,EAAE,UAAU,CAAC,CAAC;QACrF,CAAC;QACD,KAAK,CAAC,GAAG,CAAC,GAAW;YACnB,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC;QACnC,CAAC;KACF,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,KAAgB,EAAE,MAAc;IACzD,OAAO,SAAS,CAAoB,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC;AAClF,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,KAAgB,EAAE,MAAc;IAC3D,OAAO,SAAS,CAAU,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,yBAAyB,CAAC,CAAC;AAChF,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@bbthorson/atproto-cf-auth",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.2.0",
|
|
4
4
|
"description": "Bluesky (AT-Proto OAuth) sign-in for apps on Cloudflare Workers: server handlers, D1/KV session stores, and framework-free browser primitives.",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"type": "module",
|