@convex-dev/better-auth 0.11.1 → 0.11.3
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/auth-config.d.ts +1 -1
- package/dist/auth-config.d.ts.map +1 -1
- package/dist/auth-options.d.ts.map +1 -1
- package/dist/auth-options.js +11 -2
- package/dist/auth-options.js.map +1 -1
- package/dist/client/adapter-utils.js +2 -2
- package/dist/client/adapter-utils.js.map +1 -1
- package/dist/client/adapter.js +1 -1
- package/dist/client/adapter.js.map +1 -1
- package/dist/client/create-client.d.ts +12 -0
- package/dist/client/create-client.d.ts.map +1 -1
- package/dist/client/create-client.js +92 -0
- package/dist/client/create-client.js.map +1 -1
- package/dist/component/testProfiles/auth-options.profile-rename-joins.js +1 -1
- package/dist/component/testProfiles/auth-options.profile-rename-joins.js.map +1 -1
- package/dist/plugins/convex/index.d.ts.map +1 -1
- package/dist/plugins/convex/index.js +3 -1
- package/dist/plugins/convex/index.js.map +1 -1
- package/dist/plugins/cross-domain/index.d.ts.map +1 -1
- package/dist/plugins/cross-domain/index.js +1 -1
- package/dist/plugins/cross-domain/index.js.map +1 -1
- package/dist/test/adapter-factory/auth-flow.js +5 -5
- package/dist/test/adapter-factory/auth-flow.js.map +1 -1
- package/dist/test/adapter-factory/basic.d.ts.map +1 -1
- package/dist/test/adapter-factory/basic.js +10 -6
- package/dist/test/adapter-factory/basic.js.map +1 -1
- package/dist/test/adapter-factory/convex-custom.d.ts +1 -1
- package/dist/test/adapter-factory/convex-custom.d.ts.map +1 -1
- package/dist/test/adapter-factory/convex-custom.js +55 -1
- package/dist/test/adapter-factory/convex-custom.js.map +1 -1
- package/dist/utils/index.d.ts +1 -1
- package/dist/utils/index.d.ts.map +1 -1
- package/package.json +2 -2
- package/src/auth-config.ts +1 -1
- package/src/auth-options.ts +11 -15
- package/src/client/adapter-utils.ts +2 -2
- package/src/client/adapter.ts +1 -1
- package/src/client/create-client.test.ts +149 -0
- package/src/client/create-client.ts +127 -0
- package/src/component/testProfiles/auth-options.profile-rename-joins.ts +1 -1
- package/src/plugins/convex/index.ts +4 -6
- package/src/plugins/cross-domain/index.ts +1 -1
- package/src/test/adapter-factory/auth-flow.ts +6 -6
- package/src/test/adapter-factory/basic.ts +10 -6
- package/src/test/adapter-factory/convex-custom.ts +58 -1
- package/src/utils/index.ts +1 -1
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export declare const convexCustomTestSuite: (options?: {
|
|
2
|
-
disableTests?: Partial<Record<"should handle lone range operators" | "should handle compound indexes that include id field" | "should automatically paginate" | "should support select in findMany" | "should handle OR where clauses" | "should handle OR where clauses with sortBy" | "should apply OR dedupe/sort/limit before select" | "should reject update with an empty where clause" | "should update and count each match only once for overlapping OR clauses" | "should delete and count each match only once for overlapping OR clauses" | "should handle count" | "should handle queries with no index" | "should handle compound operator on non-unique field without an index" | "should preserve null to non-null range comparisons" | "should fail to create a record with a unique field that already exists" | "should be able to compare against a date", boolean> & {
|
|
2
|
+
disableTests?: Partial<Record<"should handle lone range operators" | "should handle compound indexes that include id field" | "should use composite index for eq + sortBy on second field" | "should automatically paginate" | "should support select in findMany" | "should handle OR where clauses" | "should handle OR where clauses with sortBy" | "should apply OR dedupe/sort/limit before select" | "should reject update with an empty where clause" | "should update and count each match only once for overlapping OR clauses" | "should delete and count each match only once for overlapping OR clauses" | "should handle count" | "should handle queries with no index" | "should handle compound operator on non-unique field without an index" | "should preserve null to non-null range comparisons" | "should fail to create a record with a unique field that already exists" | "should be able to compare against a date", boolean> & {
|
|
3
3
|
ALL?: boolean;
|
|
4
4
|
}> | undefined;
|
|
5
5
|
} | undefined) => (helpers: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convex-custom.d.ts","sourceRoot":"","sources":["../../../src/test/adapter-factory/convex-custom.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,qBAAqB;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"convex-custom.d.ts","sourceRoot":"","sources":["../../../src/test/adapter-factory/convex-custom.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,qBAAqB;;;;;;;;;;;;eAkNnB,CAAC;;qBAIN,CAAV;qBACqB,CAAC;mBAgiBrB,CAAC"}
|
|
@@ -169,6 +169,60 @@ export const convexCustomTestSuite = createTestSuite("convex-custom", {}, ({ ada
|
|
|
169
169
|
],
|
|
170
170
|
})).toEqual(user);
|
|
171
171
|
},
|
|
172
|
+
"should use composite index for eq + sortBy on second field": async () => {
|
|
173
|
+
const sharedExpiresAt = Date.now() + 60_000;
|
|
174
|
+
await adapter.create({
|
|
175
|
+
model: "session",
|
|
176
|
+
data: {
|
|
177
|
+
token: `tok-z-${sharedExpiresAt}`,
|
|
178
|
+
expiresAt: sharedExpiresAt,
|
|
179
|
+
userId: "zzz-user",
|
|
180
|
+
createdAt: sharedExpiresAt,
|
|
181
|
+
updatedAt: sharedExpiresAt,
|
|
182
|
+
},
|
|
183
|
+
});
|
|
184
|
+
await adapter.create({
|
|
185
|
+
model: "session",
|
|
186
|
+
data: {
|
|
187
|
+
token: `tok-a-${sharedExpiresAt}`,
|
|
188
|
+
expiresAt: sharedExpiresAt,
|
|
189
|
+
userId: "aaa-user",
|
|
190
|
+
createdAt: sharedExpiresAt,
|
|
191
|
+
updatedAt: sharedExpiresAt,
|
|
192
|
+
},
|
|
193
|
+
});
|
|
194
|
+
await adapter.create({
|
|
195
|
+
model: "session",
|
|
196
|
+
data: {
|
|
197
|
+
token: `tok-m-${sharedExpiresAt}`,
|
|
198
|
+
expiresAt: sharedExpiresAt,
|
|
199
|
+
userId: "mmm-user",
|
|
200
|
+
createdAt: sharedExpiresAt,
|
|
201
|
+
updatedAt: sharedExpiresAt,
|
|
202
|
+
},
|
|
203
|
+
});
|
|
204
|
+
await adapter.create({
|
|
205
|
+
model: "session",
|
|
206
|
+
data: {
|
|
207
|
+
token: `tok-non-matching-${sharedExpiresAt}`,
|
|
208
|
+
expiresAt: sharedExpiresAt + 60_000,
|
|
209
|
+
userId: "bbb-user",
|
|
210
|
+
createdAt: sharedExpiresAt,
|
|
211
|
+
updatedAt: sharedExpiresAt,
|
|
212
|
+
},
|
|
213
|
+
});
|
|
214
|
+
const result = await adapter.findMany({
|
|
215
|
+
model: "session",
|
|
216
|
+
where: [{ field: "expiresAt", value: sharedExpiresAt }],
|
|
217
|
+
sortBy: { field: "userId", direction: "asc" },
|
|
218
|
+
select: ["userId"],
|
|
219
|
+
});
|
|
220
|
+
expect(result.map((session) => session.userId)).toEqual([
|
|
221
|
+
"aaa-user",
|
|
222
|
+
"mmm-user",
|
|
223
|
+
"zzz-user",
|
|
224
|
+
]);
|
|
225
|
+
},
|
|
172
226
|
"should automatically paginate": async () => {
|
|
173
227
|
for (let i = 0; i < 300; i++) {
|
|
174
228
|
await adapter.create({
|
|
@@ -604,7 +658,7 @@ export const convexCustomTestSuite = createTestSuite("convex-custom", {}, ({ ada
|
|
|
604
658
|
model: "user",
|
|
605
659
|
where: [{ field: "createdAt", value: now }],
|
|
606
660
|
})).toEqual(user);
|
|
607
|
-
expect(user.createdAt).
|
|
661
|
+
expect(typeof user.createdAt).toBe("number");
|
|
608
662
|
},
|
|
609
663
|
}));
|
|
610
664
|
//# sourceMappingURL=convex-custom.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"convex-custom.js","sourceRoot":"","sources":["../../../src/test/adapter-factory/convex-custom.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"convex-custom.js","sourceRoot":"","sources":["../../../src/test/adapter-factory/convex-custom.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/index.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { AuthProvider, DefaultFunctionArgs, FunctionReference, GenericActionCtx, GenericDataModel, GenericMutationCtx, GenericQueryCtx } from "convex/server";
|
|
2
2
|
import type { Jwk } from "better-auth/plugins/jwt";
|
|
3
|
-
type TrustedOriginsOption = (string | null | undefined)[] | ((request?: Request) => (string | null | undefined)[] | Promise<(string | null | undefined)[]>);
|
|
3
|
+
export type TrustedOriginsOption = (string | null | undefined)[] | ((request?: Request) => (string | null | undefined)[] | Promise<(string | null | undefined)[]>);
|
|
4
4
|
type RegisterableAuth = {
|
|
5
5
|
handler: (request: Request) => Promise<Response>;
|
|
6
6
|
options: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,EAClB,eAAe,EAChB,MAAM,eAAe,CAAC;AAGvB,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AAEnD,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
"bugs": {
|
|
7
7
|
"url": "https://github.com/get-convex/better-auth/issues"
|
|
8
8
|
},
|
|
9
|
-
"version": "0.11.
|
|
9
|
+
"version": "0.11.3",
|
|
10
10
|
"license": "Apache-2.0",
|
|
11
11
|
"keywords": [
|
|
12
12
|
"convex",
|
|
@@ -33,7 +33,7 @@
|
|
|
33
33
|
"test:adapter-policy": "node test/adapter-policy/validate.mjs",
|
|
34
34
|
"test:adapter-drift": "node test/adapter-policy/check-upstream-drift.mjs",
|
|
35
35
|
"preversion": "npm ci && npm run build:clean && run-p test lint typecheck",
|
|
36
|
-
"prepublishOnly": "npm whoami || npm login && sleep
|
|
36
|
+
"prepublishOnly": "npm whoami || npm login && sleep 3",
|
|
37
37
|
"alpha": "npm version prerelease --preid alpha && npm publish --tag alpha && git push --follow-tags",
|
|
38
38
|
"release": "npm version patch && npm publish && git push --follow-tags",
|
|
39
39
|
"version": "vim -c 'normal o' -c 'normal o## '$npm_package_version CHANGELOG.md && prettier -w CHANGELOG.md && git add CHANGELOG.md"
|
package/src/auth-config.ts
CHANGED
package/src/auth-options.ts
CHANGED
|
@@ -1,18 +1,15 @@
|
|
|
1
1
|
import type { BetterAuthOptions } from "better-auth/minimal";
|
|
2
|
-
import {
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
twoFactor,
|
|
14
|
-
username,
|
|
15
|
-
} from "better-auth/plugins";
|
|
2
|
+
import { anonymous } from "better-auth/plugins/anonymous";
|
|
3
|
+
import { bearer } from "better-auth/plugins/bearer";
|
|
4
|
+
import { emailOTP } from "better-auth/plugins/email-otp";
|
|
5
|
+
import { genericOAuth } from "better-auth/plugins/generic-oauth";
|
|
6
|
+
import { jwt } from "better-auth/plugins/jwt";
|
|
7
|
+
import { magicLink } from "better-auth/plugins/magic-link";
|
|
8
|
+
import { oidcProvider } from "better-auth/plugins/oidc-provider";
|
|
9
|
+
import { oneTimeToken } from "better-auth/plugins/one-time-token";
|
|
10
|
+
import { phoneNumber } from "better-auth/plugins/phone-number";
|
|
11
|
+
import { twoFactor } from "better-auth/plugins/two-factor";
|
|
12
|
+
import { username } from "better-auth/plugins/username";
|
|
16
13
|
import { convex } from "./plugins/convex/index.js";
|
|
17
14
|
import { convexAdapter } from "./client/adapter.js";
|
|
18
15
|
|
|
@@ -38,7 +35,6 @@ export const options = {
|
|
|
38
35
|
},
|
|
39
36
|
],
|
|
40
37
|
}),
|
|
41
|
-
oneTap(),
|
|
42
38
|
oidcProvider({
|
|
43
39
|
loginPage: "/login",
|
|
44
40
|
}),
|
|
@@ -187,12 +187,12 @@ const findIndex = (
|
|
|
187
187
|
.map(([field]) => field)
|
|
188
188
|
.concat(
|
|
189
189
|
boundField && boundField !== "createdAt"
|
|
190
|
-
?
|
|
190
|
+
? boundField
|
|
191
191
|
: ""
|
|
192
192
|
)
|
|
193
193
|
.concat(
|
|
194
194
|
sortField && sortField !== "createdAt" && boundField !== sortField
|
|
195
|
-
?
|
|
195
|
+
? sortField
|
|
196
196
|
: ""
|
|
197
197
|
)
|
|
198
198
|
.filter(Boolean);
|
package/src/client/adapter.ts
CHANGED
|
@@ -0,0 +1,149 @@
|
|
|
1
|
+
import { describe, expect, it, vi } from "vitest";
|
|
2
|
+
import { httpRouter } from "convex/server";
|
|
3
|
+
import { createClient } from "./create-client.js";
|
|
4
|
+
|
|
5
|
+
const component = {
|
|
6
|
+
adapter: {
|
|
7
|
+
create: "create",
|
|
8
|
+
findOne: "findOne",
|
|
9
|
+
findMany: "findMany",
|
|
10
|
+
updateOne: "updateOne",
|
|
11
|
+
updateMany: "updateMany",
|
|
12
|
+
deleteOne: "deleteOne",
|
|
13
|
+
deleteMany: "deleteMany",
|
|
14
|
+
},
|
|
15
|
+
} as any;
|
|
16
|
+
|
|
17
|
+
const getRouteHandler = (
|
|
18
|
+
http: ReturnType<typeof httpRouter>,
|
|
19
|
+
path: string,
|
|
20
|
+
method: "GET" | "POST" | "OPTIONS"
|
|
21
|
+
) => {
|
|
22
|
+
const route = http.lookup(path, method);
|
|
23
|
+
if (!route) {
|
|
24
|
+
return null;
|
|
25
|
+
}
|
|
26
|
+
return route[0] as unknown as {
|
|
27
|
+
_handler: (ctx: unknown, request: Request) => Promise<Response>;
|
|
28
|
+
};
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
describe("createClient route registration", () => {
|
|
32
|
+
it("registerRoutes eagerly initializes auth and infers basePath", () => {
|
|
33
|
+
const client = createClient(component);
|
|
34
|
+
const http = httpRouter();
|
|
35
|
+
const createAuth = vi.fn(() => ({
|
|
36
|
+
handler: async () => new Response("ok"),
|
|
37
|
+
options: {
|
|
38
|
+
basePath: "/custom/auth",
|
|
39
|
+
trustedOrigins: ["https://app.example.com"],
|
|
40
|
+
},
|
|
41
|
+
$context: Promise.resolve({
|
|
42
|
+
options: {
|
|
43
|
+
trustedOrigins: ["https://app.example.com"],
|
|
44
|
+
},
|
|
45
|
+
}),
|
|
46
|
+
}));
|
|
47
|
+
|
|
48
|
+
client.registerRoutes(http, createAuth);
|
|
49
|
+
|
|
50
|
+
expect(createAuth).toHaveBeenCalledTimes(1);
|
|
51
|
+
expect(getRouteHandler(http, "/custom/auth/test", "GET")).toBeTruthy();
|
|
52
|
+
expect(
|
|
53
|
+
getRouteHandler(http, "/.well-known/openid-configuration", "GET")
|
|
54
|
+
).toBeTruthy();
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
it("registerRoutes uses auth options for CORS and basePath", async () => {
|
|
58
|
+
const client = createClient(component);
|
|
59
|
+
const http = httpRouter();
|
|
60
|
+
const createAuth = vi.fn(() => ({
|
|
61
|
+
handler: async () => new Response("ok"),
|
|
62
|
+
options: {
|
|
63
|
+
basePath: "/custom/auth",
|
|
64
|
+
trustedOrigins: ["https://app.example.com"],
|
|
65
|
+
},
|
|
66
|
+
$context: Promise.resolve({
|
|
67
|
+
options: {
|
|
68
|
+
trustedOrigins: ["https://app.example.com"],
|
|
69
|
+
},
|
|
70
|
+
}),
|
|
71
|
+
}));
|
|
72
|
+
|
|
73
|
+
client.registerRoutes(http, createAuth, { cors: true });
|
|
74
|
+
|
|
75
|
+
expect(createAuth).toHaveBeenCalledTimes(1);
|
|
76
|
+
expect(getRouteHandler(http, "/custom/auth/test", "GET")).toBeTruthy();
|
|
77
|
+
expect(getRouteHandler(http, "/custom/auth/test", "OPTIONS")).toBeTruthy();
|
|
78
|
+
|
|
79
|
+
const optionsHandler = getRouteHandler(
|
|
80
|
+
http,
|
|
81
|
+
"/custom/auth/test",
|
|
82
|
+
"OPTIONS"
|
|
83
|
+
);
|
|
84
|
+
expect(optionsHandler).toBeTruthy();
|
|
85
|
+
const response = await optionsHandler!._handler(
|
|
86
|
+
{},
|
|
87
|
+
new Request("https://deployment.convex.site/custom/auth/test", {
|
|
88
|
+
method: "OPTIONS",
|
|
89
|
+
headers: {
|
|
90
|
+
origin: "https://app.example.com",
|
|
91
|
+
"access-control-request-method": "GET",
|
|
92
|
+
},
|
|
93
|
+
})
|
|
94
|
+
);
|
|
95
|
+
|
|
96
|
+
expect(response.headers.get("access-control-allow-origin")).toBe(
|
|
97
|
+
"https://app.example.com"
|
|
98
|
+
);
|
|
99
|
+
expect(createAuth).toHaveBeenCalledTimes(1);
|
|
100
|
+
|
|
101
|
+
const getHandler = getRouteHandler(http, "/custom/auth/test", "GET");
|
|
102
|
+
expect(getHandler).toBeTruthy();
|
|
103
|
+
await getHandler!._handler(
|
|
104
|
+
{},
|
|
105
|
+
new Request("https://deployment.convex.site/custom/auth/test", {
|
|
106
|
+
method: "GET",
|
|
107
|
+
})
|
|
108
|
+
);
|
|
109
|
+
expect(createAuth).toHaveBeenCalledTimes(2);
|
|
110
|
+
});
|
|
111
|
+
|
|
112
|
+
it("registerRoutesLazy resolves trustedOrigins lazily when needed", async () => {
|
|
113
|
+
const client = createClient(component);
|
|
114
|
+
const http = httpRouter();
|
|
115
|
+
const createAuth = vi.fn(() => ({
|
|
116
|
+
handler: async () => new Response("ok"),
|
|
117
|
+
options: {
|
|
118
|
+
trustedOrigins: ["https://fallback.example.com"],
|
|
119
|
+
},
|
|
120
|
+
$context: Promise.resolve({
|
|
121
|
+
options: {
|
|
122
|
+
trustedOrigins: ["https://fallback.example.com"],
|
|
123
|
+
},
|
|
124
|
+
}),
|
|
125
|
+
}));
|
|
126
|
+
|
|
127
|
+
client.registerRoutesLazy(http, createAuth, { cors: true });
|
|
128
|
+
expect(createAuth).not.toHaveBeenCalled();
|
|
129
|
+
expect(getRouteHandler(http, "/api/auth/test", "GET")).toBeTruthy();
|
|
130
|
+
|
|
131
|
+
const optionsHandler = getRouteHandler(http, "/api/auth/test", "OPTIONS");
|
|
132
|
+
expect(optionsHandler).toBeTruthy();
|
|
133
|
+
const response = await optionsHandler!._handler(
|
|
134
|
+
{},
|
|
135
|
+
new Request("https://deployment.convex.site/api/auth/test", {
|
|
136
|
+
method: "OPTIONS",
|
|
137
|
+
headers: {
|
|
138
|
+
origin: "https://fallback.example.com",
|
|
139
|
+
"access-control-request-method": "GET",
|
|
140
|
+
},
|
|
141
|
+
})
|
|
142
|
+
);
|
|
143
|
+
|
|
144
|
+
expect(response.headers.get("access-control-allow-origin")).toBe(
|
|
145
|
+
"https://fallback.example.com"
|
|
146
|
+
);
|
|
147
|
+
expect(createAuth).toHaveBeenCalledTimes(1);
|
|
148
|
+
});
|
|
149
|
+
});
|
|
@@ -19,6 +19,7 @@ import { corsRouter } from "convex-helpers/server/cors";
|
|
|
19
19
|
import type defaultSchema from "../component/schema.js";
|
|
20
20
|
import type { ComponentApi } from "../component/_generated/component.js";
|
|
21
21
|
import type { CreateAuth, GenericCtx } from "./index.js";
|
|
22
|
+
import type { TrustedOriginsOption } from "../utils/index.js";
|
|
22
23
|
|
|
23
24
|
export type AuthFunctions = {
|
|
24
25
|
onCreate?: FunctionReference<"mutation", "internal", { [key: string]: any }>;
|
|
@@ -72,6 +73,20 @@ type SlimComponentApi = {
|
|
|
72
73
|
adapterTest?: ComponentApi["adapterTest"];
|
|
73
74
|
};
|
|
74
75
|
|
|
76
|
+
type RouteCorsOptions =
|
|
77
|
+
| boolean
|
|
78
|
+
| {
|
|
79
|
+
allowedOrigins?: string[];
|
|
80
|
+
allowedHeaders?: string[];
|
|
81
|
+
exposedHeaders?: string[];
|
|
82
|
+
};
|
|
83
|
+
|
|
84
|
+
type RegisterRoutesLazyOptions = {
|
|
85
|
+
basePath?: string;
|
|
86
|
+
trustedOrigins?: TrustedOriginsOption;
|
|
87
|
+
cors?: RouteCorsOptions;
|
|
88
|
+
};
|
|
89
|
+
|
|
75
90
|
/**
|
|
76
91
|
* Backend API for the Better Auth component.
|
|
77
92
|
* Responsible for exposing the `client` and `triggers` APIs to the client, http
|
|
@@ -456,5 +471,117 @@ export const createClient = <
|
|
|
456
471
|
handler: authRequestHandler,
|
|
457
472
|
});
|
|
458
473
|
},
|
|
474
|
+
|
|
475
|
+
registerRoutesLazy: <T extends CreateAuth<DataModel>>(
|
|
476
|
+
http: HttpRouter,
|
|
477
|
+
createAuth: T,
|
|
478
|
+
opts: RegisterRoutesLazyOptions = {}
|
|
479
|
+
) => {
|
|
480
|
+
let registrationAuth: ReturnType<T> | undefined;
|
|
481
|
+
const getRegistrationAuth = (): ReturnType<T> => {
|
|
482
|
+
registrationAuth =
|
|
483
|
+
registrationAuth ?? (createAuth({} as any) as ReturnType<T>);
|
|
484
|
+
return registrationAuth;
|
|
485
|
+
};
|
|
486
|
+
|
|
487
|
+
const path = opts.basePath ?? "/api/auth";
|
|
488
|
+
let trustedOriginsOption = opts.trustedOrigins;
|
|
489
|
+
const authRequestHandler = httpActionGeneric(async (ctx, request) => {
|
|
490
|
+
if (config?.verbose) {
|
|
491
|
+
// eslint-disable-next-line no-console
|
|
492
|
+
console.log("options.baseURL", getRegistrationAuth().options.baseURL);
|
|
493
|
+
// eslint-disable-next-line no-console
|
|
494
|
+
console.log("request headers", request.headers);
|
|
495
|
+
}
|
|
496
|
+
const auth = createAuth(ctx as any);
|
|
497
|
+
const response = await auth.handler(request);
|
|
498
|
+
if (config?.verbose) {
|
|
499
|
+
// eslint-disable-next-line no-console
|
|
500
|
+
console.log("response headers", response.headers);
|
|
501
|
+
}
|
|
502
|
+
return response;
|
|
503
|
+
});
|
|
504
|
+
const wellKnown = http.lookup("/.well-known/openid-configuration", "GET");
|
|
505
|
+
|
|
506
|
+
// If registerRoutes is used multiple times, this may already be defined
|
|
507
|
+
if (!wellKnown) {
|
|
508
|
+
// Redirect root well-known to api well-known
|
|
509
|
+
http.route({
|
|
510
|
+
path: "/.well-known/openid-configuration",
|
|
511
|
+
method: "GET",
|
|
512
|
+
handler: httpActionGeneric(async () => {
|
|
513
|
+
const url = `${process.env.CONVEX_SITE_URL}${path}/convex/.well-known/openid-configuration`;
|
|
514
|
+
return Response.redirect(url);
|
|
515
|
+
}),
|
|
516
|
+
});
|
|
517
|
+
}
|
|
518
|
+
|
|
519
|
+
if (!opts.cors) {
|
|
520
|
+
http.route({
|
|
521
|
+
pathPrefix: `${path}/`,
|
|
522
|
+
method: "GET",
|
|
523
|
+
handler: authRequestHandler,
|
|
524
|
+
});
|
|
525
|
+
|
|
526
|
+
http.route({
|
|
527
|
+
pathPrefix: `${path}/`,
|
|
528
|
+
method: "POST",
|
|
529
|
+
handler: authRequestHandler,
|
|
530
|
+
});
|
|
531
|
+
|
|
532
|
+
return;
|
|
533
|
+
}
|
|
534
|
+
|
|
535
|
+
const corsOpts =
|
|
536
|
+
typeof opts.cors === "boolean"
|
|
537
|
+
? { allowedOrigins: [], allowedHeaders: [], exposedHeaders: [] }
|
|
538
|
+
: opts.cors;
|
|
539
|
+
const cors = corsRouter(http, {
|
|
540
|
+
allowedOrigins: async (request) => {
|
|
541
|
+
const resolvedTrustedOrigins =
|
|
542
|
+
trustedOriginsOption ??
|
|
543
|
+
(await getRegistrationAuth().$context).options.trustedOrigins ??
|
|
544
|
+
[];
|
|
545
|
+
trustedOriginsOption = resolvedTrustedOrigins;
|
|
546
|
+
const rawOrigins = Array.isArray(resolvedTrustedOrigins)
|
|
547
|
+
? resolvedTrustedOrigins
|
|
548
|
+
: await resolvedTrustedOrigins(request);
|
|
549
|
+
const trustedOrigins = rawOrigins.filter(
|
|
550
|
+
(origin): origin is string => typeof origin === "string"
|
|
551
|
+
);
|
|
552
|
+
return trustedOrigins
|
|
553
|
+
.map((origin) =>
|
|
554
|
+
// Strip trailing wildcards, unsupported for allowedOrigins
|
|
555
|
+
origin.endsWith("*") && origin.length > 1
|
|
556
|
+
? origin.slice(0, -1)
|
|
557
|
+
: origin
|
|
558
|
+
)
|
|
559
|
+
.concat(corsOpts.allowedOrigins ?? []);
|
|
560
|
+
},
|
|
561
|
+
allowCredentials: true,
|
|
562
|
+
allowedHeaders: [
|
|
563
|
+
"Content-Type",
|
|
564
|
+
"Better-Auth-Cookie",
|
|
565
|
+
"Authorization",
|
|
566
|
+
].concat(corsOpts.allowedHeaders ?? []),
|
|
567
|
+
exposedHeaders: ["Set-Better-Auth-Cookie"].concat(
|
|
568
|
+
corsOpts.exposedHeaders ?? []
|
|
569
|
+
),
|
|
570
|
+
debug: config?.verbose,
|
|
571
|
+
enforceAllowOrigins: false,
|
|
572
|
+
});
|
|
573
|
+
|
|
574
|
+
cors.route({
|
|
575
|
+
pathPrefix: `${path}/`,
|
|
576
|
+
method: "GET",
|
|
577
|
+
handler: authRequestHandler,
|
|
578
|
+
});
|
|
579
|
+
|
|
580
|
+
cors.route({
|
|
581
|
+
pathPrefix: `${path}/`,
|
|
582
|
+
method: "POST",
|
|
583
|
+
handler: authRequestHandler,
|
|
584
|
+
});
|
|
585
|
+
},
|
|
459
586
|
};
|
|
460
587
|
};
|
|
@@ -5,12 +5,10 @@ import {
|
|
|
5
5
|
createAuthMiddleware,
|
|
6
6
|
sessionMiddleware,
|
|
7
7
|
} from "better-auth/api";
|
|
8
|
-
import {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
} from "better-auth/plugins";
|
|
13
|
-
import type { JwtOptions, Jwk } from "better-auth/plugins";
|
|
8
|
+
import { bearer as bearerPlugin } from "better-auth/plugins/bearer";
|
|
9
|
+
import { jwt as jwtPlugin } from "better-auth/plugins/jwt";
|
|
10
|
+
import type { JwtOptions, Jwk } from "better-auth/plugins/jwt";
|
|
11
|
+
import { oidcProvider as oidcProviderPlugin } from "better-auth/plugins/oidc-provider";
|
|
14
12
|
import { omit } from "convex-helpers";
|
|
15
13
|
import type { AuthConfig, AuthProvider } from "convex/server";
|
|
16
14
|
|
|
@@ -2,7 +2,7 @@ import type { BetterAuthPlugin } from "better-auth";
|
|
|
2
2
|
import { setSessionCookie } from "better-auth/cookies";
|
|
3
3
|
import { generateRandomString } from "better-auth/crypto";
|
|
4
4
|
import { createAuthEndpoint, createAuthMiddleware } from "better-auth/api";
|
|
5
|
-
import { oneTimeToken as oneTimeTokenPlugin } from "better-auth/plugins";
|
|
5
|
+
import { oneTimeToken as oneTimeTokenPlugin } from "better-auth/plugins/one-time-token";
|
|
6
6
|
import { z } from "zod";
|
|
7
7
|
|
|
8
8
|
export const crossDomain = ({ siteUrl }: { siteUrl: string }) => {
|
|
@@ -82,8 +82,8 @@ export const getAuthFlowSuiteTests = (
|
|
|
82
82
|
user: User;
|
|
83
83
|
session: Session;
|
|
84
84
|
};
|
|
85
|
-
signUpResult.user.createdAt = new Date(signUpResult.user.createdAt);
|
|
86
|
-
signUpResult.user.updatedAt = new Date(signUpResult.user.updatedAt);
|
|
85
|
+
signUpResult.user.createdAt = new Date(signUpResult.user.createdAt).getTime() as unknown as Date;
|
|
86
|
+
signUpResult.user.updatedAt = new Date(signUpResult.user.updatedAt).getTime() as unknown as Date;
|
|
87
87
|
expect(result?.user).toBeDefined();
|
|
88
88
|
expect(result?.user).toStrictEqual(signUpResult.user);
|
|
89
89
|
expect(result?.session).toBeDefined();
|
|
@@ -117,8 +117,8 @@ export const getAuthFlowSuiteTests = (
|
|
|
117
117
|
body: { email: user.email, password: password },
|
|
118
118
|
});
|
|
119
119
|
process.env.TZ = "America/Los_Angeles";
|
|
120
|
-
expect(userSignUp.user.createdAt
|
|
121
|
-
userSignIn.user.createdAt
|
|
120
|
+
expect(userSignUp.user.createdAt).toStrictEqual(
|
|
121
|
+
userSignIn.user.createdAt,
|
|
122
122
|
);
|
|
123
123
|
},
|
|
124
124
|
"should sign up with additional fields": async () => {
|
|
@@ -135,7 +135,7 @@ export const getAuthFlowSuiteTests = (
|
|
|
135
135
|
name: user.name,
|
|
136
136
|
password: crypto.randomUUID(),
|
|
137
137
|
//@ts-expect-error - we are testing with additional fields
|
|
138
|
-
dateField: dateField.toISOString(), // using iso string to simulate client to server communication
|
|
138
|
+
dateField: dateField.toISOString(), // using iso string to simulate client to server communication
|
|
139
139
|
},
|
|
140
140
|
asResponse: true,
|
|
141
141
|
});
|
|
@@ -145,7 +145,7 @@ export const getAuthFlowSuiteTests = (
|
|
|
145
145
|
headers,
|
|
146
146
|
});
|
|
147
147
|
//@ts-expect-error - we are testing with additional fields
|
|
148
|
-
expect(result?.user.dateField).toStrictEqual(dateField);
|
|
148
|
+
expect(result?.user.dateField).toStrictEqual(dateField.getTime());
|
|
149
149
|
},
|
|
150
150
|
});
|
|
151
151
|
|