@robelest/convex-auth 0.0.2-preview.0 → 0.0.2-preview.2
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/dist/bin.cjs +17 -15
- package/dist/client/index.d.ts +84 -30
- package/dist/client/index.d.ts.map +1 -1
- package/dist/client/index.js +259 -59
- package/dist/client/index.js.map +1 -1
- package/dist/component/_generated/component.d.ts +46 -120
- package/dist/component/_generated/component.d.ts.map +1 -1
- package/dist/component/index.d.ts +2 -4
- package/dist/component/index.d.ts.map +1 -1
- package/dist/component/index.js +2 -4
- package/dist/component/index.js.map +1 -1
- package/dist/component/public.d.ts +233 -167
- package/dist/component/public.d.ts.map +1 -1
- package/dist/component/public.js +328 -155
- package/dist/component/public.js.map +1 -1
- package/dist/component/schema.d.ts +127 -12
- package/dist/component/schema.d.ts.map +1 -1
- package/dist/component/schema.js +136 -10
- package/dist/component/schema.js.map +1 -1
- package/dist/providers/{Anonymous.d.ts → anonymous.d.ts} +8 -8
- package/dist/providers/{Anonymous.d.ts.map → anonymous.d.ts.map} +1 -1
- package/dist/providers/{Anonymous.js → anonymous.js} +9 -10
- package/dist/providers/anonymous.js.map +1 -0
- package/dist/providers/{ConvexCredentials.d.ts → credentials.d.ts} +11 -11
- package/dist/providers/credentials.d.ts.map +1 -0
- package/dist/providers/{ConvexCredentials.js → credentials.js} +8 -8
- package/dist/providers/credentials.js.map +1 -0
- package/dist/providers/{Email.d.ts → email.d.ts} +6 -6
- package/dist/providers/email.d.ts.map +1 -0
- package/dist/providers/{Email.js → email.js} +6 -6
- package/dist/providers/email.js.map +1 -0
- package/dist/providers/{Password.d.ts → password.d.ts} +10 -10
- package/dist/providers/{Password.d.ts.map → password.d.ts.map} +1 -1
- package/dist/providers/{Password.js → password.js} +19 -20
- package/dist/providers/password.js.map +1 -0
- package/dist/providers/{Phone.d.ts → phone.d.ts} +3 -3
- package/dist/providers/{Phone.d.ts.map → phone.d.ts.map} +1 -1
- package/dist/providers/{Phone.js → phone.js} +3 -3
- package/dist/providers/{Phone.js.map → phone.js.map} +1 -1
- package/dist/server/implementation/db.d.ts +5 -2
- package/dist/server/implementation/db.d.ts.map +1 -1
- package/dist/server/implementation/db.js +2 -1
- package/dist/server/implementation/db.js.map +1 -1
- package/dist/server/implementation/index.d.ts +285 -180
- package/dist/server/implementation/index.d.ts.map +1 -1
- package/dist/server/implementation/index.js +280 -173
- package/dist/server/implementation/index.js.map +1 -1
- package/dist/server/implementation/mutations/createAccountFromCredentials.d.ts.map +1 -1
- package/dist/server/implementation/mutations/createAccountFromCredentials.js +8 -18
- package/dist/server/implementation/mutations/createAccountFromCredentials.js.map +1 -1
- package/dist/server/implementation/mutations/createVerificationCode.d.ts.map +1 -1
- package/dist/server/implementation/mutations/createVerificationCode.js +16 -44
- package/dist/server/implementation/mutations/createVerificationCode.js.map +1 -1
- package/dist/server/implementation/mutations/invalidateSessions.d.ts.map +1 -1
- package/dist/server/implementation/mutations/invalidateSessions.js +4 -8
- package/dist/server/implementation/mutations/invalidateSessions.js.map +1 -1
- package/dist/server/implementation/mutations/modifyAccount.d.ts.map +1 -1
- package/dist/server/implementation/mutations/modifyAccount.js +8 -19
- package/dist/server/implementation/mutations/modifyAccount.js.map +1 -1
- package/dist/server/implementation/mutations/refreshSession.d.ts.map +1 -1
- package/dist/server/implementation/mutations/refreshSession.js +9 -23
- package/dist/server/implementation/mutations/refreshSession.js.map +1 -1
- package/dist/server/implementation/mutations/retrieveAccountWithCredentials.d.ts.map +1 -1
- package/dist/server/implementation/mutations/retrieveAccountWithCredentials.js +6 -12
- package/dist/server/implementation/mutations/retrieveAccountWithCredentials.js.map +1 -1
- package/dist/server/implementation/mutations/signIn.d.ts.map +1 -1
- package/dist/server/implementation/mutations/signIn.js +2 -1
- package/dist/server/implementation/mutations/signIn.js.map +1 -1
- package/dist/server/implementation/mutations/signOut.d.ts.map +1 -1
- package/dist/server/implementation/mutations/signOut.js +5 -6
- package/dist/server/implementation/mutations/signOut.js.map +1 -1
- package/dist/server/implementation/mutations/storeRef.d.ts +8 -0
- package/dist/server/implementation/mutations/storeRef.d.ts.map +1 -0
- package/dist/server/implementation/mutations/storeRef.js +8 -0
- package/dist/server/implementation/mutations/storeRef.js.map +1 -0
- package/dist/server/implementation/mutations/userOAuth.d.ts.map +1 -1
- package/dist/server/implementation/mutations/userOAuth.js +16 -53
- package/dist/server/implementation/mutations/userOAuth.js.map +1 -1
- package/dist/server/implementation/mutations/verifier.d.ts.map +1 -1
- package/dist/server/implementation/mutations/verifier.js +4 -8
- package/dist/server/implementation/mutations/verifier.js.map +1 -1
- package/dist/server/implementation/mutations/verifierSignature.d.ts.map +1 -1
- package/dist/server/implementation/mutations/verifierSignature.js +6 -10
- package/dist/server/implementation/mutations/verifierSignature.js.map +1 -1
- package/dist/server/implementation/mutations/verifyCodeAndSignIn.d.ts.map +1 -1
- package/dist/server/implementation/mutations/verifyCodeAndSignIn.js +7 -16
- package/dist/server/implementation/mutations/verifyCodeAndSignIn.js.map +1 -1
- package/dist/server/implementation/provider.d.ts +2 -1
- package/dist/server/implementation/provider.d.ts.map +1 -1
- package/dist/server/implementation/provider.js.map +1 -1
- package/dist/server/implementation/rateLimit.d.ts.map +1 -1
- package/dist/server/implementation/rateLimit.js +13 -39
- package/dist/server/implementation/rateLimit.js.map +1 -1
- package/dist/server/implementation/refreshTokens.d.ts +1 -8
- package/dist/server/implementation/refreshTokens.d.ts.map +1 -1
- package/dist/server/implementation/refreshTokens.js +14 -58
- package/dist/server/implementation/refreshTokens.js.map +1 -1
- package/dist/server/implementation/sessions.d.ts +2 -20
- package/dist/server/implementation/sessions.d.ts.map +1 -1
- package/dist/server/implementation/sessions.js +8 -35
- package/dist/server/implementation/sessions.js.map +1 -1
- package/dist/server/implementation/types.d.ts +11 -267
- package/dist/server/implementation/types.d.ts.map +1 -1
- package/dist/server/implementation/types.js +1 -181
- package/dist/server/implementation/types.js.map +1 -1
- package/dist/server/implementation/users.d.ts.map +1 -1
- package/dist/server/implementation/users.js +19 -67
- package/dist/server/implementation/users.js.map +1 -1
- package/dist/server/index.d.ts +18 -0
- package/dist/server/index.d.ts.map +1 -1
- package/dist/server/index.js +255 -0
- package/dist/server/index.js.map +1 -1
- package/dist/server/provider_utils.d.ts +1 -1
- package/dist/server/provider_utils.d.ts.map +1 -1
- package/dist/server/provider_utils.js +2 -2
- package/dist/server/provider_utils.js.map +1 -1
- package/dist/server/types.d.ts +91 -52
- package/dist/server/types.d.ts.map +1 -1
- package/package.json +3 -6
- package/src/cli/index.ts +20 -19
- package/src/client/index.ts +347 -110
- package/src/component/_generated/component.ts +55 -214
- package/src/component/index.ts +1 -11
- package/src/component/public.ts +366 -178
- package/src/component/schema.ts +150 -19
- package/src/providers/{Anonymous.ts → anonymous.ts} +10 -11
- package/src/providers/{ConvexCredentials.ts → credentials.ts} +11 -11
- package/src/providers/{Email.ts → email.ts} +5 -5
- package/src/providers/{Password.ts → password.ts} +22 -27
- package/src/providers/{Phone.ts → phone.ts} +2 -2
- package/src/server/implementation/db.ts +5 -2
- package/src/server/implementation/index.ts +368 -313
- package/src/server/implementation/mutations/createAccountFromCredentials.ts +11 -25
- package/src/server/implementation/mutations/createVerificationCode.ts +16 -47
- package/src/server/implementation/mutations/invalidateSessions.ts +4 -9
- package/src/server/implementation/mutations/modifyAccount.ts +8 -22
- package/src/server/implementation/mutations/refreshSession.ts +11 -24
- package/src/server/implementation/mutations/retrieveAccountWithCredentials.ts +9 -17
- package/src/server/implementation/mutations/signIn.ts +2 -1
- package/src/server/implementation/mutations/signOut.ts +5 -8
- package/src/server/implementation/mutations/storeRef.ts +7 -0
- package/src/server/implementation/mutations/userOAuth.ts +10 -50
- package/src/server/implementation/mutations/verifier.ts +4 -9
- package/src/server/implementation/mutations/verifierSignature.ts +6 -12
- package/src/server/implementation/mutations/verifyCodeAndSignIn.ts +7 -18
- package/src/server/implementation/provider.ts +2 -1
- package/src/server/implementation/rateLimit.ts +15 -41
- package/src/server/implementation/refreshTokens.ts +26 -76
- package/src/server/implementation/sessions.ts +8 -39
- package/src/server/implementation/types.ts +16 -191
- package/src/server/implementation/users.ts +19 -66
- package/src/server/index.ts +373 -0
- package/src/server/provider_utils.ts +2 -2
- package/src/server/types.ts +116 -51
- package/dist/providers/Anonymous.js.map +0 -1
- package/dist/providers/ConvexCredentials.d.ts.map +0 -1
- package/dist/providers/ConvexCredentials.js.map +0 -1
- package/dist/providers/Email.d.ts.map +0 -1
- package/dist/providers/Email.js.map +0 -1
- package/dist/providers/Password.js.map +0 -1
- package/providers/Anonymous/package.json +0 -6
- package/providers/ConvexCredentials/package.json +0 -6
- package/providers/Email/package.json +0 -6
- package/providers/Password/package.json +0 -6
- package/providers/Phone/package.json +0 -6
- package/server/package.json +0 -6
|
@@ -3,7 +3,8 @@ import * as Provider from "../provider.js";
|
|
|
3
3
|
import { upsertUserAndAccount } from "../users.js";
|
|
4
4
|
import { getAuthSessionId } from "../sessions.js";
|
|
5
5
|
import { LOG_LEVELS, logWithLevel, maybeRedact } from "../utils.js";
|
|
6
|
-
import {
|
|
6
|
+
import { authDb } from "../db.js";
|
|
7
|
+
import { AUTH_STORE_REF } from "./storeRef.js";
|
|
7
8
|
export const createAccountFromCredentialsArgs = v.object({
|
|
8
9
|
provider: v.string(),
|
|
9
10
|
account: v.object({ id: v.string(), secret: v.optional(v.string()) }),
|
|
@@ -20,14 +21,9 @@ export async function createAccountFromCredentialsImpl(ctx, args, getProviderOrT
|
|
|
20
21
|
},
|
|
21
22
|
});
|
|
22
23
|
const { provider: providerId, account, profile, shouldLinkViaEmail, shouldLinkViaPhone, } = args;
|
|
23
|
-
const
|
|
24
|
+
const db = authDb(ctx, config);
|
|
24
25
|
const provider = getProviderOrThrow(providerId);
|
|
25
|
-
const existingAccount =
|
|
26
|
-
? (await authDb.accounts.get(provider.id, account.id))
|
|
27
|
-
: await ctx.db
|
|
28
|
-
.query("account")
|
|
29
|
-
.withIndex("providerAndAccountId", (q) => q.eq("provider", provider.id).eq("providerAccountId", account.id))
|
|
30
|
-
.unique();
|
|
26
|
+
const existingAccount = (await db.accounts.get(provider.id, account.id));
|
|
31
27
|
if (existingAccount !== null) {
|
|
32
28
|
if (account.secret !== undefined &&
|
|
33
29
|
!(await Provider.verify(provider, account.secret, existingAccount.secret ?? ""))) {
|
|
@@ -36,9 +32,7 @@ export async function createAccountFromCredentialsImpl(ctx, args, getProviderOrT
|
|
|
36
32
|
return {
|
|
37
33
|
account: existingAccount,
|
|
38
34
|
// TODO: Ian removed this,
|
|
39
|
-
user:
|
|
40
|
-
? (await authDb.users.getById(existingAccount.userId))
|
|
41
|
-
: (await ctx.db.get(existingAccount.userId)),
|
|
35
|
+
user: (await db.users.getById(existingAccount.userId)),
|
|
42
36
|
};
|
|
43
37
|
}
|
|
44
38
|
const secret = account.secret !== undefined
|
|
@@ -52,16 +46,12 @@ export async function createAccountFromCredentialsImpl(ctx, args, getProviderOrT
|
|
|
52
46
|
shouldLinkViaPhone,
|
|
53
47
|
}, config);
|
|
54
48
|
return {
|
|
55
|
-
account:
|
|
56
|
-
|
|
57
|
-
: (await ctx.db.get(accountId)),
|
|
58
|
-
user: authDb !== null
|
|
59
|
-
? (await authDb.users.getById(userId))
|
|
60
|
-
: (await ctx.db.get(userId)),
|
|
49
|
+
account: (await db.accounts.getById(accountId)),
|
|
50
|
+
user: (await db.users.getById(userId)),
|
|
61
51
|
};
|
|
62
52
|
}
|
|
63
53
|
export const callCreateAccountFromCredentials = async (ctx, args) => {
|
|
64
|
-
return ctx.runMutation(
|
|
54
|
+
return ctx.runMutation(AUTH_STORE_REF, {
|
|
65
55
|
args: {
|
|
66
56
|
type: "createAccountFromCredentials",
|
|
67
57
|
...args,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createAccountFromCredentials.js","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/createAccountFromCredentials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,CAAC,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAE3C,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"createAccountFromCredentials.js","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/createAccountFromCredentials.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createVerificationCode.d.ts","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/createVerificationCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,EAAK,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"createVerificationCode.d.ts","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/createVerificationCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,EAAK,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAQ3C,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;gHAQrC,CAAC;AAEH,KAAK,UAAU,GAAG,MAAM,CAAC;AAEzB,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,KAAK,CAAC,OAAO,0BAA0B,CAAC,EAC9C,kBAAkB,EAAE,QAAQ,CAAC,sBAAsB,EACnD,MAAM,EAAE,QAAQ,CAAC,MAAM,GACtB,OAAO,CAAC,UAAU,CAAC,CA4CrB;AAED,eAAO,MAAM,0BAA0B,GACrC,KAAK,SAAS,EACd,MAAM,KAAK,CAAC,OAAO,0BAA0B,CAAC,KAC7C,OAAO,CAAC,UAAU,CAOpB,CAAC"}
|
|
@@ -2,7 +2,8 @@ import { v } from "convex/values";
|
|
|
2
2
|
import { getAccountOrThrow, upsertUserAndAccount } from "../users.js";
|
|
3
3
|
import { getAuthSessionId } from "../sessions.js";
|
|
4
4
|
import { LOG_LEVELS, logWithLevel, sha256 } from "../utils.js";
|
|
5
|
-
import {
|
|
5
|
+
import { authDb } from "../db.js";
|
|
6
|
+
import { AUTH_STORE_REF } from "./storeRef.js";
|
|
6
7
|
export const createVerificationCodeArgs = v.object({
|
|
7
8
|
accountId: v.optional(v.string()),
|
|
8
9
|
provider: v.string(),
|
|
@@ -15,18 +16,11 @@ export const createVerificationCodeArgs = v.object({
|
|
|
15
16
|
export async function createVerificationCodeImpl(ctx, args, getProviderOrThrow, config) {
|
|
16
17
|
logWithLevel(LOG_LEVELS.DEBUG, "createVerificationCodeImpl args:", args);
|
|
17
18
|
const { email, phone, code, expirationTime, provider: providerId, accountId: existingAccountId, allowExtraProviders, } = args;
|
|
18
|
-
const
|
|
19
|
+
const db = authDb(ctx, config);
|
|
19
20
|
const typedExistingAccountId = existingAccountId;
|
|
20
21
|
const existingAccount = typedExistingAccountId !== undefined
|
|
21
22
|
? await getAccountOrThrow(ctx, typedExistingAccountId, config)
|
|
22
|
-
:
|
|
23
|
-
? await authDb.accounts.get(providerId, email ?? phone)
|
|
24
|
-
: await ctx.db
|
|
25
|
-
.query("account")
|
|
26
|
-
.withIndex("providerAndAccountId", (q) => q
|
|
27
|
-
.eq("provider", providerId)
|
|
28
|
-
.eq("providerAccountId", email ?? phone))
|
|
29
|
-
.unique();
|
|
23
|
+
: await db.accounts.get(providerId, email ?? phone);
|
|
30
24
|
const provider = getProviderOrThrow(providerId, allowExtraProviders);
|
|
31
25
|
const { accountId } = await upsertUserAndAccount(ctx, await getAuthSessionId(ctx), existingAccount !== null
|
|
32
26
|
? { existingAccount }
|
|
@@ -37,7 +31,7 @@ export async function createVerificationCodeImpl(ctx, args, getProviderOrThrow,
|
|
|
37
31
|
return email ?? phone;
|
|
38
32
|
}
|
|
39
33
|
export const callCreateVerificationCode = async (ctx, args) => {
|
|
40
|
-
return ctx.runMutation(
|
|
34
|
+
return ctx.runMutation(AUTH_STORE_REF, {
|
|
41
35
|
args: {
|
|
42
36
|
type: "createVerificationCode",
|
|
43
37
|
...args,
|
|
@@ -45,40 +39,18 @@ export const callCreateVerificationCode = async (ctx, args) => {
|
|
|
45
39
|
});
|
|
46
40
|
};
|
|
47
41
|
async function generateUniqueVerificationCode(ctx, accountId, provider, code, expirationTime, { email, phone }, config) {
|
|
48
|
-
const
|
|
49
|
-
const existingCode =
|
|
50
|
-
? await authDb.verificationCodes.getByAccountId(accountId)
|
|
51
|
-
: await ctx.db
|
|
52
|
-
.query("verification")
|
|
53
|
-
.withIndex("accountId", (q) => q.eq("accountId", accountId))
|
|
54
|
-
.unique();
|
|
42
|
+
const db = authDb(ctx, config);
|
|
43
|
+
const existingCode = await db.verificationCodes.getByAccountId(accountId);
|
|
55
44
|
if (existingCode !== null) {
|
|
56
|
-
|
|
57
|
-
await authDb.verificationCodes.delete(existingCode._id);
|
|
58
|
-
}
|
|
59
|
-
else {
|
|
60
|
-
await ctx.db.delete(existingCode._id);
|
|
61
|
-
}
|
|
62
|
-
}
|
|
63
|
-
if (authDb !== null) {
|
|
64
|
-
await authDb.verificationCodes.create({
|
|
65
|
-
accountId,
|
|
66
|
-
provider,
|
|
67
|
-
code: await sha256(code),
|
|
68
|
-
expirationTime,
|
|
69
|
-
emailVerified: email,
|
|
70
|
-
phoneVerified: phone,
|
|
71
|
-
});
|
|
72
|
-
}
|
|
73
|
-
else {
|
|
74
|
-
await ctx.db.insert("verification", {
|
|
75
|
-
accountId,
|
|
76
|
-
provider,
|
|
77
|
-
code: await sha256(code),
|
|
78
|
-
expirationTime,
|
|
79
|
-
emailVerified: email,
|
|
80
|
-
phoneVerified: phone,
|
|
81
|
-
});
|
|
45
|
+
await db.verificationCodes.delete(existingCode._id);
|
|
82
46
|
}
|
|
47
|
+
await db.verificationCodes.create({
|
|
48
|
+
accountId,
|
|
49
|
+
provider,
|
|
50
|
+
code: await sha256(code),
|
|
51
|
+
expirationTime,
|
|
52
|
+
emailVerified: email,
|
|
53
|
+
phoneVerified: phone,
|
|
54
|
+
});
|
|
83
55
|
}
|
|
84
56
|
//# sourceMappingURL=createVerificationCode.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createVerificationCode.js","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/createVerificationCode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,CAAC,EAAE,MAAM,eAAe,CAAC;AAIpD,OAAO,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"createVerificationCode.js","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/createVerificationCode.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invalidateSessions.d.ts","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/invalidateSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,EAAK,MAAM,eAAe,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"invalidateSessions.d.ts","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/invalidateSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,EAAK,MAAM,eAAe,CAAC;AAEpD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAI3C,eAAO,MAAM,sBAAsB;;;;;;mCAGjC,CAAC;AAEH,eAAO,MAAM,sBAAsB,GACjC,KAAK,SAAS,EACd,MAAM,KAAK,CAAC,OAAO,sBAAsB,CAAC,KACzC,OAAO,CAAC,IAAI,CAOd,CAAC;AAEF,eAAO,MAAM,sBAAsB,GACjC,KAAK,WAAW,EAChB,MAAM,KAAK,CAAC,OAAO,sBAAsB,CAAC,EAC1C,QAAQ,QAAQ,CAAC,MAAM,KACtB,OAAO,CAAC,IAAI,CAYd,CAAC"}
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { v } from "convex/values";
|
|
2
2
|
import { deleteSession } from "../sessions.js";
|
|
3
3
|
import { LOG_LEVELS, logWithLevel } from "../utils.js";
|
|
4
|
-
import {
|
|
4
|
+
import { authDb } from "../db.js";
|
|
5
|
+
import { AUTH_STORE_REF } from "./storeRef.js";
|
|
5
6
|
export const invalidateSessionsArgs = v.object({
|
|
6
7
|
userId: v.string(),
|
|
7
8
|
except: v.optional(v.array(v.string())),
|
|
8
9
|
});
|
|
9
10
|
export const callInvalidateSessions = async (ctx, args) => {
|
|
10
|
-
return ctx.runMutation(
|
|
11
|
+
return ctx.runMutation(AUTH_STORE_REF, {
|
|
11
12
|
args: {
|
|
12
13
|
type: "invalidateSessions",
|
|
13
14
|
...args,
|
|
@@ -19,12 +20,7 @@ export const invalidateSessionsImpl = async (ctx, args, config) => {
|
|
|
19
20
|
const { userId, except } = args;
|
|
20
21
|
const exceptSet = new Set(except ?? []);
|
|
21
22
|
const typedUserId = userId;
|
|
22
|
-
const sessions = config.
|
|
23
|
-
? await createAuthDb(ctx, config.component).sessions.listByUser(typedUserId)
|
|
24
|
-
: await ctx.db
|
|
25
|
-
.query("session")
|
|
26
|
-
.withIndex("userId", (q) => q.eq("userId", typedUserId))
|
|
27
|
-
.collect();
|
|
23
|
+
const sessions = await authDb(ctx, config).sessions.listByUser(typedUserId);
|
|
28
24
|
for (const session of sessions) {
|
|
29
25
|
if (!exceptSet.has(session._id)) {
|
|
30
26
|
await deleteSession(ctx, session, config);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"invalidateSessions.js","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/invalidateSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,CAAC,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"invalidateSessions.js","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/invalidateSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,CAAC,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAE/C,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEvD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,CAAC,MAAM,CAAC;IAC7C,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;CACxC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EACzC,GAAc,EACd,IAA0C,EAC3B,EAAE;IACjB,OAAO,GAAG,CAAC,WAAW,CAAC,cAAc,EAAE;QACrC,IAAI,EAAE;YACJ,IAAI,EAAE,oBAAoB;YAC1B,GAAG,IAAI;SACR;KACF,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,sBAAsB,GAAG,KAAK,EACzC,GAAgB,EAChB,IAA0C,EAC1C,MAAuB,EACR,EAAE;IACjB,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,8BAA8B,EAAE,IAAI,CAAC,CAAC;IACrE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IAChC,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IACxC,MAAM,WAAW,GAAG,MAA2B,CAAC;IAChD,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IAC5E,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;QAC5C,CAAC;IACH,CAAC;IACD,OAAO;AACT,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modifyAccount.d.ts","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/modifyAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAK,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAQ,MAAM,gBAAgB,CAAC;AAE9D,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"modifyAccount.d.ts","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/modifyAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAK,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,sBAAsB,EAAQ,MAAM,gBAAgB,CAAC;AAE9D,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAI3C,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;wEAG5B,CAAC;AAEH,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,KAAK,CAAC,OAAO,iBAAiB,CAAC,EACrC,kBAAkB,EAAE,sBAAsB,EAC1C,MAAM,EAAE,QAAQ,CAAC,MAAM,GACtB,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED,eAAO,MAAM,iBAAiB,GAC5B,KAAK,SAAS,EACd,MAAM,KAAK,CAAC,OAAO,iBAAiB,CAAC,KACpC,OAAO,CAAC,IAAI,CAOd,CAAC"}
|
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import { v } from "convex/values";
|
|
2
2
|
import { hash } from "../provider.js";
|
|
3
3
|
import { LOG_LEVELS, logWithLevel, maybeRedact } from "../utils.js";
|
|
4
|
-
import {
|
|
4
|
+
import { authDb } from "../db.js";
|
|
5
|
+
import { AUTH_STORE_REF } from "./storeRef.js";
|
|
5
6
|
export const modifyAccountArgs = v.object({
|
|
6
7
|
provider: v.string(),
|
|
7
8
|
account: v.object({ id: v.string(), secret: v.string() }),
|
|
8
9
|
});
|
|
9
10
|
export async function modifyAccountImpl(ctx, args, getProviderOrThrow, config) {
|
|
10
11
|
const { provider, account } = args;
|
|
11
|
-
const
|
|
12
|
+
const db = authDb(ctx, config);
|
|
12
13
|
logWithLevel(LOG_LEVELS.DEBUG, "retrieveAccountWithCredentialsImpl args:", {
|
|
13
14
|
provider: provider,
|
|
14
15
|
account: {
|
|
@@ -16,29 +17,17 @@ export async function modifyAccountImpl(ctx, args, getProviderOrThrow, config) {
|
|
|
16
17
|
secret: maybeRedact(account.secret ?? ""),
|
|
17
18
|
},
|
|
18
19
|
});
|
|
19
|
-
const existingAccount =
|
|
20
|
-
? await authDb.accounts.get(provider, account.id)
|
|
21
|
-
: await ctx.db
|
|
22
|
-
.query("account")
|
|
23
|
-
.withIndex("providerAndAccountId", (q) => q.eq("provider", provider).eq("providerAccountId", account.id))
|
|
24
|
-
.unique();
|
|
20
|
+
const existingAccount = await db.accounts.get(provider, account.id);
|
|
25
21
|
if (existingAccount === null) {
|
|
26
22
|
throw new Error(`Cannot modify account with ID ${account.id} because it does not exist`);
|
|
27
23
|
}
|
|
28
|
-
|
|
29
|
-
await
|
|
30
|
-
|
|
31
|
-
});
|
|
32
|
-
}
|
|
33
|
-
else {
|
|
34
|
-
await ctx.db.patch(existingAccount._id, {
|
|
35
|
-
secret: await hash(getProviderOrThrow(provider), account.secret),
|
|
36
|
-
});
|
|
37
|
-
}
|
|
24
|
+
await db.accounts.patch(existingAccount._id, {
|
|
25
|
+
secret: await hash(getProviderOrThrow(provider), account.secret),
|
|
26
|
+
});
|
|
38
27
|
return;
|
|
39
28
|
}
|
|
40
29
|
export const callModifyAccount = async (ctx, args) => {
|
|
41
|
-
return ctx.runMutation(
|
|
30
|
+
return ctx.runMutation(AUTH_STORE_REF, {
|
|
42
31
|
args: {
|
|
43
32
|
type: "modifyAccount",
|
|
44
33
|
...args,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"modifyAccount.js","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/modifyAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,CAAC,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAA0B,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEpE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"modifyAccount.js","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/modifyAccount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,CAAC,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAA0B,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAEpE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC;IACxC,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC;CAC1D,CAAC,CAAC;AAEH,MAAM,CAAC,KAAK,UAAU,iBAAiB,CACrC,GAAgB,EAChB,IAAqC,EACrC,kBAA0C,EAC1C,MAAuB;IAEvB,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACnC,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC/B,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,0CAA0C,EAAE;QACzE,QAAQ,EAAE,QAAQ;QAClB,OAAO,EAAE;YACP,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;SAC1C;KACF,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,CAAC;IACpE,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CACb,iCAAiC,OAAO,CAAC,EAAE,4BAA4B,CACxE,CAAC;IACJ,CAAC;IACD,MAAM,EAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE;QAC3C,MAAM,EAAE,MAAM,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC;KACjE,CAAC,CAAC;IACH,OAAO;AACT,CAAC;AAED,MAAM,CAAC,MAAM,iBAAiB,GAAG,KAAK,EACpC,GAAc,EACd,IAAqC,EACtB,EAAE;IACjB,OAAO,GAAG,CAAC,WAAW,CAAC,cAAc,EAAE;QACrC,IAAI,EAAE;YACJ,IAAI,EAAE,eAAe;YACrB,GAAG,IAAI;SACR;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refreshSession.d.ts","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/refreshSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAK,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"refreshSession.d.ts","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/refreshSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAK,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,SAAS,EAAO,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAc3C,eAAO,MAAM,kBAAkB;;;;8BAE7B,CAAC;AAEH,KAAK,UAAU,GAAG,IAAI,GAAG;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,wBAAsB,kBAAkB,CACtC,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,KAAK,CAAC,OAAO,kBAAkB,CAAC,EACtC,kBAAkB,EAAE,QAAQ,CAAC,sBAAsB,EACnD,MAAM,EAAE,QAAQ,CAAC,MAAM,GACtB,OAAO,CAAC,UAAU,CAAC,CAoIrB;AAED,eAAO,MAAM,kBAAkB,GAC7B,KAAK,SAAS,EACd,MAAM,KAAK,CAAC,OAAO,kBAAkB,CAAC,KACrC,OAAO,CAAC,UAAU,CAOpB,CAAC"}
|
|
@@ -2,12 +2,13 @@ import { v } from "convex/values";
|
|
|
2
2
|
import { logWithLevel, maybeRedact } from "../utils.js";
|
|
3
3
|
import { deleteAllRefreshTokens, invalidateRefreshTokensInSubtree, loadActiveRefreshToken, parseRefreshToken, REFRESH_TOKEN_REUSE_WINDOW_MS, refreshTokenIfValid, } from "../refreshTokens.js";
|
|
4
4
|
import { generateTokensForSession } from "../sessions.js";
|
|
5
|
-
import {
|
|
5
|
+
import { authDb } from "../db.js";
|
|
6
|
+
import { AUTH_STORE_REF } from "./storeRef.js";
|
|
6
7
|
export const refreshSessionArgs = v.object({
|
|
7
8
|
refreshToken: v.string(),
|
|
8
9
|
});
|
|
9
10
|
export async function refreshSessionImpl(ctx, args, getProviderOrThrow, config) {
|
|
10
|
-
const
|
|
11
|
+
const db = authDb(ctx, config);
|
|
11
12
|
const { refreshToken } = args;
|
|
12
13
|
const { refreshTokenId, sessionId: tokenSessionId } = parseRefreshToken(refreshToken);
|
|
13
14
|
logWithLevel("DEBUG", `refreshSessionImpl args: Token ID: ${maybeRedact(refreshTokenId)} Session ID: ${maybeRedact(tokenSessionId)}`);
|
|
@@ -17,21 +18,13 @@ export async function refreshSessionImpl(ctx, args, getProviderOrThrow, config)
|
|
|
17
18
|
// and the refresh token, even if one of them is missing.
|
|
18
19
|
let session = null;
|
|
19
20
|
try {
|
|
20
|
-
session =
|
|
21
|
-
authDb !== null
|
|
22
|
-
? await authDb.sessions.getById(tokenSessionId)
|
|
23
|
-
: await ctx.db.get(tokenSessionId);
|
|
21
|
+
session = await db.sessions.getById(tokenSessionId);
|
|
24
22
|
}
|
|
25
23
|
catch {
|
|
26
24
|
logWithLevel("DEBUG", "Skipping invalid session id during refresh cleanup");
|
|
27
25
|
}
|
|
28
26
|
if (session !== null) {
|
|
29
|
-
|
|
30
|
-
await authDb.sessions.delete(session._id);
|
|
31
|
-
}
|
|
32
|
-
else {
|
|
33
|
-
await ctx.db.delete(session._id);
|
|
34
|
-
}
|
|
27
|
+
await db.sessions.delete(session._id);
|
|
35
28
|
}
|
|
36
29
|
try {
|
|
37
30
|
await deleteAllRefreshTokens(ctx, tokenSessionId, config);
|
|
@@ -47,16 +40,9 @@ export async function refreshSessionImpl(ctx, args, getProviderOrThrow, config)
|
|
|
47
40
|
const tokenFirstUsed = validationResult.refreshTokenDoc.firstUsedTime;
|
|
48
41
|
// First use -- mark as used and generate new refresh token
|
|
49
42
|
if (tokenFirstUsed === undefined) {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
});
|
|
54
|
-
}
|
|
55
|
-
else {
|
|
56
|
-
await ctx.db.patch(refreshTokenId, {
|
|
57
|
-
firstUsedTime: Date.now(),
|
|
58
|
-
});
|
|
59
|
-
}
|
|
43
|
+
await db.refreshTokens.patch(refreshTokenId, {
|
|
44
|
+
firstUsedTime: Date.now(),
|
|
45
|
+
});
|
|
60
46
|
const result = await generateTokensForSession(ctx, config, {
|
|
61
47
|
userId,
|
|
62
48
|
sessionId,
|
|
@@ -106,7 +92,7 @@ export async function refreshSessionImpl(ctx, args, getProviderOrThrow, config)
|
|
|
106
92
|
}
|
|
107
93
|
}
|
|
108
94
|
export const callRefreshSession = async (ctx, args) => {
|
|
109
|
-
return ctx.runMutation(
|
|
95
|
+
return ctx.runMutation(AUTH_STORE_REF, {
|
|
110
96
|
args: {
|
|
111
97
|
type: "refreshSession",
|
|
112
98
|
...args,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refreshSession.js","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/refreshSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,CAAC,EAAE,MAAM,eAAe,CAAC;AAGzC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACxD,OAAO,EACL,sBAAsB,EACtB,gCAAgC,EAChC,sBAAsB,EACtB,iBAAiB,EACjB,6BAA6B,EAC7B,mBAAmB,GACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"refreshSession.js","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/refreshSession.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retrieveAccountWithCredentials.d.ts","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/retrieveAccountWithCredentials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAK,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAM1D,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"retrieveAccountWithCredentials.d.ts","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/retrieveAccountWithCredentials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAK,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAM1D,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAK3C,eAAO,MAAM,kCAAkC;;;;;;;;;;;;;;;wEAG7C,CAAC;AAEH,KAAK,UAAU,GACX,kBAAkB,GAClB,uBAAuB,GACvB,eAAe,GACf;IAAE,OAAO,EAAE,GAAG,CAAC,SAAS,CAAC,CAAC;IAAC,IAAI,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CAAE,CAAC;AAEnD,wBAAsB,kCAAkC,CACtD,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,KAAK,CAAC,OAAO,kCAAkC,CAAC,EACtD,kBAAkB,EAAE,QAAQ,CAAC,sBAAsB,EACnD,MAAM,EAAE,QAAQ,CAAC,MAAM,GACtB,OAAO,CAAC,UAAU,CAAC,CAsCrB;AAED,eAAO,MAAM,kCAAkC,GAC7C,KAAK,SAAS,EACd,MAAM,KAAK,CAAC,OAAO,kCAAkC,CAAC,KACrD,OAAO,CAAC,UAAU,CAOpB,CAAC"}
|
|
@@ -2,14 +2,15 @@ import { v } from "convex/values";
|
|
|
2
2
|
import { isSignInRateLimited, recordFailedSignIn, resetSignInRateLimit, } from "../rateLimit.js";
|
|
3
3
|
import * as Provider from "../provider.js";
|
|
4
4
|
import { LOG_LEVELS, logWithLevel, maybeRedact } from "../utils.js";
|
|
5
|
-
import {
|
|
5
|
+
import { authDb } from "../db.js";
|
|
6
|
+
import { AUTH_STORE_REF } from "./storeRef.js";
|
|
6
7
|
export const retrieveAccountWithCredentialsArgs = v.object({
|
|
7
8
|
provider: v.string(),
|
|
8
9
|
account: v.object({ id: v.string(), secret: v.optional(v.string()) }),
|
|
9
10
|
});
|
|
10
11
|
export async function retrieveAccountWithCredentialsImpl(ctx, args, getProviderOrThrow, config) {
|
|
11
12
|
const { provider: providerId, account } = args;
|
|
12
|
-
const
|
|
13
|
+
const db = authDb(ctx, config);
|
|
13
14
|
logWithLevel(LOG_LEVELS.DEBUG, "retrieveAccountWithCredentialsImpl args:", {
|
|
14
15
|
provider: providerId,
|
|
15
16
|
account: {
|
|
@@ -17,12 +18,7 @@ export async function retrieveAccountWithCredentialsImpl(ctx, args, getProviderO
|
|
|
17
18
|
secret: maybeRedact(account.secret ?? ""),
|
|
18
19
|
},
|
|
19
20
|
});
|
|
20
|
-
const existingAccount =
|
|
21
|
-
? (await authDb.accounts.get(providerId, account.id))
|
|
22
|
-
: await ctx.db
|
|
23
|
-
.query("account")
|
|
24
|
-
.withIndex("providerAndAccountId", (q) => q.eq("provider", providerId).eq("providerAccountId", account.id))
|
|
25
|
-
.unique();
|
|
21
|
+
const existingAccount = (await db.accounts.get(providerId, account.id));
|
|
26
22
|
if (existingAccount === null) {
|
|
27
23
|
return "InvalidAccountId";
|
|
28
24
|
}
|
|
@@ -39,13 +35,11 @@ export async function retrieveAccountWithCredentialsImpl(ctx, args, getProviderO
|
|
|
39
35
|
return {
|
|
40
36
|
account: existingAccount,
|
|
41
37
|
// TODO: Ian removed this
|
|
42
|
-
user:
|
|
43
|
-
? (await authDb.users.getById(existingAccount.userId))
|
|
44
|
-
: (await ctx.db.get(existingAccount.userId)),
|
|
38
|
+
user: (await db.users.getById(existingAccount.userId)),
|
|
45
39
|
};
|
|
46
40
|
}
|
|
47
41
|
export const callRetreiveAccountWithCredentials = async (ctx, args) => {
|
|
48
|
-
return ctx.runMutation(
|
|
42
|
+
return ctx.runMutation(AUTH_STORE_REF, {
|
|
49
43
|
args: {
|
|
50
44
|
type: "retrieveAccountWithCredentials",
|
|
51
45
|
...args,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"retrieveAccountWithCredentials.js","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/retrieveAccountWithCredentials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,CAAC,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"retrieveAccountWithCredentials.js","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/retrieveAccountWithCredentials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,CAAC,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EACL,mBAAmB,EACnB,kBAAkB,EAClB,oBAAoB,GACrB,MAAM,iBAAiB,CAAC;AACzB,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACpE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,MAAM,CAAC,MAAM,kCAAkC,GAAG,CAAC,CAAC,MAAM,CAAC;IACzD,QAAQ,EAAE,CAAC,CAAC,MAAM,EAAE;IACpB,OAAO,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC;CACtE,CAAC,CAAC;AAQH,MAAM,CAAC,KAAK,UAAU,kCAAkC,CACtD,GAAgB,EAChB,IAAsD,EACtD,kBAAmD,EACnD,MAAuB;IAEvB,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IAC/C,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC/B,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,0CAA0C,EAAE;QACzE,QAAQ,EAAE,UAAU;QACpB,OAAO,EAAE;YACP,EAAE,EAAE,OAAO,CAAC,EAAE;YACd,MAAM,EAAE,WAAW,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;SAC1C;KACF,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,GAAG,CAC5C,UAAU,EACV,OAAO,CAAC,EAAE,CACX,CAA0B,CAAC;IAC5B,IAAI,eAAe,KAAK,IAAI,EAAE,CAAC;QAC7B,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IACD,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QACjC,IAAI,MAAM,mBAAmB,CAAC,GAAG,EAAE,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,CAAC;YAChE,OAAO,uBAAuB,CAAC;QACjC,CAAC;QACD,IACE,CAAC,CAAC,MAAM,QAAQ,CAAC,MAAM,CACrB,kBAAkB,CAAC,UAAU,CAAC,EAC9B,OAAO,CAAC,MAAM,EACd,eAAe,CAAC,MAAM,IAAI,EAAE,CAC7B,CAAC,EACF,CAAC;YACD,MAAM,kBAAkB,CAAC,GAAG,EAAE,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAC3D,OAAO,eAAe,CAAC;QACzB,CAAC;QACD,MAAM,oBAAoB,CAAC,GAAG,EAAE,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO;QACL,OAAO,EAAE,eAAe;QACxB,yBAAyB;QACzB,IAAI,EAAE,CAAC,MAAM,EAAE,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,MAAM,CAAC,CAA2B;KACjF,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,kCAAkC,GAAG,KAAK,EACrD,GAAc,EACd,IAAsD,EACjC,EAAE;IACvB,OAAO,GAAG,CAAC,WAAW,CAAC,cAAc,EAAE;QACrC,IAAI,EAAE;YACJ,IAAI,EAAE,gCAAgC;YACtC,GAAG,IAAI;SACR;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signIn.d.ts","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/signIn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,EAAK,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"signIn.d.ts","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/signIn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,KAAK,EAAK,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAClE,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAQ3C,eAAO,MAAM,UAAU;;;;;;;;yDAIrB,CAAC;AAEH,KAAK,UAAU,GAAG,WAAW,CAAC;AAE9B,wBAAsB,UAAU,CAC9B,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,KAAK,CAAC,OAAO,UAAU,CAAC,EAC9B,MAAM,EAAE,QAAQ,CAAC,MAAM,GACtB,OAAO,CAAC,UAAU,CAAC,CAiBrB;AAED,eAAO,MAAM,UAAU,GACrB,KAAK,SAAS,EACd,MAAM,KAAK,CAAC,OAAO,UAAU,CAAC,KAC7B,OAAO,CAAC,UAAU,CAOpB,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { v } from "convex/values";
|
|
2
2
|
import { createNewAndDeleteExistingSession, maybeGenerateTokensForSession, } from "../sessions.js";
|
|
3
3
|
import { LOG_LEVELS, logWithLevel } from "../utils.js";
|
|
4
|
+
import { AUTH_STORE_REF } from "./storeRef.js";
|
|
4
5
|
export const signInArgs = v.object({
|
|
5
6
|
userId: v.string(),
|
|
6
7
|
sessionId: v.optional(v.string()),
|
|
@@ -16,7 +17,7 @@ export async function signInImpl(ctx, args, config) {
|
|
|
16
17
|
return await maybeGenerateTokensForSession(ctx, config, typedUserId, sessionId, generateTokens);
|
|
17
18
|
}
|
|
18
19
|
export const callSignIn = async (ctx, args) => {
|
|
19
|
-
return ctx.runMutation(
|
|
20
|
+
return ctx.runMutation(AUTH_STORE_REF, {
|
|
20
21
|
args: {
|
|
21
22
|
type: "signIn",
|
|
22
23
|
...args,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signIn.js","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/signIn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,CAAC,EAAE,MAAM,eAAe,CAAC;AAGpD,OAAO,EACL,iCAAiC,EACjC,6BAA6B,GAC9B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"signIn.js","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/signIn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,CAAC,EAAE,MAAM,eAAe,CAAC;AAGpD,OAAO,EACL,iCAAiC,EACjC,6BAA6B,GAC9B,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAE/C,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,CAAC,MAAM,CAAC;IACjC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE;IAClB,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;IACjC,cAAc,EAAE,CAAC,CAAC,OAAO,EAAE;CAC5B,CAAC,CAAC;AAIH,MAAM,CAAC,KAAK,UAAU,UAAU,CAC9B,GAAgB,EAChB,IAA8B,EAC9B,MAAuB;IAEvB,YAAY,CAAC,UAAU,CAAC,KAAK,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;IACzD,MAAM,EAAE,MAAM,EAAE,SAAS,EAAE,iBAAiB,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC;IACtE,MAAM,WAAW,GAAG,MAA2B,CAAC;IAChD,MAAM,sBAAsB,GAAG,iBAElB,CAAC;IACd,MAAM,SAAS,GACb,sBAAsB;QACtB,CAAC,MAAM,iCAAiC,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,CAAC,CAAC,CAAC;IACtE,OAAO,MAAM,6BAA6B,CACxC,GAAG,EACH,MAAM,EACN,WAAW,EACX,SAAS,EACT,cAAc,CACf,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,KAAK,EAC7B,GAAc,EACd,IAA8B,EACT,EAAE;IACvB,OAAO,GAAG,CAAC,WAAW,CAAC,cAAc,EAAE;QACrC,IAAI,EAAE;YACJ,IAAI,EAAE,QAAQ;YACd,GAAG,IAAI;SACR;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOut.d.ts","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/signOut.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"signOut.d.ts","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/signOut.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC1C,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAI3C,KAAK,UAAU,GAAG;IAChB,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC,CAAC;IAC1B,SAAS,EAAE,SAAS,CAAC,SAAS,CAAC,CAAC;CACjC,GAAG,IAAI,CAAC;AAET,wBAAsB,WAAW,CAC/B,GAAG,EAAE,WAAW,EAChB,MAAM,EAAE,QAAQ,CAAC,MAAM,GACtB,OAAO,CAAC,UAAU,CAAC,CAWrB;AAED,eAAO,MAAM,WAAW,GAAU,KAAK,SAAS,KAAG,OAAO,CAAC,IAAI,CAM9D,CAAC"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
1
|
import { deleteSession, getAuthSessionId } from "../sessions.js";
|
|
2
|
-
import {
|
|
2
|
+
import { authDb } from "../db.js";
|
|
3
|
+
import { AUTH_STORE_REF } from "./storeRef.js";
|
|
3
4
|
export async function signOutImpl(ctx, config) {
|
|
4
|
-
const
|
|
5
|
+
const db = authDb(ctx, config);
|
|
5
6
|
const sessionId = await getAuthSessionId(ctx);
|
|
6
7
|
if (sessionId !== null) {
|
|
7
|
-
const session =
|
|
8
|
-
? await authDb.sessions.getById(sessionId)
|
|
9
|
-
: await ctx.db.get(sessionId);
|
|
8
|
+
const session = await db.sessions.getById(sessionId);
|
|
10
9
|
if (session !== null) {
|
|
11
10
|
await deleteSession(ctx, session, config);
|
|
12
11
|
return { userId: session.userId, sessionId: session._id };
|
|
@@ -15,7 +14,7 @@ export async function signOutImpl(ctx, config) {
|
|
|
15
14
|
return null;
|
|
16
15
|
}
|
|
17
16
|
export const callSignOut = async (ctx) => {
|
|
18
|
-
return ctx.runMutation(
|
|
17
|
+
return ctx.runMutation(AUTH_STORE_REF, {
|
|
19
18
|
args: {
|
|
20
19
|
type: "signOut",
|
|
21
20
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signOut.js","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/signOut.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEjE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"signOut.js","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/signOut.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAEjE,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAO/C,MAAM,CAAC,KAAK,UAAU,WAAW,CAC/B,GAAgB,EAChB,MAAuB;IAEvB,MAAM,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAC/B,MAAM,SAAS,GAAG,MAAM,gBAAgB,CAAC,GAAG,CAAC,CAAC;IAC9C,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;QACvB,MAAM,OAAO,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;QACrD,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;YACrB,MAAM,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YAC1C,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,CAAC,GAAG,EAAE,CAAC;QAC5D,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAAE,GAAc,EAAiB,EAAE;IACjE,OAAO,GAAG,CAAC,WAAW,CAAC,cAAc,EAAE;QACrC,IAAI,EAAE;YACJ,IAAI,EAAE,SAAS;SAChB;KACF,CAAC,CAAC;AACL,CAAC,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Internal function reference for the library's store dispatch mutation.
|
|
3
|
+
*
|
|
4
|
+
* This remains string-based because the library code cannot import the
|
|
5
|
+
* consumer app's generated `internal` API module.
|
|
6
|
+
*/
|
|
7
|
+
export declare const AUTH_STORE_REF: any;
|
|
8
|
+
//# sourceMappingURL=storeRef.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storeRef.d.ts","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/storeRef.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,eAAO,MAAM,cAAc,EAAmB,GAAG,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Internal function reference for the library's store dispatch mutation.
|
|
3
|
+
*
|
|
4
|
+
* This remains string-based because the library code cannot import the
|
|
5
|
+
* consumer app's generated `internal` API module.
|
|
6
|
+
*/
|
|
7
|
+
export const AUTH_STORE_REF = "auth:store";
|
|
8
|
+
//# sourceMappingURL=storeRef.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"storeRef.js","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/storeRef.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,YAAmB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userOAuth.d.ts","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/userOAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAK,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"userOAuth.d.ts","sourceRoot":"","sources":["../../../../src/server/implementation/mutations/userOAuth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAK,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,QAAQ,MAAM,gBAAgB,CAAC;AAS3C,eAAO,MAAM,aAAa;;;;;;;;;;gGAKxB,CAAC;AAEH,KAAK,UAAU,GAAG,MAAM,CAAC;AAEzB,wBAAsB,aAAa,CACjC,GAAG,EAAE,WAAW,EAChB,IAAI,EAAE,KAAK,CAAC,OAAO,aAAa,CAAC,EACjC,kBAAkB,EAAE,QAAQ,CAAC,sBAAsB,EACnD,MAAM,EAAE,QAAQ,CAAC,MAAM,GACtB,OAAO,CAAC,UAAU,CAAC,CAkCrB;AAED,eAAO,MAAM,aAAa,GACxB,KAAK,SAAS,EACd,MAAM,KAAK,CAAC,OAAO,aAAa,CAAC,KAChC,OAAO,CAAC,UAAU,CAOpB,CAAC"}
|