@vibes.diy/identity 12.2.9 → 12.2.11
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/clerk-oauth-token.test.d.ts +1 -0
- package/clerk-oauth-token.test.js +502 -0
- package/clerk-oauth-token.test.js.map +1 -0
- package/dash-api/clerk-oauth-token.d.ts +60 -0
- package/dash-api/clerk-oauth-token.js +230 -0
- package/dash-api/clerk-oauth-token.js.map +1 -0
- package/dash-api/token.d.ts +3 -2
- package/dash-api/token.js +3 -2
- package/dash-api/token.js.map +1 -1
- package/package.json +6 -6
- package/server.d.ts +1 -1
- package/server.js +1 -1
- package/server.js.map +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,502 @@
|
|
|
1
|
+
import { afterEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { ClerkOauthFallbackToken, INSTANCE_AFFINITY_TTL_MS, NEGATIVE_CACHE_MAX, NEGATIVE_CACHE_TTL_MS, USERINFO_TIMEOUT_MS, } from "./dash-api/clerk-oauth-token.js";
|
|
3
|
+
import { ClerkClaimSchema } from "./clerk-claim.js";
|
|
4
|
+
import { ensureSuperThis } from "./runtime/superthis.js";
|
|
5
|
+
const USERINFO = {
|
|
6
|
+
object: "oauth_user_info",
|
|
7
|
+
instance_id: "ins_x",
|
|
8
|
+
user_id: "user_36Jeya36aK4m5JTt7BFDeVkgfuk",
|
|
9
|
+
sub: "user_36Jeya36aK4m5JTt7BFDeVkgfuk",
|
|
10
|
+
email: "dev@example.com",
|
|
11
|
+
email_verified: true,
|
|
12
|
+
family_name: "Estes",
|
|
13
|
+
given_name: "Marcus",
|
|
14
|
+
name: "Marcus Estes",
|
|
15
|
+
picture: "https://img.example/x.png",
|
|
16
|
+
public_metadata: { plan: "plus" },
|
|
17
|
+
username: "popmechanic",
|
|
18
|
+
};
|
|
19
|
+
const USERINFO_URL = "https://issuer.test/oauth/userinfo";
|
|
20
|
+
function fetchOk(body = USERINFO) {
|
|
21
|
+
return vi.fn(async () => new Response(JSON.stringify(body), { status: 200 }));
|
|
22
|
+
}
|
|
23
|
+
const CLERK_ENV_KEYS = ["CLERK_PUB_JWT_URL", "CLERK_PUB_JWT_KEY"];
|
|
24
|
+
function fetchHang() {
|
|
25
|
+
return vi.fn((_url, init) => new Promise((_resolve, reject) => {
|
|
26
|
+
const signal = init?.signal;
|
|
27
|
+
if (!signal)
|
|
28
|
+
return;
|
|
29
|
+
signal.addEventListener("abort", () => reject(signal.reason ?? new Error("aborted")));
|
|
30
|
+
}));
|
|
31
|
+
}
|
|
32
|
+
function fetchByUrl(routes) {
|
|
33
|
+
return vi.fn(async (url) => {
|
|
34
|
+
const mk = routes[url];
|
|
35
|
+
return mk === undefined ? new Response("nope", { status: 404 }) : mk();
|
|
36
|
+
});
|
|
37
|
+
}
|
|
38
|
+
function urlsOf(f) {
|
|
39
|
+
return callsOf(f).map(([url]) => url);
|
|
40
|
+
}
|
|
41
|
+
function callsOf(f) {
|
|
42
|
+
return f.mock.calls;
|
|
43
|
+
}
|
|
44
|
+
function mkToken(opts) {
|
|
45
|
+
const sthis = ensureSuperThis();
|
|
46
|
+
for (const k of CLERK_ENV_KEYS) {
|
|
47
|
+
sthis.env.delete(k);
|
|
48
|
+
}
|
|
49
|
+
for (const [k, v] of Object.entries(opts.env ?? {})) {
|
|
50
|
+
sthis.env.set(k, v);
|
|
51
|
+
}
|
|
52
|
+
return new ClerkOauthFallbackToken(sthis, {
|
|
53
|
+
clockTolerance: 5,
|
|
54
|
+
...(opts.userinfoUrl === undefined ? {} : { userinfoUrl: opts.userinfoUrl }),
|
|
55
|
+
...(opts.userinfoTimeoutMs === undefined ? {} : { userinfoTimeoutMs: opts.userinfoTimeoutMs }),
|
|
56
|
+
...(opts.walkTimeoutMs === undefined ? {} : { walkTimeoutMs: opts.walkTimeoutMs }),
|
|
57
|
+
...(opts.now === undefined ? {} : { now: opts.now }),
|
|
58
|
+
fetch: opts.fetch,
|
|
59
|
+
});
|
|
60
|
+
}
|
|
61
|
+
describe("ClerkOauthFallbackToken", () => {
|
|
62
|
+
afterEach(() => {
|
|
63
|
+
const sthis = ensureSuperThis();
|
|
64
|
+
for (const k of CLERK_ENV_KEYS) {
|
|
65
|
+
sthis.env.delete(k);
|
|
66
|
+
}
|
|
67
|
+
});
|
|
68
|
+
it("verifies an oat_ token via userinfo and synthesizes schema-valid clerk claims", async () => {
|
|
69
|
+
const f = fetchOk();
|
|
70
|
+
const t = mkToken({ fetch: f, userinfoUrl: USERINFO_URL });
|
|
71
|
+
const r = await t.verify("oat_abc123");
|
|
72
|
+
expect(r.isOk()).toBe(true);
|
|
73
|
+
const v = r.Ok();
|
|
74
|
+
expect(v.type).toBe("clerk");
|
|
75
|
+
expect(v.token).toBe("oat_abc123");
|
|
76
|
+
const parsed = ClerkClaimSchema.safeParse(v.claims);
|
|
77
|
+
expect(parsed.success).toBe(true);
|
|
78
|
+
if (!parsed.success)
|
|
79
|
+
return;
|
|
80
|
+
expect(parsed.data).toEqual({
|
|
81
|
+
role: "user",
|
|
82
|
+
sub: USERINFO.sub,
|
|
83
|
+
userId: USERINFO.user_id,
|
|
84
|
+
params: {
|
|
85
|
+
email: USERINFO.email,
|
|
86
|
+
email_verified: true,
|
|
87
|
+
public_meta: USERINFO.public_metadata,
|
|
88
|
+
first: USERINFO.given_name,
|
|
89
|
+
last: USERINFO.family_name,
|
|
90
|
+
name: USERINFO.name,
|
|
91
|
+
image_url: USERINFO.picture,
|
|
92
|
+
},
|
|
93
|
+
});
|
|
94
|
+
});
|
|
95
|
+
it("calls userinfo with the bearer token and nothing else", async () => {
|
|
96
|
+
const f = fetchOk();
|
|
97
|
+
const t = mkToken({ fetch: f, userinfoUrl: USERINFO_URL });
|
|
98
|
+
await t.verify("oat_abc123");
|
|
99
|
+
expect(f).toHaveBeenCalledTimes(1);
|
|
100
|
+
const [url, init] = callsOf(f)[0];
|
|
101
|
+
expect(url).toBe(USERINFO_URL);
|
|
102
|
+
expect(init.headers.authorization).toBe("Bearer oat_abc123");
|
|
103
|
+
});
|
|
104
|
+
it("derives the userinfo URL from the CLERK_PUB_JWT_URL origin when not given", async () => {
|
|
105
|
+
const f = fetchOk();
|
|
106
|
+
const t = mkToken({
|
|
107
|
+
fetch: f,
|
|
108
|
+
env: { CLERK_PUB_JWT_URL: "https://sincere-cheetah-30.clerk.accounts.dev/.well-known/jwks.json" },
|
|
109
|
+
});
|
|
110
|
+
const r = await t.verify("oat_abc123");
|
|
111
|
+
expect(r.isOk()).toBe(true);
|
|
112
|
+
const [url] = callsOf(f)[0];
|
|
113
|
+
expect(url).toBe("https://sincere-cheetah-30.clerk.accounts.dev/oauth/userinfo");
|
|
114
|
+
});
|
|
115
|
+
it("returns Err without a network call when no userinfo URL can be resolved", async () => {
|
|
116
|
+
const f = fetchOk();
|
|
117
|
+
const t = mkToken({ fetch: f });
|
|
118
|
+
const r = await t.verify("oat_abc123");
|
|
119
|
+
expect(r.isErr()).toBe(true);
|
|
120
|
+
expect(f).not.toHaveBeenCalled();
|
|
121
|
+
});
|
|
122
|
+
it("does not touch the network for non-oat_ tokens (delegates to the JWT verifier)", async () => {
|
|
123
|
+
const f = fetchOk();
|
|
124
|
+
const t = mkToken({ fetch: f, userinfoUrl: USERINFO_URL });
|
|
125
|
+
await t.verify("eyJhbGciOi.fake.jwt");
|
|
126
|
+
await t.decode("eyJhbGciOi.fake.jwt");
|
|
127
|
+
expect(f).not.toHaveBeenCalled();
|
|
128
|
+
});
|
|
129
|
+
it("threads clockTolerance into the wrapped JWT verifier and mirrors it", () => {
|
|
130
|
+
const t = mkToken({ fetch: fetchOk(), userinfoUrl: USERINFO_URL });
|
|
131
|
+
expect(t.jwt.clockTolerance).toBe(5);
|
|
132
|
+
expect(t.clockTolerance).toBe(t.jwt.clockTolerance);
|
|
133
|
+
});
|
|
134
|
+
it("hands a non-oat_ token to the wrapped JWT verifier unchanged", async () => {
|
|
135
|
+
const f = fetchOk();
|
|
136
|
+
const t = mkToken({ fetch: f, userinfoUrl: USERINFO_URL });
|
|
137
|
+
const verifySpy = vi.spyOn(t.jwt, "verify");
|
|
138
|
+
const decodeSpy = vi.spyOn(t.jwt, "decode");
|
|
139
|
+
const jwtish = "eyJhbGciOi.fake.jwt";
|
|
140
|
+
await t.verify(jwtish);
|
|
141
|
+
await t.decode(jwtish);
|
|
142
|
+
expect(verifySpy).toHaveBeenCalledWith(jwtish);
|
|
143
|
+
expect(decodeSpy).toHaveBeenCalledWith(jwtish);
|
|
144
|
+
});
|
|
145
|
+
it("never hands an oat_ token to the JWT verifier", async () => {
|
|
146
|
+
const t = mkToken({ fetch: fetchOk(), userinfoUrl: USERINFO_URL });
|
|
147
|
+
const verifySpy = vi.spyOn(t.jwt, "verify");
|
|
148
|
+
const decodeSpy = vi.spyOn(t.jwt, "decode");
|
|
149
|
+
await t.verify("oat_abc123");
|
|
150
|
+
await t.decode("oat_abc123");
|
|
151
|
+
expect(verifySpy).not.toHaveBeenCalled();
|
|
152
|
+
expect(decodeSpy).not.toHaveBeenCalled();
|
|
153
|
+
});
|
|
154
|
+
it("gates on the exact oat_ prefix — near misses never reach the network", async () => {
|
|
155
|
+
for (const near of ["oat", "oat-abc", "OAT_abc", " oat_abc", "xoat_abc", ""]) {
|
|
156
|
+
const f = fetchOk();
|
|
157
|
+
const t = mkToken({ fetch: f, userinfoUrl: USERINFO_URL });
|
|
158
|
+
await t.verify(near);
|
|
159
|
+
expect(f, `token ${JSON.stringify(near)} must not reach userinfo`).not.toHaveBeenCalled();
|
|
160
|
+
}
|
|
161
|
+
});
|
|
162
|
+
it("decode() of an oat_ token introspects (opaque tokens have no offline decode)", async () => {
|
|
163
|
+
const f = fetchOk();
|
|
164
|
+
const t = mkToken({ fetch: f, userinfoUrl: USERINFO_URL });
|
|
165
|
+
const r = await t.decode("oat_abc123");
|
|
166
|
+
expect(r.isOk()).toBe(true);
|
|
167
|
+
expect(r.Ok().type).toBe("clerk");
|
|
168
|
+
expect(f).toHaveBeenCalledTimes(1);
|
|
169
|
+
});
|
|
170
|
+
it("returns Err (not throw) on non-2xx and on non-JSON userinfo bodies", async () => {
|
|
171
|
+
const responses = [
|
|
172
|
+
() => new Response("nope", { status: 401 }),
|
|
173
|
+
() => new Response("nope", { status: 500 }),
|
|
174
|
+
() => new Response("<html>", { status: 200 }),
|
|
175
|
+
];
|
|
176
|
+
for (const mk of responses) {
|
|
177
|
+
const t = mkToken({ fetch: vi.fn(async () => mk()), userinfoUrl: USERINFO_URL });
|
|
178
|
+
const r = await t.verify("oat_bad");
|
|
179
|
+
expect(r.isErr()).toBe(true);
|
|
180
|
+
}
|
|
181
|
+
});
|
|
182
|
+
it("returns Err when userinfo omits or mistypes user_id", async () => {
|
|
183
|
+
for (const body of [{ sub: "user_x" }, { user_id: 42, sub: "user_x" }, { user_id: "", sub: "user_x" }, null, "a string", []]) {
|
|
184
|
+
const t = mkToken({ fetch: fetchOk(body), userinfoUrl: USERINFO_URL });
|
|
185
|
+
const r = await t.verify("oat_bad");
|
|
186
|
+
expect(r.isErr()).toBe(true);
|
|
187
|
+
}
|
|
188
|
+
});
|
|
189
|
+
it("returns Err (not throw) when the fetch itself rejects", async () => {
|
|
190
|
+
const t = mkToken({
|
|
191
|
+
fetch: vi.fn(async () => {
|
|
192
|
+
throw new Error("network down");
|
|
193
|
+
}),
|
|
194
|
+
userinfoUrl: USERINFO_URL,
|
|
195
|
+
});
|
|
196
|
+
const r = await t.verify("oat_abc123");
|
|
197
|
+
expect(r.isErr()).toBe(true);
|
|
198
|
+
});
|
|
199
|
+
it("never leaks the token value into an error message", async () => {
|
|
200
|
+
const cases = [
|
|
201
|
+
() => vi.fn(async () => new Response("nope", { status: 401 })),
|
|
202
|
+
() => vi.fn(async () => new Response("<html>", { status: 200 })),
|
|
203
|
+
() => vi.fn(async () => ({})),
|
|
204
|
+
() => vi.fn(async () => {
|
|
205
|
+
throw new Error("network down oat_supersecret");
|
|
206
|
+
}),
|
|
207
|
+
];
|
|
208
|
+
for (const mk of cases) {
|
|
209
|
+
const t = mkToken({ fetch: mk(), userinfoUrl: USERINFO_URL });
|
|
210
|
+
const r = await t.verify("oat_supersecret");
|
|
211
|
+
expect(r.isErr()).toBe(true);
|
|
212
|
+
expect(String(r.Err())).not.toContain("oat_supersecret");
|
|
213
|
+
}
|
|
214
|
+
});
|
|
215
|
+
it("falls back to schema defaults when userinfo omits the display fields", async () => {
|
|
216
|
+
const t = mkToken({
|
|
217
|
+
fetch: fetchOk({ user_id: "user_y", sub: "user_y", email: "y@example.com", email_verified: false }),
|
|
218
|
+
userinfoUrl: USERINFO_URL,
|
|
219
|
+
});
|
|
220
|
+
const r = await t.verify("oat_abc123");
|
|
221
|
+
expect(r.isOk()).toBe(true);
|
|
222
|
+
const parsed = ClerkClaimSchema.safeParse(r.Ok().claims);
|
|
223
|
+
expect(parsed.success).toBe(true);
|
|
224
|
+
if (!parsed.success)
|
|
225
|
+
return;
|
|
226
|
+
expect(parsed.data).toEqual({
|
|
227
|
+
role: "user",
|
|
228
|
+
sub: "user_y",
|
|
229
|
+
userId: "user_y",
|
|
230
|
+
params: {
|
|
231
|
+
email: "y@example.com",
|
|
232
|
+
email_verified: false,
|
|
233
|
+
public_meta: {},
|
|
234
|
+
first: "",
|
|
235
|
+
last: "",
|
|
236
|
+
name: null,
|
|
237
|
+
image_url: "",
|
|
238
|
+
},
|
|
239
|
+
});
|
|
240
|
+
});
|
|
241
|
+
it("falls back to user_id for sub, and treats a non-true email_verified as false", async () => {
|
|
242
|
+
const t = mkToken({
|
|
243
|
+
fetch: fetchOk({ user_id: "user_z", email: "z@example.com", email_verified: "yes" }),
|
|
244
|
+
userinfoUrl: USERINFO_URL,
|
|
245
|
+
});
|
|
246
|
+
const r = await t.verify("oat_abc123");
|
|
247
|
+
expect(r.isOk()).toBe(true);
|
|
248
|
+
const claims = r.Ok().claims;
|
|
249
|
+
expect(claims.sub).toBe("user_z");
|
|
250
|
+
expect(claims.params.email_verified).toBe(false);
|
|
251
|
+
});
|
|
252
|
+
it("defaults a missing email to the empty string the downstream guard expects", async () => {
|
|
253
|
+
const t = mkToken({ fetch: fetchOk({ user_id: "user_q", sub: "user_q" }), userinfoUrl: USERINFO_URL });
|
|
254
|
+
const r = await t.verify("oat_abc123");
|
|
255
|
+
expect(r.isOk()).toBe(true);
|
|
256
|
+
const claims = r.Ok().claims;
|
|
257
|
+
expect(claims.params.email).toBe("");
|
|
258
|
+
expect(claims.params.email_verified).toBe(false);
|
|
259
|
+
});
|
|
260
|
+
describe("bounded introspection (SSR first-glance amplification)", () => {
|
|
261
|
+
it("passes a live, unfired abort signal on every introspection", async () => {
|
|
262
|
+
const f = fetchOk();
|
|
263
|
+
const t = mkToken({ fetch: f, userinfoUrl: USERINFO_URL });
|
|
264
|
+
await t.verify("oat_abc123");
|
|
265
|
+
const [, init] = callsOf(f)[0];
|
|
266
|
+
expect(init.signal).toBeInstanceOf(AbortSignal);
|
|
267
|
+
expect(init.signal?.aborted).toBe(false);
|
|
268
|
+
});
|
|
269
|
+
it("defaults the deadline to USERINFO_TIMEOUT_MS", () => {
|
|
270
|
+
const t = mkToken({ fetch: fetchOk(), userinfoUrl: USERINFO_URL });
|
|
271
|
+
expect(t.userinfoTimeoutMs).toBe(USERINFO_TIMEOUT_MS);
|
|
272
|
+
expect(USERINFO_TIMEOUT_MS).toBeGreaterThan(0);
|
|
273
|
+
});
|
|
274
|
+
it("aborts a hanging userinfo call and returns Err instead of waiting forever", async () => {
|
|
275
|
+
const f = fetchHang();
|
|
276
|
+
const t = mkToken({ fetch: f, userinfoUrl: USERINFO_URL, userinfoTimeoutMs: 10 });
|
|
277
|
+
const r = await t.verify("oat_supersecret");
|
|
278
|
+
expect(r.isErr()).toBe(true);
|
|
279
|
+
expect(String(r.Err())).not.toContain("oat_supersecret");
|
|
280
|
+
});
|
|
281
|
+
it("does not cache a timeout — a hiccup must not lock a real token out", async () => {
|
|
282
|
+
const f = fetchHang();
|
|
283
|
+
const t = mkToken({ fetch: f, userinfoUrl: USERINFO_URL, userinfoTimeoutMs: 10 });
|
|
284
|
+
expect((await t.verify("oat_abc123")).isErr()).toBe(true);
|
|
285
|
+
expect((await t.verify("oat_abc123")).isErr()).toBe(true);
|
|
286
|
+
expect(f).toHaveBeenCalledTimes(2);
|
|
287
|
+
expect(t.negativeCache.size).toBe(0);
|
|
288
|
+
});
|
|
289
|
+
it("replaying a token Clerk rejected costs no further outbound requests", async () => {
|
|
290
|
+
const f = vi.fn(async () => new Response("nope", { status: 401 }));
|
|
291
|
+
const t = mkToken({ fetch: f, userinfoUrl: USERINFO_URL });
|
|
292
|
+
const first = await t.verify("oat_bad");
|
|
293
|
+
for (let i = 0; i < 25; i++) {
|
|
294
|
+
const again = await t.verify("oat_bad");
|
|
295
|
+
expect(again.isErr()).toBe(true);
|
|
296
|
+
expect(String(again.Err())).toBe(String(first.Err()));
|
|
297
|
+
}
|
|
298
|
+
expect(f).toHaveBeenCalledTimes(1);
|
|
299
|
+
});
|
|
300
|
+
it("caches an unusable 2xx body too (no user_id)", async () => {
|
|
301
|
+
const f = fetchOk({ sub: "user_x" });
|
|
302
|
+
const t = mkToken({ fetch: f, userinfoUrl: USERINFO_URL });
|
|
303
|
+
expect((await t.verify("oat_bad")).isErr()).toBe(true);
|
|
304
|
+
expect((await t.verify("oat_bad")).isErr()).toBe(true);
|
|
305
|
+
expect(f).toHaveBeenCalledTimes(1);
|
|
306
|
+
});
|
|
307
|
+
it("does not cache a 5xx — that is Clerk failing, not a verdict on the token", async () => {
|
|
308
|
+
const f = vi.fn(async () => new Response("boom", { status: 503 }));
|
|
309
|
+
const t = mkToken({ fetch: f, userinfoUrl: USERINFO_URL });
|
|
310
|
+
expect((await t.verify("oat_abc123")).isErr()).toBe(true);
|
|
311
|
+
expect((await t.verify("oat_abc123")).isErr()).toBe(true);
|
|
312
|
+
expect(f).toHaveBeenCalledTimes(2);
|
|
313
|
+
expect(t.negativeCache.size).toBe(0);
|
|
314
|
+
});
|
|
315
|
+
it("never caches a success — a revoked token must not stay accepted", async () => {
|
|
316
|
+
const f = fetchOk();
|
|
317
|
+
const t = mkToken({ fetch: f, userinfoUrl: USERINFO_URL });
|
|
318
|
+
expect((await t.verify("oat_abc123")).isOk()).toBe(true);
|
|
319
|
+
expect((await t.verify("oat_abc123")).isOk()).toBe(true);
|
|
320
|
+
expect(f).toHaveBeenCalledTimes(2);
|
|
321
|
+
expect(t.negativeCache.size).toBe(0);
|
|
322
|
+
});
|
|
323
|
+
it("re-checks a rejected token once its verdict ages past the TTL", async () => {
|
|
324
|
+
let clock = 1_000_000;
|
|
325
|
+
const f = vi.fn(async () => new Response("nope", { status: 401 }));
|
|
326
|
+
const t = mkToken({ fetch: f, userinfoUrl: USERINFO_URL, now: () => clock });
|
|
327
|
+
expect((await t.verify("oat_bad")).isErr()).toBe(true);
|
|
328
|
+
clock += NEGATIVE_CACHE_TTL_MS - 1;
|
|
329
|
+
expect((await t.verify("oat_bad")).isErr()).toBe(true);
|
|
330
|
+
expect(f).toHaveBeenCalledTimes(1);
|
|
331
|
+
clock += 2;
|
|
332
|
+
expect((await t.verify("oat_bad")).isErr()).toBe(true);
|
|
333
|
+
expect(f).toHaveBeenCalledTimes(2);
|
|
334
|
+
});
|
|
335
|
+
it("caps the negative cache — its keys are attacker-supplied", async () => {
|
|
336
|
+
const f = vi.fn(async () => new Response("nope", { status: 401 }));
|
|
337
|
+
const t = mkToken({ fetch: f, userinfoUrl: USERINFO_URL });
|
|
338
|
+
for (let i = 0; i < NEGATIVE_CACHE_MAX + 50; i++) {
|
|
339
|
+
await t.verify(`oat_${i}`);
|
|
340
|
+
}
|
|
341
|
+
expect(t.negativeCache.size).toBe(NEGATIVE_CACHE_MAX);
|
|
342
|
+
expect(t.negativeCache.has("oat_0")).toBe(false);
|
|
343
|
+
expect(t.negativeCache.has(`oat_${NEGATIVE_CACHE_MAX + 49}`)).toBe(true);
|
|
344
|
+
});
|
|
345
|
+
it("never introspects a non-oat_ bearer, so the JWT-verify budget is unchanged", async () => {
|
|
346
|
+
const f = fetchOk();
|
|
347
|
+
const t = mkToken({ fetch: f, userinfoUrl: USERINFO_URL });
|
|
348
|
+
await t.verify("eyJhbGciOi.fake.jwt");
|
|
349
|
+
expect(f).not.toHaveBeenCalled();
|
|
350
|
+
expect(t.negativeCache.size).toBe(0);
|
|
351
|
+
});
|
|
352
|
+
});
|
|
353
|
+
describe("multi-instance introspection (#4704)", () => {
|
|
354
|
+
const A = "https://a.clerk.accounts.dev/oauth/userinfo";
|
|
355
|
+
const B = "https://b.clerk.accounts.dev/oauth/userinfo";
|
|
356
|
+
const TWO_INSTANCES = {
|
|
357
|
+
CLERK_PUB_JWT_URL: "https://a.clerk.accounts.dev/.well-known/jwks.json,https://b.clerk.accounts.dev/.well-known/jwks.json",
|
|
358
|
+
};
|
|
359
|
+
const ok = () => new Response(JSON.stringify(USERINFO), { status: 200 });
|
|
360
|
+
const status = (code) => () => new Response("nope", { status: code });
|
|
361
|
+
it("derives one userinfo endpoint per configured instance, in configured order", () => {
|
|
362
|
+
const t = mkToken({ fetch: fetchOk(), env: TWO_INSTANCES });
|
|
363
|
+
expect(t.userinfoUrls().Ok()).toEqual([A, B]);
|
|
364
|
+
});
|
|
365
|
+
it("accepts a token the SECOND instance minted, having asked the first", async () => {
|
|
366
|
+
const f = fetchByUrl({ [B]: ok });
|
|
367
|
+
const t = mkToken({ fetch: f, env: TWO_INSTANCES });
|
|
368
|
+
const r = await t.verify("oat_from_b");
|
|
369
|
+
expect(r.isOk(), `expected instance B to carry it: ${r.isErr() ? String(r.Err()) : ""}`).toBe(true);
|
|
370
|
+
expect(urlsOf(f)).toEqual([A, B]);
|
|
371
|
+
});
|
|
372
|
+
it("stops at the first instance that accepts — no fan-out past a hit", async () => {
|
|
373
|
+
const f = fetchByUrl({ [A]: ok, [B]: ok });
|
|
374
|
+
const t = mkToken({ fetch: f, env: TWO_INSTANCES });
|
|
375
|
+
expect((await t.verify("oat_from_a")).isOk()).toBe(true);
|
|
376
|
+
expect(urlsOf(f)).toEqual([A]);
|
|
377
|
+
});
|
|
378
|
+
it("is invalid only once EVERY instance has rejected it, and caches that", async () => {
|
|
379
|
+
const f = fetchByUrl({ [A]: status(401), [B]: status(401) });
|
|
380
|
+
const t = mkToken({ fetch: f, env: TWO_INSTANCES });
|
|
381
|
+
expect((await t.verify("oat_bad")).isErr()).toBe(true);
|
|
382
|
+
expect(urlsOf(f)).toEqual([A, B]);
|
|
383
|
+
expect(t.negativeCache.size).toBe(1);
|
|
384
|
+
expect((await t.verify("oat_bad")).isErr()).toBe(true);
|
|
385
|
+
expect(f).toHaveBeenCalledTimes(2);
|
|
386
|
+
});
|
|
387
|
+
it("keeps 429/408 definitive per instance (unchanged semantics, applied to each)", async () => {
|
|
388
|
+
const f = fetchByUrl({ [A]: status(429), [B]: status(408) });
|
|
389
|
+
const t = mkToken({ fetch: f, env: TWO_INSTANCES });
|
|
390
|
+
expect((await t.verify("oat_bad")).isErr()).toBe(true);
|
|
391
|
+
expect(t.negativeCache.size).toBe(1);
|
|
392
|
+
});
|
|
393
|
+
it("walks past a transient first instance to a second that accepts", async () => {
|
|
394
|
+
const f = fetchByUrl({ [A]: status(503), [B]: ok });
|
|
395
|
+
const t = mkToken({ fetch: f, env: TWO_INSTANCES });
|
|
396
|
+
expect((await t.verify("oat_from_b")).isOk()).toBe(true);
|
|
397
|
+
expect(urlsOf(f)).toEqual([A, B]);
|
|
398
|
+
expect(t.negativeCache.size).toBe(0);
|
|
399
|
+
});
|
|
400
|
+
it("fails closed but UNCACHED when one instance rejected and another was transient", async () => {
|
|
401
|
+
const f = fetchByUrl({ [A]: status(503), [B]: status(401) });
|
|
402
|
+
const t = mkToken({ fetch: f, env: TWO_INSTANCES });
|
|
403
|
+
expect((await t.verify("oat_maybe")).isErr()).toBe(true);
|
|
404
|
+
expect(t.negativeCache.size).toBe(0);
|
|
405
|
+
expect((await t.verify("oat_maybe")).isErr()).toBe(true);
|
|
406
|
+
expect(f).toHaveBeenCalledTimes(4);
|
|
407
|
+
});
|
|
408
|
+
it("a transport failure at one instance is transient there, not a verdict", async () => {
|
|
409
|
+
const f = vi.fn(async (url) => {
|
|
410
|
+
if (url === A)
|
|
411
|
+
throw new Error("network down");
|
|
412
|
+
return ok();
|
|
413
|
+
});
|
|
414
|
+
const t = mkToken({ fetch: f, env: TWO_INSTANCES });
|
|
415
|
+
expect((await t.verify("oat_from_b")).isOk()).toBe(true);
|
|
416
|
+
expect(t.negativeCache.size).toBe(0);
|
|
417
|
+
});
|
|
418
|
+
it("a 2xx with an unusable body is a VERDICT — no fallthrough to the next instance", async () => {
|
|
419
|
+
const f = fetchByUrl({
|
|
420
|
+
[A]: () => new Response(JSON.stringify({ sub: "user_x" }), { status: 200 }),
|
|
421
|
+
[B]: ok,
|
|
422
|
+
});
|
|
423
|
+
const t = mkToken({ fetch: f, env: TWO_INSTANCES });
|
|
424
|
+
expect((await t.verify("oat_bad")).isErr()).toBe(true);
|
|
425
|
+
expect(urlsOf(f)).toEqual([A]);
|
|
426
|
+
expect(t.negativeCache.size).toBe(1);
|
|
427
|
+
});
|
|
428
|
+
it("remembers which instance minted a token so the warm path skips the dead ones", async () => {
|
|
429
|
+
const f = fetchByUrl({ [B]: ok });
|
|
430
|
+
const t = mkToken({ fetch: f, env: TWO_INSTANCES });
|
|
431
|
+
expect((await t.verify("oat_from_b")).isOk()).toBe(true);
|
|
432
|
+
expect((await t.verify("oat_from_b")).isOk()).toBe(true);
|
|
433
|
+
expect(urlsOf(f)).toEqual([A, B, B]);
|
|
434
|
+
});
|
|
435
|
+
it("re-walks the full list once the affinity ages out", async () => {
|
|
436
|
+
let clock = 1_000_000;
|
|
437
|
+
const f = fetchByUrl({ [B]: ok });
|
|
438
|
+
const t = mkToken({ fetch: f, env: TWO_INSTANCES, now: () => clock });
|
|
439
|
+
expect((await t.verify("oat_from_b")).isOk()).toBe(true);
|
|
440
|
+
clock += INSTANCE_AFFINITY_TTL_MS + 1;
|
|
441
|
+
expect((await t.verify("oat_from_b")).isOk()).toBe(true);
|
|
442
|
+
expect(urlsOf(f)).toEqual([A, B, A, B]);
|
|
443
|
+
});
|
|
444
|
+
it("drops a stale affinity when that instance stops accepting the token", async () => {
|
|
445
|
+
const routes = { [B]: ok };
|
|
446
|
+
const f = fetchByUrl(routes);
|
|
447
|
+
const t = mkToken({ fetch: f, env: TWO_INSTANCES, now: () => 1_000_000 });
|
|
448
|
+
expect((await t.verify("oat_from_b")).isOk()).toBe(true);
|
|
449
|
+
routes[B] = status(401);
|
|
450
|
+
expect((await t.verify("oat_from_b")).isErr()).toBe(true);
|
|
451
|
+
expect(t.instanceAffinity.size).toBe(0);
|
|
452
|
+
});
|
|
453
|
+
it("skips an entry that is not an http(s) origin rather than going blind on the rest", async () => {
|
|
454
|
+
const f = fetchByUrl({ [B]: ok });
|
|
455
|
+
const t = mkToken({
|
|
456
|
+
fetch: f,
|
|
457
|
+
env: { CLERK_PUB_JWT_URL: "not a url,https://b.clerk.accounts.dev/.well-known/jwks.json" },
|
|
458
|
+
});
|
|
459
|
+
expect((await t.verify("oat_from_b")).isOk()).toBe(true);
|
|
460
|
+
expect(urlsOf(f)).toEqual([B]);
|
|
461
|
+
});
|
|
462
|
+
it("introspects each instance under its OWN deadline", async () => {
|
|
463
|
+
const f = fetchByUrl({ [A]: status(404), [B]: ok });
|
|
464
|
+
const t = mkToken({ fetch: f, env: TWO_INSTANCES });
|
|
465
|
+
await t.verify("oat_from_b");
|
|
466
|
+
for (const [, init] of callsOf(f)) {
|
|
467
|
+
expect(init.signal).toBeInstanceOf(AbortSignal);
|
|
468
|
+
expect(init.signal?.aborted).toBe(false);
|
|
469
|
+
}
|
|
470
|
+
});
|
|
471
|
+
it("bounds the WHOLE walk, not each attempt — slow instances cannot stack", async () => {
|
|
472
|
+
const f = fetchHang();
|
|
473
|
+
const t = mkToken({
|
|
474
|
+
fetch: f,
|
|
475
|
+
env: {
|
|
476
|
+
CLERK_PUB_JWT_URL: [
|
|
477
|
+
"https://a.clerk.accounts.dev/.well-known/jwks.json",
|
|
478
|
+
"https://b.clerk.accounts.dev/.well-known/jwks.json",
|
|
479
|
+
"https://c.clerk.accounts.dev/.well-known/jwks.json",
|
|
480
|
+
].join(","),
|
|
481
|
+
},
|
|
482
|
+
userinfoTimeoutMs: 100,
|
|
483
|
+
walkTimeoutMs: 25,
|
|
484
|
+
});
|
|
485
|
+
const started = Date.now();
|
|
486
|
+
const r = await t.verify("oat_supersecret");
|
|
487
|
+
const elapsed = Date.now() - started;
|
|
488
|
+
expect(r.isErr()).toBe(true);
|
|
489
|
+
expect(elapsed).toBeLessThan(150);
|
|
490
|
+
expect(f).toHaveBeenCalledTimes(1);
|
|
491
|
+
expect(t.negativeCache.size).toBe(0);
|
|
492
|
+
expect(String(r.Err())).not.toContain("oat_supersecret");
|
|
493
|
+
});
|
|
494
|
+
it("still returns Err without any network call when nothing is configured", async () => {
|
|
495
|
+
const f = fetchOk();
|
|
496
|
+
const t = mkToken({ fetch: f, env: { CLERK_PUB_JWT_URL: "not a url" } });
|
|
497
|
+
expect((await t.verify("oat_abc123")).isErr()).toBe(true);
|
|
498
|
+
expect(f).not.toHaveBeenCalled();
|
|
499
|
+
});
|
|
500
|
+
});
|
|
501
|
+
});
|
|
502
|
+
//# sourceMappingURL=clerk-oauth-token.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clerk-oauth-token.test.js","sourceRoot":"","sources":["../jsr/clerk-oauth-token.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EACL,uBAAuB,EACvB,wBAAwB,EACxB,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,GACpB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAIzD,MAAM,QAAQ,GAAG;IACf,MAAM,EAAE,iBAAiB;IACzB,WAAW,EAAE,OAAO;IACpB,OAAO,EAAE,kCAAkC;IAC3C,GAAG,EAAE,kCAAkC;IACvC,KAAK,EAAE,iBAAiB;IACxB,cAAc,EAAE,IAAI;IACpB,WAAW,EAAE,OAAO;IACpB,UAAU,EAAE,QAAQ;IACpB,IAAI,EAAE,cAAc;IACpB,OAAO,EAAE,2BAA2B;IACpC,eAAe,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;IACjC,QAAQ,EAAE,aAAa;CACxB,CAAC;AAEF,MAAM,YAAY,GAAG,oCAAoC,CAAC;AAE1D,SAAS,OAAO,CAAC,IAAI,GAAY,QAAQ;IACvC,OAAO,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAA4B,CAAC;AAC3G,CAAC;AAKD,MAAM,cAAc,GAAG,CAAC,mBAAmB,EAAE,mBAAmB,CAAC,CAAC;AAKlE,SAAS,SAAS;IAChB,OAAO,EAAE,CAAC,EAAE,CACV,CAAC,IAAY,EAAE,IAAkB,EAAE,EAAE,CACnC,IAAI,OAAO,CAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;QACzC,MAAM,MAAM,GAAG,IAAI,EAAE,MAAM,CAAC;QAC5B,IAAI,CAAC,MAAM;YAAE,OAAO;QACpB,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,IAAI,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACxF,CAAC,CAAC,CACsB,CAAC;AAC/B,CAAC;AAKD,SAAS,UAAU,CAAC,MAAsC;IACxD,OAAO,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE;QACjC,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QACvB,OAAO,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;IACzE,CAAC,CAA4B,CAAC;AAChC,CAAC;AAED,SAAS,MAAM,CAAC,CAAe;IAC7B,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC;AACxC,CAAC;AAED,SAAS,OAAO,CAAC,CAAe;IAC9B,OAAQ,CAA6D,CAAC,IAAI,CAAC,KAAK,CAAC;AACnF,CAAC;AAED,SAAS,OAAO,CAAC,IAOhB;IACC,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;IAChC,KAAK,MAAM,CAAC,IAAI,cAAc,EAAE,CAAC;QAC/B,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IACtB,CAAC;IACD,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,EAAE,CAAC,EAAE,CAAC;QACpD,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACtB,CAAC;IACD,OAAO,IAAI,uBAAuB,CAAC,KAAK,EAAE;QACxC,cAAc,EAAE,CAAC;QACjB,GAAG,CAAC,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC;QAC5E,GAAG,CAAC,IAAI,CAAC,iBAAiB,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,iBAAiB,EAAE,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC9F,GAAG,CAAC,IAAI,CAAC,aAAa,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC;QAClF,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC;QACpD,KAAK,EAAE,IAAI,CAAC,KAAK;KAClB,CAAC,CAAC;AACL,CAAC;AAED,QAAQ,CAAC,yBAAyB,EAAE,GAAG,EAAE;IACvC,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;QAChC,KAAK,MAAM,CAAC,IAAI,cAAc,EAAE,CAAC;YAC/B,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;QACtB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+EAA+E,EAAE,KAAK,IAAI,EAAE;QAC7F,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;QACpB,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;QAC3D,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACvC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAC7B,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAInC,MAAM,MAAM,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QACpD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO;QAC5B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YAC1B,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,QAAQ,CAAC,GAAG;YACjB,MAAM,EAAE,QAAQ,CAAC,OAAO;YACxB,MAAM,EAAE;gBACN,KAAK,EAAE,QAAQ,CAAC,KAAK;gBACrB,cAAc,EAAE,IAAI;gBACpB,WAAW,EAAE,QAAQ,CAAC,eAAe;gBACrC,KAAK,EAAE,QAAQ,CAAC,UAAU;gBAC1B,IAAI,EAAE,QAAQ,CAAC,WAAW;gBAC1B,IAAI,EAAE,QAAQ,CAAC,IAAI;gBACnB,SAAS,EAAE,QAAQ,CAAC,OAAO;aAC5B;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACrE,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;QACpB,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;QAC3D,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC7B,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACnC,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/B,MAAM,CAAE,IAAI,CAAC,OAAkC,CAAC,aAAa,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;IAC3F,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;QACzF,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;QACpB,MAAM,CAAC,GAAG,OAAO,CAAC;YAChB,KAAK,EAAE,CAAC;YACR,GAAG,EAAE,EAAE,iBAAiB,EAAE,qEAAqE,EAAE;SAClG,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACvC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5B,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,8DAA8D,CAAC,CAAC;IACnF,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yEAAyE,EAAE,KAAK,IAAI,EAAE;QACvF,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;QACpB,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAChC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACvC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC7B,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gFAAgF,EAAE,KAAK,IAAI,EAAE;QAC9F,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;QACpB,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;QAE3D,MAAM,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACtC,MAAM,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;QACtC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qEAAqE,EAAE,GAAG,EAAE;QAC7E,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;QACnE,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACrC,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IACtD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8DAA8D,EAAE,KAAK,IAAI,EAAE;QAC5E,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;QACpB,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;QAC3D,MAAM,SAAS,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC5C,MAAM,SAAS,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC5C,MAAM,MAAM,GAAG,qBAAqB,CAAC;QACrC,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvB,MAAM,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QACvB,MAAM,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;QAC/C,MAAM,CAAC,SAAS,CAAC,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAC;IACjD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+CAA+C,EAAE,KAAK,IAAI,EAAE;QAC7D,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;QACnE,MAAM,SAAS,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC5C,MAAM,SAAS,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;QAC5C,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC7B,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC7B,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACzC,MAAM,CAAC,SAAS,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sEAAsE,EAAE,KAAK,IAAI,EAAE;QACpF,KAAK,MAAM,IAAI,IAAI,CAAC,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC;YAC7E,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;YACpB,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;YAC3D,MAAM,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;YACrB,MAAM,CAAC,CAAC,EAAE,SAAS,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QAC5F,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8EAA8E,EAAE,KAAK,IAAI,EAAE;QAC5F,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;QACpB,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;QAC3D,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACvC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;QAClC,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;IACrC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;QAClF,MAAM,SAAS,GAAG;YAChB,GAAG,EAAE,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;YAC3C,GAAG,EAAE,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;YAC3C,GAAG,EAAE,CAAC,IAAI,QAAQ,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;SAC9C,CAAC;QACF,KAAK,MAAM,EAAE,IAAI,SAAS,EAAE,CAAC;YAC3B,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,EAAE,CAA4B,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;YAC5G,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACpC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qDAAqD,EAAE,KAAK,IAAI,EAAE;QACnE,KAAK,MAAM,IAAI,IAAI,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,CAAC;YAC7H,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;YACvE,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACpC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC/B,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uDAAuD,EAAE,KAAK,IAAI,EAAE;QACrE,MAAM,CAAC,GAAG,OAAO,CAAC;YAChB,KAAK,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE;gBACtB,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;YAClC,CAAC,CAA4B;YAC7B,WAAW,EAAE,YAAY;SAC1B,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACvC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;QACjE,MAAM,KAAK,GAA2B;YACpC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAA4B;YACzF,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,QAAQ,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAA4B;YAC3F,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,CAAU,CAA4B;YACjE,GAAG,EAAE,CACH,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE;gBACf,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;YAClD,CAAC,CAA4B;SAChC,CAAC;QACF,KAAK,MAAM,EAAE,IAAI,KAAK,EAAE,CAAC;YACvB,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;YAC9D,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YAC5C,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sEAAsE,EAAE,KAAK,IAAI,EAAE;QACpF,MAAM,CAAC,GAAG,OAAO,CAAC;YAChB,KAAK,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC;YACnG,WAAW,EAAE,YAAY;SAC1B,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACvC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,MAAM,GAAG,gBAAgB,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC;QACzD,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,OAAO;YAAE,OAAO;QAC5B,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC;YAC1B,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,QAAQ;YACb,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAE;gBACN,KAAK,EAAE,eAAe;gBACtB,cAAc,EAAE,KAAK;gBACrB,WAAW,EAAE,EAAE;gBACf,KAAK,EAAE,EAAE;gBACT,IAAI,EAAE,EAAE;gBACR,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE,EAAE;aACd;SACF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8EAA8E,EAAE,KAAK,IAAI,EAAE;QAC5F,MAAM,CAAC,GAAG,OAAO,CAAC;YAChB,KAAK,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,KAAK,EAAE,CAAC;YACpF,WAAW,EAAE,YAAY;SAC1B,CAAC,CAAC;QACH,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACvC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,MAA8D,CAAC;QACrF,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;QACzF,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;QACvG,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QACvC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC5B,MAAM,MAAM,GAAG,CAAC,CAAC,EAAE,EAAE,CAAC,MAAgE,CAAC;QACvF,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACrC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAKH,QAAQ,CAAC,wDAAwD,EAAE,GAAG,EAAE;QACtE,EAAE,CAAC,4DAA4D,EAAE,KAAK,IAAI,EAAE;YAC1E,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;YACpB,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;YAC3D,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAC7B,MAAM,CAAC,EAAE,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;YAChD,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,GAAG,EAAE;YACtD,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;YACnE,MAAM,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;YACtD,MAAM,CAAC,mBAAmB,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,2EAA2E,EAAE,KAAK,IAAI,EAAE;YACzF,MAAM,CAAC,GAAG,SAAS,EAAE,CAAC;YACtB,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC,CAAC;YAClF,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YAC5C,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC7B,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;YAClF,MAAM,CAAC,GAAG,SAAS,EAAE,CAAC;YACtB,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,iBAAiB,EAAE,EAAE,EAAE,CAAC,CAAC;YAClF,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1D,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1D,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;YACnF,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAA4B,CAAC;YAC9F,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;YAC3D,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YACxC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBAC5B,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;gBACxC,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YACxD,CAAC;YACD,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8CAA8C,EAAE,KAAK,IAAI,EAAE;YAC5D,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;YACrC,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;YAC3D,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvD,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvD,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0EAA0E,EAAE,KAAK,IAAI,EAAE;YACxF,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAA4B,CAAC;YAC9F,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;YAC3D,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1D,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1D,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,iEAAiE,EAAE,KAAK,IAAI,EAAE;YAC/E,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;YACpB,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;YAC3D,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzD,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzD,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,+DAA+D,EAAE,KAAK,IAAI,EAAE;YAC7E,IAAI,KAAK,GAAG,SAAS,CAAC;YACtB,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAA4B,CAAC;YAC9F,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;YAC7E,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvD,KAAK,IAAI,qBAAqB,GAAG,CAAC,CAAC;YACnC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvD,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YACnC,KAAK,IAAI,CAAC,CAAC;YACX,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvD,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK,IAAI,EAAE;YACxE,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAA4B,CAAC;YAC9F,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;YAC3D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,kBAAkB,GAAG,EAAE,EAAE,CAAC,EAAE,EAAE,CAAC;gBACjD,MAAM,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;YAC7B,CAAC;YACD,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,CAAC;YAEtD,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACjD,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,CAAC,OAAO,kBAAkB,GAAG,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3E,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,4EAA4E,EAAE,KAAK,IAAI,EAAE;YAC1F,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;YACpB,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;YAC3D,MAAM,CAAC,CAAC,MAAM,CAAC,qBAAqB,CAAC,CAAC;YACtC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;YACjC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAOH,QAAQ,CAAC,sCAAsC,EAAE,GAAG,EAAE;QACpD,MAAM,CAAC,GAAG,6CAA6C,CAAC;QACxD,MAAM,CAAC,GAAG,6CAA6C,CAAC;QACxD,MAAM,aAAa,GAAG;YACpB,iBAAiB,EAAE,uGAAuG;SAC3H,CAAC;QACF,MAAM,EAAE,GAAG,GAAa,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;QACnF,MAAM,MAAM,GAAG,CAAC,IAAY,EAAE,EAAE,CAAC,GAAa,EAAE,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;QAExF,EAAE,CAAC,4EAA4E,EAAE,GAAG,EAAE;YACpF,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC;YAC5D,MAAM,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAChD,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,oEAAoE,EAAE,KAAK,IAAI,EAAE;YAClF,MAAM,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAClC,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YACvC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,oCAAoC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACpG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACpC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kEAAkE,EAAE,KAAK,IAAI,EAAE;YAChF,MAAM,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAC3C,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,sEAAsE,EAAE,KAAK,IAAI,EAAE;YACpF,MAAM,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC7D,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAErC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvD,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8EAA8E,EAAE,KAAK,IAAI,EAAE;YAC5F,MAAM,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC7D,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvD,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gEAAgE,EAAE,KAAK,IAAI,EAAE;YAC9E,MAAM,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;YAClC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gFAAgF,EAAE,KAAK,IAAI,EAAE;YAC9F,MAAM,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAC7D,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAEzD,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzD,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QACrC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;YACrF,MAAM,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,KAAK,EAAE,GAAW,EAAE,EAAE;gBACpC,IAAI,GAAG,KAAK,CAAC;oBAAE,MAAM,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC;gBAC/C,OAAO,EAAE,EAAE,CAAC;YACd,CAAC,CAA4B,CAAC;YAC9B,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzD,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,gFAAgF,EAAE,KAAK,IAAI,EAAE;YAC9F,MAAM,CAAC,GAAG,UAAU,CAAC;gBACnB,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;gBAC3E,CAAC,CAAC,CAAC,EAAE,EAAE;aACR,CAAC,CAAC;YACH,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACvD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAC/B,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,8EAA8E,EAAE,KAAK,IAAI,EAAE;YAC5F,MAAM,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAClC,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzD,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAGzD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,mDAAmD,EAAE,KAAK,IAAI,EAAE;YACjE,IAAI,KAAK,GAAG,SAAS,CAAC;YACtB,MAAM,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAClC,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,KAAK,EAAE,CAAC,CAAC;YACtE,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzD,KAAK,IAAI,wBAAwB,GAAG,CAAC,CAAC;YACtC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,qEAAqE,EAAE,KAAK,IAAI,EAAE;YACnF,MAAM,MAAM,GAAmC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC;YAC3D,MAAM,CAAC,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC;YAC7B,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC;YAC1E,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzD,MAAM,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;YACxB,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1D,MAAM,CAAC,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC1C,CAAC,CAAC,CAAC;QAIH,EAAE,CAAC,kFAAkF,EAAE,KAAK,IAAI,EAAE;YAChG,MAAM,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YAClC,MAAM,CAAC,GAAG,OAAO,CAAC;gBAChB,KAAK,EAAE,CAAC;gBACR,GAAG,EAAE,EAAE,iBAAiB,EAAE,8DAA8D,EAAE;aAC3F,CAAC,CAAC;YACH,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACzD,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACjC,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,kDAAkD,EAAE,KAAK,IAAI,EAAE;YAChE,MAAM,CAAC,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,aAAa,EAAE,CAAC,CAAC;YACpD,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;YAC7B,KAAK,MAAM,CAAC,EAAE,IAAI,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;gBAClC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;gBAChD,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC3C,CAAC;QACH,CAAC,CAAC,CAAC;QAKH,EAAE,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;YACrF,MAAM,CAAC,GAAG,SAAS,EAAE,CAAC;YACtB,MAAM,CAAC,GAAG,OAAO,CAAC;gBAChB,KAAK,EAAE,CAAC;gBACR,GAAG,EAAE;oBACH,iBAAiB,EAAE;wBACjB,oDAAoD;wBACpD,oDAAoD;wBACpD,oDAAoD;qBACrD,CAAC,IAAI,CAAC,GAAG,CAAC;iBACZ;gBACD,iBAAiB,EAAE,GAAG;gBACtB,aAAa,EAAE,EAAE;aAClB,CAAC,CAAC;YACH,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;YAC3B,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;YAC5C,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,OAAO,CAAC;YACrC,MAAM,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAG7B,MAAM,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAClC,MAAM,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAEnC,MAAM,CAAC,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACrC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;QAC3D,CAAC,CAAC,CAAC;QAEH,EAAE,CAAC,uEAAuE,EAAE,KAAK,IAAI,EAAE;YACrF,MAAM,CAAC,GAAG,OAAO,EAAE,CAAC;YACpB,MAAM,CAAC,GAAG,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,iBAAiB,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;YACzE,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC1D,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC;QACnC,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,60 @@
|
|
|
1
|
+
import { Result } from "@adviser/cement";
|
|
2
|
+
import type { SuperThis } from "../types/sthis.js";
|
|
3
|
+
import type { FPApiToken, VerifiedClaimsResult } from "../types/wire.js";
|
|
4
|
+
import { ClerkApiToken } from "./clerk-token.js";
|
|
5
|
+
export declare const USERINFO_TIMEOUT_MS = 2000;
|
|
6
|
+
export declare const WALK_TIMEOUT_FACTOR = 2;
|
|
7
|
+
export declare const WALK_TIMEOUT_MS: number;
|
|
8
|
+
export declare const NEGATIVE_CACHE_TTL_MS = 60000;
|
|
9
|
+
export declare const NEGATIVE_CACHE_MAX = 512;
|
|
10
|
+
export declare const INSTANCE_AFFINITY_TTL_MS = 600000;
|
|
11
|
+
export declare const INSTANCE_AFFINITY_MAX = 512;
|
|
12
|
+
export interface ClerkOauthFallbackOptions {
|
|
13
|
+
readonly clockTolerance?: number;
|
|
14
|
+
readonly userinfoUrl?: string;
|
|
15
|
+
readonly fetch?: typeof fetch;
|
|
16
|
+
readonly userinfoTimeoutMs?: number;
|
|
17
|
+
readonly walkTimeoutMs?: number;
|
|
18
|
+
readonly now?: () => number;
|
|
19
|
+
}
|
|
20
|
+
export declare class BoundedTokenMemo<V> {
|
|
21
|
+
readonly ttlMs: number;
|
|
22
|
+
readonly max: number;
|
|
23
|
+
readonly now: () => number;
|
|
24
|
+
readonly entries: Map<string, {
|
|
25
|
+
readonly at: number;
|
|
26
|
+
readonly value: V;
|
|
27
|
+
}>;
|
|
28
|
+
constructor(opts: {
|
|
29
|
+
readonly ttlMs: number;
|
|
30
|
+
readonly max: number;
|
|
31
|
+
readonly now: () => number;
|
|
32
|
+
});
|
|
33
|
+
get size(): number;
|
|
34
|
+
recall(key: string): V | undefined;
|
|
35
|
+
has(key: string): boolean;
|
|
36
|
+
forget(key: string): void;
|
|
37
|
+
remember(key: string, value: V): void;
|
|
38
|
+
}
|
|
39
|
+
export declare class ClerkOauthFallbackToken implements FPApiToken {
|
|
40
|
+
readonly sthis: SuperThis;
|
|
41
|
+
readonly jwt: ClerkApiToken;
|
|
42
|
+
readonly clockTolerance?: number;
|
|
43
|
+
readonly explicitUserinfoUrl?: string;
|
|
44
|
+
readonly fetchImpl: typeof fetch;
|
|
45
|
+
readonly userinfoTimeoutMs: number;
|
|
46
|
+
readonly walkTimeoutMs: number;
|
|
47
|
+
readonly now: () => number;
|
|
48
|
+
readonly negativeCache: BoundedTokenMemo<string>;
|
|
49
|
+
readonly instanceAffinity: BoundedTokenMemo<string>;
|
|
50
|
+
constructor(sthis: SuperThis, opts?: ClerkOauthFallbackOptions);
|
|
51
|
+
readonly userinfoUrls: () => Result<string[], Error>;
|
|
52
|
+
verify(token: string): Promise<Result<VerifiedClaimsResult>>;
|
|
53
|
+
decode(token: string): Promise<Result<VerifiedClaimsResult>>;
|
|
54
|
+
private rememberRejection;
|
|
55
|
+
private introspectionOrder;
|
|
56
|
+
private introspect;
|
|
57
|
+
private onVerdict;
|
|
58
|
+
private introspectAt;
|
|
59
|
+
private claimsFrom;
|
|
60
|
+
}
|
|
@@ -0,0 +1,230 @@
|
|
|
1
|
+
import { exception2Result, Lazy, Result, URI } from "@adviser/cement";
|
|
2
|
+
import { ClerkClaimSchema } from "../clerk-claim.js";
|
|
3
|
+
import { ClerkApiToken } from "./clerk-token.js";
|
|
4
|
+
const OAT_PREFIX = "oat_";
|
|
5
|
+
const USERINFO_PATH = "/oauth/userinfo";
|
|
6
|
+
export const USERINFO_TIMEOUT_MS = 2000;
|
|
7
|
+
export const WALK_TIMEOUT_FACTOR = 2;
|
|
8
|
+
export const WALK_TIMEOUT_MS = USERINFO_TIMEOUT_MS * WALK_TIMEOUT_FACTOR;
|
|
9
|
+
export const NEGATIVE_CACHE_TTL_MS = 60_000;
|
|
10
|
+
export const NEGATIVE_CACHE_MAX = 512;
|
|
11
|
+
export const INSTANCE_AFFINITY_TTL_MS = 600_000;
|
|
12
|
+
export const INSTANCE_AFFINITY_MAX = 512;
|
|
13
|
+
const INTROSPECTABLE_PROTOCOLS = ["http:", "https:"];
|
|
14
|
+
function isRecord(v) {
|
|
15
|
+
return typeof v === "object" && v !== null && !Array.isArray(v);
|
|
16
|
+
}
|
|
17
|
+
export class BoundedTokenMemo {
|
|
18
|
+
ttlMs;
|
|
19
|
+
max;
|
|
20
|
+
now;
|
|
21
|
+
entries = new Map();
|
|
22
|
+
constructor(opts) {
|
|
23
|
+
this.ttlMs = opts.ttlMs;
|
|
24
|
+
this.max = opts.max;
|
|
25
|
+
this.now = opts.now;
|
|
26
|
+
}
|
|
27
|
+
get size() {
|
|
28
|
+
return this.entries.size;
|
|
29
|
+
}
|
|
30
|
+
recall(key) {
|
|
31
|
+
const hit = this.entries.get(key);
|
|
32
|
+
if (hit === undefined) {
|
|
33
|
+
return undefined;
|
|
34
|
+
}
|
|
35
|
+
if (this.now() - hit.at >= this.ttlMs) {
|
|
36
|
+
this.entries.delete(key);
|
|
37
|
+
return undefined;
|
|
38
|
+
}
|
|
39
|
+
return hit.value;
|
|
40
|
+
}
|
|
41
|
+
has(key) {
|
|
42
|
+
return this.recall(key) !== undefined;
|
|
43
|
+
}
|
|
44
|
+
forget(key) {
|
|
45
|
+
this.entries.delete(key);
|
|
46
|
+
}
|
|
47
|
+
remember(key, value) {
|
|
48
|
+
this.entries.delete(key);
|
|
49
|
+
while (this.entries.size >= this.max) {
|
|
50
|
+
const oldest = this.entries.keys().next();
|
|
51
|
+
if (oldest.done) {
|
|
52
|
+
break;
|
|
53
|
+
}
|
|
54
|
+
this.entries.delete(oldest.value);
|
|
55
|
+
}
|
|
56
|
+
this.entries.set(key, { at: this.now(), value });
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
export class ClerkOauthFallbackToken {
|
|
60
|
+
sthis;
|
|
61
|
+
jwt;
|
|
62
|
+
clockTolerance;
|
|
63
|
+
explicitUserinfoUrl;
|
|
64
|
+
fetchImpl;
|
|
65
|
+
userinfoTimeoutMs;
|
|
66
|
+
walkTimeoutMs;
|
|
67
|
+
now;
|
|
68
|
+
negativeCache;
|
|
69
|
+
instanceAffinity;
|
|
70
|
+
constructor(sthis, opts) {
|
|
71
|
+
this.sthis = sthis;
|
|
72
|
+
this.jwt = new ClerkApiToken(sthis, { clockTolerance: opts?.clockTolerance });
|
|
73
|
+
this.clockTolerance = this.jwt.clockTolerance;
|
|
74
|
+
this.explicitUserinfoUrl = opts?.userinfoUrl;
|
|
75
|
+
this.fetchImpl = opts?.fetch ?? ((input, init) => globalThis.fetch(input, init));
|
|
76
|
+
this.userinfoTimeoutMs = opts?.userinfoTimeoutMs ?? USERINFO_TIMEOUT_MS;
|
|
77
|
+
this.walkTimeoutMs = opts?.walkTimeoutMs ?? this.userinfoTimeoutMs * WALK_TIMEOUT_FACTOR;
|
|
78
|
+
this.now = opts?.now ?? (() => Date.now());
|
|
79
|
+
this.negativeCache = new BoundedTokenMemo({
|
|
80
|
+
ttlMs: NEGATIVE_CACHE_TTL_MS,
|
|
81
|
+
max: NEGATIVE_CACHE_MAX,
|
|
82
|
+
now: this.now,
|
|
83
|
+
});
|
|
84
|
+
this.instanceAffinity = new BoundedTokenMemo({
|
|
85
|
+
ttlMs: INSTANCE_AFFINITY_TTL_MS,
|
|
86
|
+
max: INSTANCE_AFFINITY_MAX,
|
|
87
|
+
now: this.now,
|
|
88
|
+
});
|
|
89
|
+
}
|
|
90
|
+
userinfoUrls = Lazy(() => {
|
|
91
|
+
if (this.explicitUserinfoUrl !== undefined) {
|
|
92
|
+
return Result.Ok([this.explicitUserinfoUrl]);
|
|
93
|
+
}
|
|
94
|
+
const rKaUs = this.jwt.keysAndUrls();
|
|
95
|
+
if (rKaUs.isErr()) {
|
|
96
|
+
return Result.Err(rKaUs);
|
|
97
|
+
}
|
|
98
|
+
const derived = [];
|
|
99
|
+
for (const jwksUrl of rKaUs.Ok().urls) {
|
|
100
|
+
const rJwks = URI.fromResult(jwksUrl);
|
|
101
|
+
if (rJwks.isErr()) {
|
|
102
|
+
continue;
|
|
103
|
+
}
|
|
104
|
+
const jwks = rJwks.Ok();
|
|
105
|
+
if (!INTROSPECTABLE_PROTOCOLS.includes(jwks.protocol) || jwks.hostname.length === 0) {
|
|
106
|
+
continue;
|
|
107
|
+
}
|
|
108
|
+
const url = jwks.build().pathname(USERINFO_PATH).cleanParams().hash("").toString();
|
|
109
|
+
if (!derived.includes(url)) {
|
|
110
|
+
derived.push(url);
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
if (derived.length === 0) {
|
|
114
|
+
return Result.Err("clerk oauth: no usable CLERK_PUB_JWT_URL to derive a userinfo endpoint from");
|
|
115
|
+
}
|
|
116
|
+
return Result.Ok(derived);
|
|
117
|
+
});
|
|
118
|
+
async verify(token) {
|
|
119
|
+
if (!token.startsWith(OAT_PREFIX)) {
|
|
120
|
+
return this.jwt.verify(token);
|
|
121
|
+
}
|
|
122
|
+
return this.introspect(token);
|
|
123
|
+
}
|
|
124
|
+
async decode(token) {
|
|
125
|
+
if (!token.startsWith(OAT_PREFIX)) {
|
|
126
|
+
return this.jwt.decode(token);
|
|
127
|
+
}
|
|
128
|
+
return this.introspect(token);
|
|
129
|
+
}
|
|
130
|
+
rememberRejection(token, reason) {
|
|
131
|
+
this.negativeCache.remember(token, reason);
|
|
132
|
+
this.instanceAffinity.forget(token);
|
|
133
|
+
return Result.Err(reason);
|
|
134
|
+
}
|
|
135
|
+
introspectionOrder(opts) {
|
|
136
|
+
const preferred = this.instanceAffinity.recall(opts.token);
|
|
137
|
+
if (preferred === undefined || !opts.urls.includes(preferred)) {
|
|
138
|
+
return [...opts.urls];
|
|
139
|
+
}
|
|
140
|
+
return [preferred, ...opts.urls.filter((u) => u !== preferred)];
|
|
141
|
+
}
|
|
142
|
+
async introspect(token) {
|
|
143
|
+
const remembered = this.negativeCache.recall(token);
|
|
144
|
+
if (remembered !== undefined) {
|
|
145
|
+
return Result.Err(remembered);
|
|
146
|
+
}
|
|
147
|
+
const rUrls = this.userinfoUrls();
|
|
148
|
+
if (rUrls.isErr()) {
|
|
149
|
+
return Result.Err(rUrls);
|
|
150
|
+
}
|
|
151
|
+
const configured = rUrls.Ok();
|
|
152
|
+
const urls = this.introspectionOrder({ token, urls: configured });
|
|
153
|
+
const walkSignal = AbortSignal.timeout(this.walkTimeoutMs);
|
|
154
|
+
let sawTransient = false;
|
|
155
|
+
let lastReason = "clerk oauth: no clerk instance accepted the token";
|
|
156
|
+
for (const url of urls) {
|
|
157
|
+
if (walkSignal.aborted) {
|
|
158
|
+
return Result.Err("clerk oauth: userinfo introspection ran out of time");
|
|
159
|
+
}
|
|
160
|
+
const attempt = await this.introspectAt({ token, url, walkSignal });
|
|
161
|
+
if (attempt.kind === "verdict") {
|
|
162
|
+
return this.onVerdict({ token, url, value: attempt.value, isPrimary: url === configured[0] });
|
|
163
|
+
}
|
|
164
|
+
sawTransient = sawTransient || attempt.kind === "transient";
|
|
165
|
+
lastReason = attempt.reason;
|
|
166
|
+
}
|
|
167
|
+
if (sawTransient) {
|
|
168
|
+
return Result.Err(lastReason);
|
|
169
|
+
}
|
|
170
|
+
return this.rememberRejection(token, lastReason);
|
|
171
|
+
}
|
|
172
|
+
onVerdict(opts) {
|
|
173
|
+
if (opts.value.isErr()) {
|
|
174
|
+
return opts.value;
|
|
175
|
+
}
|
|
176
|
+
this.instanceAffinity.remember(opts.token, opts.url);
|
|
177
|
+
const line = opts.isPrimary ? this.sthis.logger.Debug() : this.sthis.logger.Info();
|
|
178
|
+
line.Str("clerkInstance", URI.from(opts.url).host).Msg("clerk oauth: userinfo accepted");
|
|
179
|
+
return opts.value;
|
|
180
|
+
}
|
|
181
|
+
async introspectAt(opts) {
|
|
182
|
+
const { token, url, walkSignal } = opts;
|
|
183
|
+
const rRes = await exception2Result(() => this.fetchImpl(url, {
|
|
184
|
+
headers: { authorization: `Bearer ${token}` },
|
|
185
|
+
signal: AbortSignal.any([walkSignal, AbortSignal.timeout(this.userinfoTimeoutMs)]),
|
|
186
|
+
}));
|
|
187
|
+
if (rRes.isErr()) {
|
|
188
|
+
return { kind: "transient", reason: "clerk oauth: userinfo introspection failed" };
|
|
189
|
+
}
|
|
190
|
+
const res = rRes.Ok();
|
|
191
|
+
if (!res.ok) {
|
|
192
|
+
const reason = `clerk oauth token rejected by userinfo: ${res.status}`;
|
|
193
|
+
return res.status >= 500 ? { kind: "transient", reason } : { kind: "rejected", reason };
|
|
194
|
+
}
|
|
195
|
+
return { kind: "verdict", value: await this.claimsFrom({ token, res }) };
|
|
196
|
+
}
|
|
197
|
+
async claimsFrom(opts) {
|
|
198
|
+
const { token, res } = opts;
|
|
199
|
+
const rInfo = await exception2Result(() => res.json());
|
|
200
|
+
if (rInfo.isErr()) {
|
|
201
|
+
return Result.Err("clerk oauth: userinfo introspection failed");
|
|
202
|
+
}
|
|
203
|
+
const info = rInfo.Ok();
|
|
204
|
+
if (!isRecord(info)) {
|
|
205
|
+
return this.rememberRejection(token, "clerk oauth: userinfo body is not an object");
|
|
206
|
+
}
|
|
207
|
+
if (typeof info.user_id !== "string" || info.user_id.length === 0) {
|
|
208
|
+
return this.rememberRejection(token, "clerk oauth: userinfo response has no user_id");
|
|
209
|
+
}
|
|
210
|
+
const parsed = ClerkClaimSchema.safeParse({
|
|
211
|
+
role: "user",
|
|
212
|
+
sub: typeof info.sub === "string" ? info.sub : info.user_id,
|
|
213
|
+
userId: info.user_id,
|
|
214
|
+
params: {
|
|
215
|
+
email: typeof info.email === "string" ? info.email : "",
|
|
216
|
+
email_verified: info.email_verified === true,
|
|
217
|
+
public_meta: info.public_metadata ?? {},
|
|
218
|
+
first: info.given_name,
|
|
219
|
+
last: info.family_name,
|
|
220
|
+
name: info.name,
|
|
221
|
+
image_url: info.picture,
|
|
222
|
+
},
|
|
223
|
+
});
|
|
224
|
+
if (!parsed.success) {
|
|
225
|
+
return Result.Err(parsed.error);
|
|
226
|
+
}
|
|
227
|
+
return Result.Ok({ type: "clerk", token, claims: parsed.data });
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
//# sourceMappingURL=clerk-oauth-token.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"clerk-oauth-token.js","sourceRoot":"","sources":["../../jsr/dash-api/clerk-oauth-token.ts"],"names":[],"mappings":"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"}
|
package/dash-api/token.d.ts
CHANGED
|
@@ -2,9 +2,10 @@ import { Result } from "@adviser/cement";
|
|
|
2
2
|
import type { SuperThis } from "../types/sthis.js";
|
|
3
3
|
import type { VerifyWithCertificateOptions } from "../types/device-id-types.js";
|
|
4
4
|
import { DeviceIdCA } from "../device-id/ca.js";
|
|
5
|
-
import {
|
|
5
|
+
import { ClerkOauthFallbackToken } from "./clerk-oauth-token.js";
|
|
6
6
|
import type { FPApiToken, VerifiedClaimsResult, JWKPublic } from "../types/wire.js";
|
|
7
7
|
export { ClerkApiToken } from "./clerk-token.js";
|
|
8
|
+
export { ClerkOauthFallbackToken } from "./clerk-oauth-token.js";
|
|
8
9
|
export declare class DeviceIdApiToken implements FPApiToken {
|
|
9
10
|
readonly sthis: SuperThis;
|
|
10
11
|
readonly opts: VerifyWithCertificateOptions;
|
|
@@ -18,5 +19,5 @@ export declare function getCloudPubkeyFromEnv(cloudToken?: string, sthis?: Super
|
|
|
18
19
|
}>>;
|
|
19
20
|
export declare const tokenApi: (sthis: SuperThis, opts: VerifyWithCertificateOptions) => Promise<{
|
|
20
21
|
"device-id": DeviceIdApiToken;
|
|
21
|
-
clerk:
|
|
22
|
+
clerk: ClerkOauthFallbackToken;
|
|
22
23
|
}>;
|
package/dash-api/token.js
CHANGED
|
@@ -7,8 +7,9 @@ import { JWKPublicSchema, toJwksAlg } from "../types/wire.js";
|
|
|
7
7
|
import { FPDeviceIDSessionSchema } from "../types/device-id-payload.js";
|
|
8
8
|
import { DeviceIdCA } from "../device-id/ca.js";
|
|
9
9
|
import { DeviceIdVerifyMsg } from "../device-id/verify.js";
|
|
10
|
-
import {
|
|
10
|
+
import { ClerkOauthFallbackToken } from "./clerk-oauth-token.js";
|
|
11
11
|
export { ClerkApiToken } from "./clerk-token.js";
|
|
12
|
+
export { ClerkOauthFallbackToken } from "./clerk-oauth-token.js";
|
|
12
13
|
export class DeviceIdApiToken {
|
|
13
14
|
sthis;
|
|
14
15
|
opts;
|
|
@@ -103,7 +104,7 @@ export async function getCloudPubkeyFromEnv(cloudToken, sthis = ensureSuperThis(
|
|
|
103
104
|
export const tokenApi = Lazy(async (sthis, opts) => {
|
|
104
105
|
return {
|
|
105
106
|
"device-id": new DeviceIdApiToken(sthis, opts),
|
|
106
|
-
clerk: new
|
|
107
|
+
clerk: new ClerkOauthFallbackToken(sthis, { clockTolerance: opts.clockTolerance }),
|
|
107
108
|
};
|
|
108
109
|
});
|
|
109
110
|
//# sourceMappingURL=token.js.map
|
package/dash-api/token.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../jsr/dash-api/token.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,gBAAgB,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACrG,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAC1D,OAAO,KAAK,GAAG,MAAM,iBAAiB,CAAC;AACvC,OAAO,EAAE,qBAAqB,EAAE,SAAS,EAAE,MAAM,MAAM,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAC;AAGxE,OAAO,EAAE,UAAU,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"token.js","sourceRoot":"","sources":["../../jsr/dash-api/token.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@vibes.diy/identity",
|
|
3
|
-
"version": "12.2.
|
|
3
|
+
"version": "12.2.11",
|
|
4
4
|
"license": "Apache-2.0",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./index.js",
|
|
@@ -17,13 +17,13 @@
|
|
|
17
17
|
"dependencies": {
|
|
18
18
|
"@adviser/cement": "~0.5.34",
|
|
19
19
|
"@adviser/ts-xxhash": "~1.0.2",
|
|
20
|
-
"@clerk/shared": "~4.
|
|
21
|
-
"@hono/node-server": "~2.0
|
|
22
|
-
"@vibes.diy/cmd-tools": "12.2.
|
|
20
|
+
"@clerk/shared": "~4.28.1",
|
|
21
|
+
"@hono/node-server": "~2.1.0",
|
|
22
|
+
"@vibes.diy/cmd-tools": "12.2.11",
|
|
23
23
|
"arktype": "~2.2.3",
|
|
24
|
-
"hono": "~4.
|
|
24
|
+
"hono": "~4.13.2",
|
|
25
25
|
"jose": "~6.2.8",
|
|
26
|
-
"multiformats": "~14.0.
|
|
26
|
+
"multiformats": "~14.0.5",
|
|
27
27
|
"open": "~8.4.2",
|
|
28
28
|
"zod": "~4.4.3"
|
|
29
29
|
},
|
package/server.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export { deviceIdCAFromEnv, getCloudPubkeyFromEnv, tokenApi, DeviceIdApiToken } from "./dash-api/token.js";
|
|
1
|
+
export { deviceIdCAFromEnv, getCloudPubkeyFromEnv, tokenApi, DeviceIdApiToken, ClerkOauthFallbackToken } from "./dash-api/token.js";
|
package/server.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export { deviceIdCAFromEnv, getCloudPubkeyFromEnv, tokenApi, DeviceIdApiToken } from "./dash-api/token.js";
|
|
1
|
+
export { deviceIdCAFromEnv, getCloudPubkeyFromEnv, tokenApi, DeviceIdApiToken, ClerkOauthFallbackToken } from "./dash-api/token.js";
|
|
2
2
|
//# sourceMappingURL=server.js.map
|
package/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../jsr/server.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,QAAQ,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../jsr/server.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,QAAQ,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC"}
|