@convex-dev/better-auth 0.8.0-alpha.9 → 0.8.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commonjs/auth.d.ts +4 -0
- package/dist/commonjs/auth.d.ts.map +1 -0
- package/dist/commonjs/auth.js +44 -0
- package/dist/commonjs/auth.js.map +1 -0
- package/dist/commonjs/client/adapter.d.ts +8 -10
- package/dist/commonjs/client/adapter.d.ts.map +1 -1
- package/dist/commonjs/client/adapter.js +48 -32
- package/dist/commonjs/client/adapter.js.map +1 -1
- package/dist/commonjs/client/adapterUtils.d.ts +66 -0
- package/dist/commonjs/client/adapterUtils.d.ts.map +1 -0
- package/dist/commonjs/client/adapterUtils.js +429 -0
- package/dist/commonjs/client/adapterUtils.js.map +1 -0
- package/dist/commonjs/client/createSchema.d.ts +24 -0
- package/dist/commonjs/client/createSchema.d.ts.map +1 -0
- package/dist/commonjs/client/createSchema.js +101 -0
- package/dist/commonjs/client/createSchema.js.map +1 -0
- package/dist/commonjs/client/index.d.ts +449 -601
- package/dist/commonjs/client/index.d.ts.map +1 -1
- package/dist/commonjs/client/index.js +339 -212
- package/dist/commonjs/client/index.js.map +1 -1
- package/dist/commonjs/component/adapter.d.ts +128 -0
- package/dist/commonjs/component/adapter.d.ts.map +1 -0
- package/dist/commonjs/component/adapter.js +5 -0
- package/dist/commonjs/component/adapter.js.map +1 -0
- package/dist/commonjs/component/adapterTest.d.ts +3 -5
- package/dist/commonjs/component/adapterTest.d.ts.map +1 -1
- package/dist/commonjs/component/adapterTest.js +3 -17
- package/dist/commonjs/component/adapterTest.js.map +1 -1
- package/dist/commonjs/component/schema.d.ts +451 -207
- package/dist/commonjs/component/schema.d.ts.map +1 -1
- package/dist/commonjs/component/schema.js +50 -177
- package/dist/commonjs/component/schema.js.map +1 -1
- package/dist/commonjs/component/util.d.ts.map +1 -1
- package/dist/commonjs/nextjs/index.d.ts +1 -2
- package/dist/commonjs/nextjs/index.d.ts.map +1 -1
- package/dist/commonjs/nextjs/index.js +3 -2
- package/dist/commonjs/nextjs/index.js.map +1 -1
- package/dist/commonjs/plugins/convex/client.d.ts +2 -5
- package/dist/commonjs/plugins/convex/client.d.ts.map +1 -1
- package/dist/commonjs/plugins/convex/client.js.map +1 -1
- package/dist/commonjs/plugins/convex/index.d.ts +7 -134
- package/dist/commonjs/plugins/convex/index.d.ts.map +1 -1
- package/dist/commonjs/plugins/convex/index.js +10 -125
- package/dist/commonjs/plugins/convex/index.js.map +1 -1
- package/dist/commonjs/plugins/cross-domain/index.js +2 -2
- package/dist/commonjs/plugins/cross-domain/index.js.map +1 -1
- package/dist/commonjs/react-start/index.d.ts +17 -36
- package/dist/commonjs/react-start/index.d.ts.map +1 -1
- package/dist/commonjs/react-start/index.js +43 -31
- package/dist/commonjs/react-start/index.js.map +1 -1
- package/dist/commonjs/src/auth.d.ts +3085 -0
- package/dist/commonjs/src/auth.d.ts.map +1 -0
- package/dist/commonjs/src/auth.js +72 -0
- package/dist/commonjs/src/auth.js.map +1 -0
- package/dist/commonjs/src/client/adapter.d.ts +18 -0
- package/dist/commonjs/src/client/adapter.d.ts.map +1 -0
- package/dist/commonjs/src/client/adapter.js +211 -0
- package/dist/commonjs/src/client/adapter.js.map +1 -0
- package/dist/commonjs/src/client/createSchema.d.ts +25 -0
- package/dist/commonjs/src/client/createSchema.d.ts.map +1 -0
- package/dist/commonjs/src/client/createSchema.js +103 -0
- package/dist/commonjs/src/client/createSchema.js.map +1 -0
- package/dist/commonjs/src/client/index.d.ts +3310 -0
- package/dist/commonjs/src/client/index.d.ts.map +1 -0
- package/dist/commonjs/src/client/index.js +377 -0
- package/dist/commonjs/src/client/index.js.map +1 -0
- package/dist/commonjs/src/client/plugins/index.d.ts +3 -0
- package/dist/commonjs/src/client/plugins/index.d.ts.map +1 -0
- package/dist/commonjs/src/client/plugins/index.js +3 -0
- package/dist/commonjs/src/client/plugins/index.js.map +1 -0
- package/dist/commonjs/src/component/_generated/api.d.ts +12 -0
- package/dist/commonjs/src/component/_generated/api.d.ts.map +1 -0
- package/dist/commonjs/src/component/_generated/api.js +22 -0
- package/dist/commonjs/src/component/_generated/api.js.map +1 -0
- package/dist/commonjs/src/component/_generated/server.d.ts +64 -0
- package/dist/commonjs/src/component/_generated/server.d.ts.map +1 -0
- package/dist/commonjs/src/component/_generated/server.js +74 -0
- package/dist/commonjs/src/component/_generated/server.js.map +1 -0
- package/dist/commonjs/src/component/adapter.d.ts +355 -0
- package/dist/commonjs/src/component/adapter.d.ts.map +1 -0
- package/dist/commonjs/src/component/adapter.js +573 -0
- package/dist/commonjs/src/component/adapter.js.map +1 -0
- package/dist/commonjs/src/component/adapterTest.d.ts +18 -0
- package/dist/commonjs/src/component/adapterTest.d.ts.map +1 -0
- package/dist/commonjs/src/component/adapterTest.js +75 -0
- package/dist/commonjs/src/component/adapterTest.js.map +1 -0
- package/dist/commonjs/src/component/convex.config.d.ts +3 -0
- package/dist/commonjs/src/component/convex.config.d.ts.map +1 -0
- package/dist/commonjs/src/component/convex.config.js +4 -0
- package/dist/commonjs/src/component/convex.config.js.map +1 -0
- package/dist/commonjs/src/component/schema.d.ts +562 -0
- package/dist/commonjs/src/component/schema.d.ts.map +1 -0
- package/dist/commonjs/src/component/schema.js +217 -0
- package/dist/commonjs/src/component/schema.js.map +1 -0
- package/dist/commonjs/src/nextjs/index.d.ts +10 -0
- package/dist/commonjs/src/nextjs/index.d.ts.map +1 -0
- package/dist/commonjs/src/nextjs/index.js +43 -0
- package/dist/commonjs/src/nextjs/index.js.map +1 -0
- package/dist/commonjs/src/plugins/convex/client.d.ts +9 -0
- package/dist/commonjs/src/plugins/convex/client.d.ts.map +1 -0
- package/dist/commonjs/src/plugins/convex/client.js +7 -0
- package/dist/commonjs/src/plugins/convex/client.js.map +1 -0
- package/dist/commonjs/src/plugins/convex/index.d.ts +415 -0
- package/dist/commonjs/src/plugins/convex/index.d.ts.map +1 -0
- package/dist/commonjs/src/plugins/convex/index.js +354 -0
- package/dist/commonjs/src/plugins/convex/index.js.map +1 -0
- package/dist/commonjs/src/plugins/cross-domain/client.d.ts +132 -0
- package/dist/commonjs/src/plugins/cross-domain/client.d.ts.map +1 -0
- package/dist/commonjs/src/plugins/cross-domain/client.js +176 -0
- package/dist/commonjs/src/plugins/cross-domain/client.js.map +1 -0
- package/dist/commonjs/src/plugins/cross-domain/index.d.ts +83 -0
- package/dist/commonjs/src/plugins/cross-domain/index.d.ts.map +1 -0
- package/dist/commonjs/src/plugins/cross-domain/index.js +153 -0
- package/dist/commonjs/src/plugins/cross-domain/index.js.map +1 -0
- package/dist/commonjs/src/plugins/index.d.ts +3 -0
- package/dist/commonjs/src/plugins/index.d.ts.map +1 -0
- package/dist/commonjs/src/plugins/index.js +3 -0
- package/dist/commonjs/src/plugins/index.js.map +1 -0
- package/dist/commonjs/src/react/client.d.ts +31 -0
- package/dist/commonjs/src/react/client.d.ts.map +1 -0
- package/dist/commonjs/src/react/client.js +96 -0
- package/dist/commonjs/src/react/client.js.map +1 -0
- package/dist/commonjs/src/react/index.d.ts +9 -0
- package/dist/commonjs/src/react/index.d.ts.map +1 -0
- package/dist/commonjs/src/react/index.js +15 -0
- package/dist/commonjs/src/react/index.js.map +1 -0
- package/dist/commonjs/src/react-start/index.d.ts +45 -0
- package/dist/commonjs/src/react-start/index.d.ts.map +1 -0
- package/dist/commonjs/src/react-start/index.js +60 -0
- package/dist/commonjs/src/react-start/index.js.map +1 -0
- package/dist/commonjs/src/utils/index.d.ts +9 -0
- package/dist/commonjs/src/utils/index.d.ts.map +1 -0
- package/dist/commonjs/src/utils/index.js +35 -0
- package/dist/commonjs/src/utils/index.js.map +1 -0
- package/dist/esm/auth.d.ts +4 -0
- package/dist/esm/auth.d.ts.map +1 -0
- package/dist/esm/auth.js +44 -0
- package/dist/esm/auth.js.map +1 -0
- package/dist/esm/client/adapter.d.ts +8 -10
- package/dist/esm/client/adapter.d.ts.map +1 -1
- package/dist/esm/client/adapter.js +48 -32
- package/dist/esm/client/adapter.js.map +1 -1
- package/dist/esm/client/adapterUtils.d.ts +66 -0
- package/dist/esm/client/adapterUtils.d.ts.map +1 -0
- package/dist/esm/client/adapterUtils.js +429 -0
- package/dist/esm/client/adapterUtils.js.map +1 -0
- package/dist/esm/client/createSchema.d.ts +24 -0
- package/dist/esm/client/createSchema.d.ts.map +1 -0
- package/dist/esm/client/createSchema.js +101 -0
- package/dist/esm/client/createSchema.js.map +1 -0
- package/dist/esm/client/index.d.ts +449 -601
- package/dist/esm/client/index.d.ts.map +1 -1
- package/dist/esm/client/index.js +339 -212
- package/dist/esm/client/index.js.map +1 -1
- package/dist/esm/component/adapter.d.ts +128 -0
- package/dist/esm/component/adapter.d.ts.map +1 -0
- package/dist/esm/component/adapter.js +5 -0
- package/dist/esm/component/adapter.js.map +1 -0
- package/dist/esm/component/adapterTest.d.ts +3 -5
- package/dist/esm/component/adapterTest.d.ts.map +1 -1
- package/dist/esm/component/adapterTest.js +3 -17
- package/dist/esm/component/adapterTest.js.map +1 -1
- package/dist/esm/component/schema.d.ts +451 -207
- package/dist/esm/component/schema.d.ts.map +1 -1
- package/dist/esm/component/schema.js +50 -177
- package/dist/esm/component/schema.js.map +1 -1
- package/dist/esm/component/util.d.ts.map +1 -1
- package/dist/esm/nextjs/index.d.ts +1 -2
- package/dist/esm/nextjs/index.d.ts.map +1 -1
- package/dist/esm/nextjs/index.js +3 -2
- package/dist/esm/nextjs/index.js.map +1 -1
- package/dist/esm/plugins/convex/client.d.ts +2 -5
- package/dist/esm/plugins/convex/client.d.ts.map +1 -1
- package/dist/esm/plugins/convex/client.js.map +1 -1
- package/dist/esm/plugins/convex/index.d.ts +7 -134
- package/dist/esm/plugins/convex/index.d.ts.map +1 -1
- package/dist/esm/plugins/convex/index.js +10 -125
- package/dist/esm/plugins/convex/index.js.map +1 -1
- package/dist/esm/plugins/cross-domain/index.js +2 -2
- package/dist/esm/plugins/cross-domain/index.js.map +1 -1
- package/dist/esm/react-start/index.d.ts +17 -36
- package/dist/esm/react-start/index.d.ts.map +1 -1
- package/dist/esm/react-start/index.js +43 -31
- package/dist/esm/react-start/index.js.map +1 -1
- package/dist/esm/src/auth.d.ts +3085 -0
- package/dist/esm/src/auth.d.ts.map +1 -0
- package/dist/esm/src/auth.js +72 -0
- package/dist/esm/src/auth.js.map +1 -0
- package/dist/esm/src/client/adapter.d.ts +18 -0
- package/dist/esm/src/client/adapter.d.ts.map +1 -0
- package/dist/esm/src/client/adapter.js +211 -0
- package/dist/esm/src/client/adapter.js.map +1 -0
- package/dist/esm/src/client/createSchema.d.ts +25 -0
- package/dist/esm/src/client/createSchema.d.ts.map +1 -0
- package/dist/esm/src/client/createSchema.js +103 -0
- package/dist/esm/src/client/createSchema.js.map +1 -0
- package/dist/esm/src/client/index.d.ts +3310 -0
- package/dist/esm/src/client/index.d.ts.map +1 -0
- package/dist/esm/src/client/index.js +377 -0
- package/dist/esm/src/client/index.js.map +1 -0
- package/dist/esm/src/client/plugins/index.d.ts +3 -0
- package/dist/esm/src/client/plugins/index.d.ts.map +1 -0
- package/dist/esm/src/client/plugins/index.js +3 -0
- package/dist/esm/src/client/plugins/index.js.map +1 -0
- package/dist/esm/src/component/_generated/api.d.ts +12 -0
- package/dist/esm/src/component/_generated/api.d.ts.map +1 -0
- package/dist/esm/src/component/_generated/api.js +22 -0
- package/dist/esm/src/component/_generated/api.js.map +1 -0
- package/dist/esm/src/component/_generated/server.d.ts +64 -0
- package/dist/esm/src/component/_generated/server.d.ts.map +1 -0
- package/dist/esm/src/component/_generated/server.js +74 -0
- package/dist/esm/src/component/_generated/server.js.map +1 -0
- package/dist/esm/src/component/adapter.d.ts +355 -0
- package/dist/esm/src/component/adapter.d.ts.map +1 -0
- package/dist/esm/src/component/adapter.js +573 -0
- package/dist/esm/src/component/adapter.js.map +1 -0
- package/dist/esm/src/component/adapterTest.d.ts +18 -0
- package/dist/esm/src/component/adapterTest.d.ts.map +1 -0
- package/dist/esm/src/component/adapterTest.js +75 -0
- package/dist/esm/src/component/adapterTest.js.map +1 -0
- package/dist/esm/src/component/convex.config.d.ts +3 -0
- package/dist/esm/src/component/convex.config.d.ts.map +1 -0
- package/dist/esm/src/component/convex.config.js +4 -0
- package/dist/esm/src/component/convex.config.js.map +1 -0
- package/dist/esm/src/component/schema.d.ts +562 -0
- package/dist/esm/src/component/schema.d.ts.map +1 -0
- package/dist/esm/src/component/schema.js +217 -0
- package/dist/esm/src/component/schema.js.map +1 -0
- package/dist/esm/src/nextjs/index.d.ts +10 -0
- package/dist/esm/src/nextjs/index.d.ts.map +1 -0
- package/dist/esm/src/nextjs/index.js +43 -0
- package/dist/esm/src/nextjs/index.js.map +1 -0
- package/dist/esm/src/plugins/convex/client.d.ts +9 -0
- package/dist/esm/src/plugins/convex/client.d.ts.map +1 -0
- package/dist/esm/src/plugins/convex/client.js +7 -0
- package/dist/esm/src/plugins/convex/client.js.map +1 -0
- package/dist/esm/src/plugins/convex/index.d.ts +415 -0
- package/dist/esm/src/plugins/convex/index.d.ts.map +1 -0
- package/dist/esm/src/plugins/convex/index.js +354 -0
- package/dist/esm/src/plugins/convex/index.js.map +1 -0
- package/dist/esm/src/plugins/cross-domain/client.d.ts +132 -0
- package/dist/esm/src/plugins/cross-domain/client.d.ts.map +1 -0
- package/dist/esm/src/plugins/cross-domain/client.js +176 -0
- package/dist/esm/src/plugins/cross-domain/client.js.map +1 -0
- package/dist/esm/src/plugins/cross-domain/index.d.ts +83 -0
- package/dist/esm/src/plugins/cross-domain/index.d.ts.map +1 -0
- package/dist/esm/src/plugins/cross-domain/index.js +153 -0
- package/dist/esm/src/plugins/cross-domain/index.js.map +1 -0
- package/dist/esm/src/plugins/index.d.ts +3 -0
- package/dist/esm/src/plugins/index.d.ts.map +1 -0
- package/dist/esm/src/plugins/index.js +3 -0
- package/dist/esm/src/plugins/index.js.map +1 -0
- package/dist/esm/src/react/client.d.ts +31 -0
- package/dist/esm/src/react/client.d.ts.map +1 -0
- package/dist/esm/src/react/client.js +96 -0
- package/dist/esm/src/react/client.js.map +1 -0
- package/dist/esm/src/react/index.d.ts +9 -0
- package/dist/esm/src/react/index.d.ts.map +1 -0
- package/dist/esm/src/react/index.js +15 -0
- package/dist/esm/src/react/index.js.map +1 -0
- package/dist/esm/src/react-start/index.d.ts +45 -0
- package/dist/esm/src/react-start/index.d.ts.map +1 -0
- package/dist/esm/src/react-start/index.js +60 -0
- package/dist/esm/src/react-start/index.js.map +1 -0
- package/dist/esm/src/utils/index.d.ts +9 -0
- package/dist/esm/src/utils/index.d.ts.map +1 -0
- package/dist/esm/src/utils/index.js +35 -0
- package/dist/esm/src/utils/index.js.map +1 -0
- package/package.json +21 -4
- package/src/auth.ts +57 -0
- package/src/client/adapter.test.ts +15 -0
- package/src/client/adapter.ts +83 -58
- package/src/{component/lib.ts → client/adapterUtils.ts} +106 -256
- package/src/client/createSchema.ts +149 -0
- package/src/client/index.ts +561 -317
- package/src/component/_generated/api.d.ts +1711 -547
- package/src/component/adapter.ts +13 -0
- package/src/component/adapterTest.ts +8 -34
- package/src/component/schema.ts +58 -192
- package/src/nextjs/index.ts +5 -5
- package/src/plugins/convex/client.ts +2 -3
- package/src/plugins/convex/index.ts +15 -147
- package/src/plugins/cross-domain/index.ts +2 -2
- package/src/react-start/index.ts +76 -44
- package/dist/commonjs/client/cors.d.ts +0 -77
- package/dist/commonjs/client/cors.d.ts.map +0 -1
- package/dist/commonjs/client/cors.js +0 -297
- package/dist/commonjs/client/cors.js.map +0 -1
- package/dist/commonjs/util.d.ts +0 -2
- package/dist/commonjs/util.d.ts.map +0 -1
- package/dist/commonjs/util.js +0 -8
- package/dist/commonjs/util.js.map +0 -1
- package/dist/esm/client/cors.d.ts +0 -77
- package/dist/esm/client/cors.d.ts.map +0 -1
- package/dist/esm/client/cors.js +0 -297
- package/dist/esm/client/cors.js.map +0 -1
- package/dist/esm/util.d.ts +0 -2
- package/dist/esm/util.d.ts.map +0 -1
- package/dist/esm/util.js +0 -8
- package/dist/esm/util.js.map +0 -1
- package/src/component/util.ts +0 -4
package/src/client/index.ts
CHANGED
|
@@ -1,76 +1,88 @@
|
|
|
1
1
|
import {
|
|
2
2
|
type Auth as ConvexAuth,
|
|
3
|
+
DataModelFromSchemaDefinition,
|
|
3
4
|
type DefaultFunctionArgs,
|
|
4
5
|
type Expand,
|
|
6
|
+
FunctionHandle,
|
|
5
7
|
type FunctionReference,
|
|
6
8
|
GenericActionCtx,
|
|
7
9
|
type GenericDataModel,
|
|
10
|
+
GenericDocument,
|
|
8
11
|
GenericMutationCtx,
|
|
9
12
|
type GenericQueryCtx,
|
|
13
|
+
GenericSchema,
|
|
10
14
|
type HttpRouter,
|
|
15
|
+
SchemaDefinition,
|
|
11
16
|
httpActionGeneric,
|
|
12
17
|
internalMutationGeneric,
|
|
18
|
+
mutationGeneric,
|
|
19
|
+
paginationOptsValidator,
|
|
13
20
|
queryGeneric,
|
|
14
21
|
} from "convex/server";
|
|
15
22
|
import { type GenericId, Infer, v } from "convex/values";
|
|
16
|
-
import type { api } from "../component/_generated/api";
|
|
17
|
-
import schema from "../component/schema";
|
|
18
23
|
import { convexAdapter } from "./adapter";
|
|
19
|
-
import { betterAuth } from "better-auth";
|
|
20
|
-
import { omit } from "convex-helpers";
|
|
21
|
-
import { createCookieGetter } from "better-auth/cookies";
|
|
22
|
-
import { fetchQuery } from "convex/nextjs";
|
|
23
|
-
import { JWT_COOKIE_NAME } from "../plugins/convex";
|
|
24
|
+
import { AdapterInstance, betterAuth } from "better-auth";
|
|
25
|
+
import { asyncMap, omit } from "convex-helpers";
|
|
24
26
|
import { requireEnv } from "../utils";
|
|
25
|
-
import {
|
|
26
|
-
import {
|
|
27
|
+
import { partial } from "convex-helpers/validators";
|
|
28
|
+
import {
|
|
29
|
+
adapterWhereValidator,
|
|
30
|
+
checkUniqueFields,
|
|
31
|
+
hasUniqueFields,
|
|
32
|
+
listOne,
|
|
33
|
+
paginate,
|
|
34
|
+
selectFields,
|
|
35
|
+
} from "./adapterUtils";
|
|
27
36
|
import { corsRouter } from "convex-helpers/server/cors";
|
|
28
37
|
import { version as convexVersion } from "convex";
|
|
29
38
|
import semver from "semver";
|
|
39
|
+
import defaultSchema from "../component/schema";
|
|
40
|
+
import { getAuthTables } from "better-auth/db";
|
|
41
|
+
import { api } from "../component/_generated/api";
|
|
30
42
|
|
|
31
43
|
export { convexAdapter };
|
|
32
44
|
|
|
45
|
+
export type CreateAdapter = <Ctx extends RunCtx>(ctx: Ctx) => AdapterInstance;
|
|
46
|
+
|
|
33
47
|
if (semver.lt(convexVersion, "1.25.0")) {
|
|
34
48
|
throw new Error("Convex version must be at least 1.25.0");
|
|
35
49
|
}
|
|
36
50
|
|
|
37
|
-
const
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
51
|
+
const whereValidator = (
|
|
52
|
+
schema: SchemaDefinition<any, any>,
|
|
53
|
+
tableName: string
|
|
54
|
+
) =>
|
|
55
|
+
v.object({
|
|
56
|
+
field: v.union(
|
|
57
|
+
...Object.keys(schema.tables[tableName].validator.fields).map((field) =>
|
|
58
|
+
v.literal(field)
|
|
59
|
+
),
|
|
60
|
+
v.literal("id")
|
|
61
|
+
),
|
|
62
|
+
operator: v.optional(
|
|
44
63
|
v.union(
|
|
45
|
-
v.
|
|
46
|
-
v.
|
|
47
|
-
v.
|
|
48
|
-
v.
|
|
49
|
-
v.
|
|
50
|
-
v.
|
|
64
|
+
v.literal("lt"),
|
|
65
|
+
v.literal("lte"),
|
|
66
|
+
v.literal("gt"),
|
|
67
|
+
v.literal("gte"),
|
|
68
|
+
v.literal("eq"),
|
|
69
|
+
v.literal("in"),
|
|
70
|
+
v.literal("ne"),
|
|
71
|
+
v.literal("contains"),
|
|
72
|
+
v.literal("starts_with"),
|
|
73
|
+
v.literal("ends_with")
|
|
51
74
|
)
|
|
52
75
|
),
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
model: v.literal("user"),
|
|
64
|
-
where: v.optional(v.array(adapterWhereValidator)),
|
|
65
|
-
update: v.object(partial(createUserFields)),
|
|
66
|
-
}),
|
|
67
|
-
});
|
|
68
|
-
const createSessionArgsValidator = v.object({
|
|
69
|
-
input: v.object({
|
|
70
|
-
model: v.literal("session"),
|
|
71
|
-
data: v.object(schema.tables.session.validator.fields),
|
|
72
|
-
}),
|
|
73
|
-
});
|
|
76
|
+
value: v.union(
|
|
77
|
+
v.string(),
|
|
78
|
+
v.number(),
|
|
79
|
+
v.boolean(),
|
|
80
|
+
v.array(v.string()),
|
|
81
|
+
v.array(v.number()),
|
|
82
|
+
v.null()
|
|
83
|
+
),
|
|
84
|
+
connector: v.optional(v.union(v.literal("AND"), v.literal("OR"))),
|
|
85
|
+
});
|
|
74
86
|
|
|
75
87
|
export type EventFunction<T extends DefaultFunctionArgs> = FunctionReference<
|
|
76
88
|
"mutation",
|
|
@@ -78,330 +90,562 @@ export type EventFunction<T extends DefaultFunctionArgs> = FunctionReference<
|
|
|
78
90
|
T
|
|
79
91
|
>;
|
|
80
92
|
|
|
93
|
+
export type GenericCtx<DataModel extends GenericDataModel = GenericDataModel> =
|
|
94
|
+
| GenericQueryCtx<DataModel>
|
|
95
|
+
| GenericMutationCtx<DataModel>
|
|
96
|
+
| GenericActionCtx<DataModel>;
|
|
97
|
+
|
|
81
98
|
export type AuthFunctions = {
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
Infer<typeof createPermissiveArgsValidator>
|
|
86
|
-
>;
|
|
87
|
-
deleteUser: FunctionReference<
|
|
88
|
-
"mutation",
|
|
89
|
-
"internal",
|
|
90
|
-
Infer<typeof adapterArgsValidator>
|
|
91
|
-
>;
|
|
92
|
-
updateUser: FunctionReference<
|
|
93
|
-
"mutation",
|
|
94
|
-
"internal",
|
|
95
|
-
Infer<typeof updateUserArgsValidator>
|
|
96
|
-
>;
|
|
97
|
-
createSession: FunctionReference<
|
|
98
|
-
"mutation",
|
|
99
|
-
"internal",
|
|
100
|
-
Infer<typeof createSessionArgsValidator>
|
|
101
|
-
>;
|
|
99
|
+
onCreate?: FunctionReference<"mutation", "internal", { [key: string]: any }>;
|
|
100
|
+
onUpdate?: FunctionReference<"mutation", "internal", { [key: string]: any }>;
|
|
101
|
+
onDelete?: FunctionReference<"mutation", "internal", { [key: string]: any }>;
|
|
102
102
|
};
|
|
103
103
|
|
|
104
|
-
export
|
|
105
|
-
|
|
106
|
-
|
|
104
|
+
export const createApi = <
|
|
105
|
+
DataModel extends GenericDataModel,
|
|
106
|
+
Schema extends SchemaDefinition<any, any>,
|
|
107
|
+
>(
|
|
108
|
+
schema: Schema,
|
|
109
|
+
createAuth: (ctx: GenericCtx<DataModel>) => ReturnType<typeof betterAuth>
|
|
110
|
+
) => {
|
|
111
|
+
const betterAuthSchema = getAuthTables(createAuth({} as any)!.options);
|
|
112
|
+
return {
|
|
113
|
+
create: mutationGeneric({
|
|
114
|
+
args: {
|
|
115
|
+
input: v.union(
|
|
116
|
+
...Object.entries(schema.tables).map(([model, table]) =>
|
|
117
|
+
v.object({
|
|
118
|
+
model: v.literal(model),
|
|
119
|
+
data: v.object((table as any).validator.fields),
|
|
120
|
+
})
|
|
121
|
+
)
|
|
122
|
+
),
|
|
123
|
+
select: v.optional(v.array(v.string())),
|
|
124
|
+
onCreateHandle: v.optional(v.string()),
|
|
125
|
+
},
|
|
126
|
+
handler: async (ctx, args) => {
|
|
127
|
+
await checkUniqueFields(
|
|
128
|
+
ctx,
|
|
129
|
+
schema,
|
|
130
|
+
betterAuthSchema,
|
|
131
|
+
args.input.model,
|
|
132
|
+
args.input.data
|
|
133
|
+
);
|
|
134
|
+
const id = await ctx.db.insert(
|
|
135
|
+
args.input.model as any,
|
|
136
|
+
args.input.data
|
|
137
|
+
);
|
|
138
|
+
const doc = await ctx.db.get(id);
|
|
139
|
+
if (!doc) {
|
|
140
|
+
throw new Error(`Failed to create ${args.input.model}`);
|
|
141
|
+
}
|
|
142
|
+
const result = selectFields(doc, args.select);
|
|
143
|
+
if (args.onCreateHandle) {
|
|
144
|
+
await ctx.runMutation(
|
|
145
|
+
args.onCreateHandle as FunctionHandle<"mutation">,
|
|
146
|
+
{
|
|
147
|
+
model: args.input.model,
|
|
148
|
+
doc,
|
|
149
|
+
}
|
|
150
|
+
);
|
|
151
|
+
}
|
|
152
|
+
return result;
|
|
153
|
+
},
|
|
154
|
+
}),
|
|
155
|
+
findOne: queryGeneric({
|
|
156
|
+
args: {
|
|
157
|
+
model: v.union(
|
|
158
|
+
...Object.keys(schema.tables).map((model) => v.literal(model))
|
|
159
|
+
),
|
|
160
|
+
where: v.optional(v.array(adapterWhereValidator)),
|
|
161
|
+
select: v.optional(v.array(v.string())),
|
|
162
|
+
},
|
|
163
|
+
handler: async (ctx, args) => {
|
|
164
|
+
return await listOne(ctx, schema, betterAuthSchema, args);
|
|
165
|
+
},
|
|
166
|
+
}),
|
|
167
|
+
findMany: queryGeneric({
|
|
168
|
+
args: {
|
|
169
|
+
model: v.union(
|
|
170
|
+
...Object.keys(schema.tables).map((model) => v.literal(model))
|
|
171
|
+
),
|
|
172
|
+
where: v.optional(v.array(adapterWhereValidator)),
|
|
173
|
+
limit: v.optional(v.number()),
|
|
174
|
+
sortBy: v.optional(
|
|
175
|
+
v.object({
|
|
176
|
+
direction: v.union(v.literal("asc"), v.literal("desc")),
|
|
177
|
+
field: v.string(),
|
|
178
|
+
})
|
|
179
|
+
),
|
|
180
|
+
offset: v.optional(v.number()),
|
|
181
|
+
paginationOpts: paginationOptsValidator,
|
|
182
|
+
},
|
|
183
|
+
handler: async (ctx, args) => {
|
|
184
|
+
return await paginate(ctx, schema, betterAuthSchema, args);
|
|
185
|
+
},
|
|
186
|
+
}),
|
|
187
|
+
updateOne: mutationGeneric({
|
|
188
|
+
args: {
|
|
189
|
+
input: v.union(
|
|
190
|
+
...Object.entries(schema.tables).map(
|
|
191
|
+
([tableName, table]: [string, Schema["tables"][string]]) => {
|
|
192
|
+
const fields = partial(table.validator.fields);
|
|
193
|
+
return v.object({
|
|
194
|
+
model: v.literal(tableName),
|
|
195
|
+
update: v.object(fields),
|
|
196
|
+
where: v.optional(v.array(whereValidator(schema, tableName))),
|
|
197
|
+
});
|
|
198
|
+
}
|
|
199
|
+
)
|
|
200
|
+
),
|
|
201
|
+
onUpdateHandle: v.optional(v.string()),
|
|
202
|
+
},
|
|
203
|
+
handler: async (ctx, args) => {
|
|
204
|
+
const doc = await listOne(ctx, schema, betterAuthSchema, args.input);
|
|
205
|
+
if (!doc) {
|
|
206
|
+
throw new Error(`Failed to update ${args.input.model}`);
|
|
207
|
+
}
|
|
208
|
+
await checkUniqueFields(
|
|
209
|
+
ctx,
|
|
210
|
+
schema,
|
|
211
|
+
betterAuthSchema,
|
|
212
|
+
args.input.model,
|
|
213
|
+
args.input.update,
|
|
214
|
+
doc
|
|
215
|
+
);
|
|
216
|
+
await ctx.db.patch(
|
|
217
|
+
doc._id as GenericId<string>,
|
|
218
|
+
args.input.update as any
|
|
219
|
+
);
|
|
220
|
+
const updatedDoc = await ctx.db.get(doc._id as GenericId<string>);
|
|
221
|
+
if (!updatedDoc) {
|
|
222
|
+
throw new Error(`Failed to update ${args.input.model}`);
|
|
223
|
+
}
|
|
224
|
+
if (args.onUpdateHandle) {
|
|
225
|
+
await ctx.runMutation(
|
|
226
|
+
args.onUpdateHandle as FunctionHandle<"mutation">,
|
|
227
|
+
{
|
|
228
|
+
input: {
|
|
229
|
+
model: args.input.model,
|
|
230
|
+
oldDoc: doc,
|
|
231
|
+
newDoc: updatedDoc,
|
|
232
|
+
},
|
|
233
|
+
}
|
|
234
|
+
);
|
|
235
|
+
}
|
|
236
|
+
return updatedDoc;
|
|
237
|
+
},
|
|
238
|
+
}),
|
|
239
|
+
updateMany: mutationGeneric({
|
|
240
|
+
args: {
|
|
241
|
+
input: v.union(
|
|
242
|
+
...Object.entries(schema.tables).map(
|
|
243
|
+
([tableName, table]: [string, Schema["tables"][string]]) => {
|
|
244
|
+
const fields = partial(table.validator.fields);
|
|
245
|
+
return v.object({
|
|
246
|
+
model: v.literal(tableName),
|
|
247
|
+
update: v.object(fields),
|
|
248
|
+
where: v.optional(v.array(whereValidator(schema, tableName))),
|
|
249
|
+
});
|
|
250
|
+
}
|
|
251
|
+
)
|
|
252
|
+
),
|
|
253
|
+
paginationOpts: paginationOptsValidator,
|
|
254
|
+
onUpdateHandle: v.optional(v.string()),
|
|
255
|
+
},
|
|
256
|
+
handler: async (ctx, args) => {
|
|
257
|
+
const { page, ...result } = await paginate(
|
|
258
|
+
ctx,
|
|
259
|
+
schema,
|
|
260
|
+
betterAuthSchema,
|
|
261
|
+
{
|
|
262
|
+
...args.input,
|
|
263
|
+
paginationOpts: args.paginationOpts,
|
|
264
|
+
}
|
|
265
|
+
);
|
|
266
|
+
if (args.input.update) {
|
|
267
|
+
if (
|
|
268
|
+
hasUniqueFields(
|
|
269
|
+
betterAuthSchema,
|
|
270
|
+
args.input.model,
|
|
271
|
+
args.input.update ?? {}
|
|
272
|
+
) &&
|
|
273
|
+
page.length > 1
|
|
274
|
+
) {
|
|
275
|
+
throw new Error(
|
|
276
|
+
`Attempted to set unique fields in multiple documents in ${args.input.model} with the same value. Fields: ${Object.keys(args.input.update ?? {}).join(", ")}`
|
|
277
|
+
);
|
|
278
|
+
}
|
|
279
|
+
await asyncMap(page, async (doc) => {
|
|
280
|
+
await checkUniqueFields(
|
|
281
|
+
ctx,
|
|
282
|
+
schema,
|
|
283
|
+
betterAuthSchema,
|
|
284
|
+
args.input.model,
|
|
285
|
+
args.input.update ?? {},
|
|
286
|
+
doc
|
|
287
|
+
);
|
|
288
|
+
await ctx.db.patch(
|
|
289
|
+
doc._id as GenericId<string>,
|
|
290
|
+
args.input.update as any
|
|
291
|
+
);
|
|
107
292
|
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
293
|
+
if (args.onUpdateHandle) {
|
|
294
|
+
await ctx.runMutation(
|
|
295
|
+
args.onUpdateHandle as FunctionHandle<"mutation">,
|
|
296
|
+
{
|
|
297
|
+
model: args.input.model,
|
|
298
|
+
oldDoc: doc,
|
|
299
|
+
newDoc: await ctx.db.get(doc._id as GenericId<string>),
|
|
300
|
+
}
|
|
301
|
+
);
|
|
302
|
+
}
|
|
303
|
+
});
|
|
304
|
+
}
|
|
305
|
+
return {
|
|
306
|
+
...result,
|
|
307
|
+
count: page.length,
|
|
308
|
+
ids: page.map((doc) => doc._id),
|
|
309
|
+
};
|
|
310
|
+
},
|
|
311
|
+
}),
|
|
312
|
+
deleteOne: mutationGeneric({
|
|
313
|
+
args: {
|
|
314
|
+
input: v.union(
|
|
315
|
+
...Object.keys(schema.tables).map((tableName: string) => {
|
|
316
|
+
return v.object({
|
|
317
|
+
model: v.literal(tableName),
|
|
318
|
+
where: v.optional(v.array(whereValidator(schema, tableName))),
|
|
319
|
+
});
|
|
320
|
+
})
|
|
321
|
+
),
|
|
322
|
+
onDeleteHandle: v.optional(v.string()),
|
|
323
|
+
},
|
|
324
|
+
handler: async (ctx, args) => {
|
|
325
|
+
const doc = await listOne(ctx, schema, betterAuthSchema, args.input);
|
|
326
|
+
if (!doc) {
|
|
327
|
+
return;
|
|
328
|
+
}
|
|
329
|
+
await ctx.db.delete(doc._id as GenericId<string>);
|
|
330
|
+
if (args.onDeleteHandle) {
|
|
331
|
+
await ctx.runMutation(
|
|
332
|
+
args.onDeleteHandle as FunctionHandle<"mutation">,
|
|
333
|
+
{ model: args.input.model, doc }
|
|
334
|
+
);
|
|
335
|
+
}
|
|
336
|
+
return doc;
|
|
337
|
+
},
|
|
338
|
+
}),
|
|
339
|
+
deleteMany: mutationGeneric({
|
|
340
|
+
args: {
|
|
341
|
+
input: v.union(
|
|
342
|
+
...Object.keys(schema.tables).map((tableName: string) => {
|
|
343
|
+
return v.object({
|
|
344
|
+
model: v.literal(tableName),
|
|
345
|
+
where: v.optional(v.array(whereValidator(schema, tableName))),
|
|
346
|
+
});
|
|
347
|
+
})
|
|
348
|
+
),
|
|
349
|
+
paginationOpts: paginationOptsValidator,
|
|
350
|
+
onDeleteHandle: v.optional(v.string()),
|
|
351
|
+
},
|
|
352
|
+
handler: async (ctx, args) => {
|
|
353
|
+
const { page, ...result } = await paginate(
|
|
354
|
+
ctx,
|
|
355
|
+
schema,
|
|
356
|
+
betterAuthSchema,
|
|
357
|
+
{
|
|
358
|
+
...args.input,
|
|
359
|
+
paginationOpts: args.paginationOpts,
|
|
360
|
+
}
|
|
361
|
+
);
|
|
362
|
+
await asyncMap(page, async (doc) => {
|
|
363
|
+
if (args.onDeleteHandle) {
|
|
364
|
+
await ctx.runMutation(
|
|
365
|
+
args.onDeleteHandle as FunctionHandle<"mutation">,
|
|
366
|
+
{
|
|
367
|
+
model: args.input.model,
|
|
368
|
+
doc,
|
|
369
|
+
}
|
|
370
|
+
);
|
|
371
|
+
}
|
|
372
|
+
await ctx.db.delete(doc._id as GenericId<string>);
|
|
373
|
+
});
|
|
374
|
+
return {
|
|
375
|
+
...result,
|
|
376
|
+
count: page.length,
|
|
377
|
+
ids: page.map((doc) => doc._id),
|
|
378
|
+
};
|
|
379
|
+
},
|
|
380
|
+
}),
|
|
381
|
+
};
|
|
382
|
+
};
|
|
117
383
|
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
384
|
+
export type Triggers<
|
|
385
|
+
DataModel extends GenericDataModel,
|
|
386
|
+
Schema extends SchemaDefinition<any, any>,
|
|
387
|
+
> = {
|
|
388
|
+
[K in keyof Schema["tables"]]?: {
|
|
389
|
+
onCreate?: <Ctx extends GenericMutationCtx<DataModel>>(
|
|
390
|
+
ctx: Ctx,
|
|
391
|
+
doc: Infer<Schema["tables"][K]["validator"]> & {
|
|
392
|
+
_id: string;
|
|
393
|
+
_creationTime: number;
|
|
394
|
+
}
|
|
395
|
+
) => Promise<void>;
|
|
396
|
+
onUpdate?: <Ctx extends GenericMutationCtx<DataModel>>(
|
|
397
|
+
ctx: Ctx,
|
|
398
|
+
oldDoc: Infer<Schema["tables"][K]["validator"]> & {
|
|
399
|
+
_id: string;
|
|
400
|
+
_creationTime: number;
|
|
401
|
+
},
|
|
402
|
+
newDoc: Infer<Schema["tables"][K]["validator"]> & {
|
|
403
|
+
_id: string;
|
|
404
|
+
_creationTime: number;
|
|
405
|
+
}
|
|
406
|
+
) => Promise<void>;
|
|
407
|
+
onDelete?: <Ctx extends GenericMutationCtx<DataModel>>(
|
|
408
|
+
ctx: Ctx,
|
|
409
|
+
doc: Infer<Schema["tables"][K]["validator"]> & {
|
|
410
|
+
_id: string;
|
|
411
|
+
_creationTime: number;
|
|
412
|
+
}
|
|
413
|
+
) => Promise<void>;
|
|
414
|
+
};
|
|
415
|
+
};
|
|
130
416
|
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
417
|
+
export const createClient = <
|
|
418
|
+
DataModel extends GenericDataModel,
|
|
419
|
+
Schema extends SchemaDefinition<GenericSchema, true> = typeof defaultSchema,
|
|
420
|
+
>(
|
|
421
|
+
component: UseApi<typeof api>,
|
|
422
|
+
config?: {
|
|
423
|
+
local?: {
|
|
424
|
+
schema?: Schema;
|
|
425
|
+
};
|
|
426
|
+
authFunctions?: AuthFunctions;
|
|
427
|
+
verbose?: boolean;
|
|
428
|
+
triggers?: Triggers<DataModel, Schema>;
|
|
137
429
|
}
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
async getAuthUserId(ctx: RunQueryCtx & { auth: ConvexAuth }) {
|
|
430
|
+
) => {
|
|
431
|
+
const safeGetAuthUser = async (ctx: GenericQueryCtx<DataModel>) => {
|
|
141
432
|
const identity = await ctx.auth.getUserIdentity();
|
|
142
433
|
if (!identity) {
|
|
143
|
-
return
|
|
434
|
+
return;
|
|
144
435
|
}
|
|
145
|
-
return identity.subject as UserId;
|
|
146
|
-
}
|
|
147
436
|
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
const
|
|
151
|
-
if (!identity) {
|
|
152
|
-
return null;
|
|
153
|
-
}
|
|
154
|
-
const doc:
|
|
155
|
-
| null
|
|
156
|
-
| (Infer<typeof schema.tables.user.validator> & {
|
|
157
|
-
_id: string;
|
|
158
|
-
_creationTime: number;
|
|
159
|
-
}) = await ctx.runQuery(this.component.lib.findOne, {
|
|
437
|
+
type BetterAuthDataModel = DataModelFromSchemaDefinition<Schema>;
|
|
438
|
+
|
|
439
|
+
const doc = (await ctx.runQuery(component.adapter.findOne, {
|
|
160
440
|
model: "user",
|
|
161
441
|
where: [
|
|
162
442
|
{
|
|
163
|
-
field: "
|
|
443
|
+
field: "id",
|
|
164
444
|
value: identity.subject,
|
|
165
445
|
},
|
|
166
446
|
],
|
|
167
|
-
});
|
|
447
|
+
})) as BetterAuthDataModel["user"]["document"] | null;
|
|
168
448
|
if (!doc) {
|
|
169
|
-
return
|
|
170
|
-
}
|
|
171
|
-
// Type narrowing
|
|
172
|
-
if (!("emailVerified" in doc)) {
|
|
173
|
-
throw new Error("invalid user");
|
|
449
|
+
return;
|
|
174
450
|
}
|
|
175
|
-
return
|
|
176
|
-
}
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
451
|
+
return doc;
|
|
452
|
+
};
|
|
453
|
+
return {
|
|
454
|
+
component,
|
|
455
|
+
adapter: (ctx: GenericCtx<DataModel>) =>
|
|
456
|
+
convexAdapter<DataModel, typeof ctx, Schema>(ctx, component, config),
|
|
457
|
+
getHeaders: async (ctx: RunQueryCtx & { auth: ConvexAuth }) => {
|
|
458
|
+
const identity = await ctx.auth.getUserIdentity();
|
|
459
|
+
if (!identity) {
|
|
460
|
+
return;
|
|
461
|
+
}
|
|
462
|
+
const session = await ctx.runQuery(component.adapter.findOne, {
|
|
463
|
+
model: "session",
|
|
464
|
+
where: [
|
|
465
|
+
{
|
|
466
|
+
field: "userId",
|
|
467
|
+
value: identity.subject,
|
|
468
|
+
},
|
|
469
|
+
],
|
|
470
|
+
});
|
|
471
|
+
return new Headers({
|
|
472
|
+
...(session?.token ? { authorization: `Bearer ${session.token}` } : {}),
|
|
473
|
+
...(session?.ipAddress
|
|
474
|
+
? { "x-forwarded-for": session.ipAddress as string }
|
|
475
|
+
: {}),
|
|
476
|
+
});
|
|
477
|
+
},
|
|
186
478
|
|
|
187
|
-
|
|
188
|
-
ctx: GenericMutationCtx<GenericDataModel>,
|
|
189
|
-
userId: UserId,
|
|
190
|
-
metadata: Omit<
|
|
191
|
-
Partial<Infer<typeof schema.tables.user.validator>>,
|
|
192
|
-
"userId"
|
|
193
|
-
>
|
|
194
|
-
) {
|
|
195
|
-
return ctx.runMutation(this.component.lib.updateOne, {
|
|
196
|
-
input: {
|
|
197
|
-
model: "user",
|
|
198
|
-
where: [{ field: "userId", value: userId }],
|
|
199
|
-
update: metadata,
|
|
200
|
-
},
|
|
201
|
-
});
|
|
202
|
-
}
|
|
479
|
+
safeGetAuthUser,
|
|
203
480
|
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
_id: string;
|
|
212
|
-
_creationTime: number;
|
|
213
|
-
}) = await ctx.runQuery(this.component.lib.findOne, {
|
|
214
|
-
model: "user",
|
|
215
|
-
where: [{ field: "username", value: username }],
|
|
216
|
-
});
|
|
217
|
-
if (!user) {
|
|
218
|
-
return null;
|
|
219
|
-
}
|
|
220
|
-
return omit(user, ["_id", "_creationTime"]);
|
|
221
|
-
}
|
|
481
|
+
getAuthUser: async (ctx: GenericQueryCtx<DataModel>) => {
|
|
482
|
+
const user = await safeGetAuthUser(ctx);
|
|
483
|
+
if (!user) {
|
|
484
|
+
throw new Error("Unauthenticated");
|
|
485
|
+
}
|
|
486
|
+
return user;
|
|
487
|
+
},
|
|
222
488
|
|
|
223
|
-
|
|
224
|
-
onCreateUser
|
|
225
|
-
|
|
226
|
-
user: Infer<typeof createUserValidator>
|
|
227
|
-
) => Promise<UserId>;
|
|
228
|
-
onDeleteUser?: (
|
|
229
|
-
ctx: GenericMutationCtx<DataModel>,
|
|
230
|
-
id: UserId
|
|
231
|
-
) => void | Promise<void>;
|
|
232
|
-
onUpdateUser?: (
|
|
233
|
-
ctx: GenericMutationCtx<DataModel>,
|
|
234
|
-
user: Infer<typeof schema.tables.user.validator>
|
|
235
|
-
) => void | Promise<void>;
|
|
236
|
-
onCreateSession?: (
|
|
489
|
+
// Replaces 0.7 behavior of returning a new user id from
|
|
490
|
+
// onCreateUser
|
|
491
|
+
setUserId: async (
|
|
237
492
|
ctx: GenericMutationCtx<DataModel>,
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
return identity !== null;
|
|
493
|
+
authId: string,
|
|
494
|
+
userId: string
|
|
495
|
+
) => {
|
|
496
|
+
await ctx.runMutation(component.adapter.updateOne, {
|
|
497
|
+
input: {
|
|
498
|
+
model: "user",
|
|
499
|
+
where: [{ field: "id", value: authId }],
|
|
500
|
+
update: { userId },
|
|
247
501
|
},
|
|
248
|
-
})
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
...parsedArgs.input,
|
|
257
|
-
data: { ...parsedArgs.input.data, userId },
|
|
258
|
-
},
|
|
259
|
-
});
|
|
502
|
+
});
|
|
503
|
+
},
|
|
504
|
+
|
|
505
|
+
triggersApi: () => ({
|
|
506
|
+
onCreate: internalMutationGeneric({
|
|
507
|
+
args: {
|
|
508
|
+
doc: v.any(),
|
|
509
|
+
model: v.string(),
|
|
260
510
|
},
|
|
261
|
-
}),
|
|
262
|
-
deleteUser: internalMutationGeneric({
|
|
263
|
-
args: adapterArgsValidator,
|
|
264
511
|
handler: async (ctx, args) => {
|
|
265
|
-
|
|
266
|
-
if (doc && opts.onDeleteUser) {
|
|
267
|
-
await opts.onDeleteUser(ctx, doc.userId as UserId);
|
|
268
|
-
}
|
|
269
|
-
return doc;
|
|
512
|
+
await config?.triggers?.[args.model]?.onCreate?.(ctx, args.doc);
|
|
270
513
|
},
|
|
271
514
|
}),
|
|
272
|
-
|
|
273
|
-
args:
|
|
515
|
+
onUpdate: internalMutationGeneric({
|
|
516
|
+
args: {
|
|
517
|
+
oldDoc: v.any(),
|
|
518
|
+
newDoc: v.any(),
|
|
519
|
+
model: v.string(),
|
|
520
|
+
},
|
|
274
521
|
handler: async (ctx, args) => {
|
|
275
|
-
|
|
276
|
-
|
|
277
|
-
|
|
522
|
+
await config?.triggers?.[args.model]?.onUpdate?.(
|
|
523
|
+
ctx,
|
|
524
|
+
args.oldDoc,
|
|
525
|
+
args.newDoc
|
|
278
526
|
);
|
|
279
|
-
// Type narrowing
|
|
280
|
-
if (!("emailVerified" in updatedUser)) {
|
|
281
|
-
throw new Error("invalid user");
|
|
282
|
-
}
|
|
283
|
-
if (opts.onUpdateUser) {
|
|
284
|
-
await opts.onUpdateUser(ctx, omit(updatedUser, ["_id"]));
|
|
285
|
-
}
|
|
286
|
-
return updatedUser;
|
|
287
527
|
},
|
|
288
528
|
}),
|
|
289
|
-
|
|
290
|
-
args:
|
|
529
|
+
onDelete: internalMutationGeneric({
|
|
530
|
+
args: {
|
|
531
|
+
doc: v.any(),
|
|
532
|
+
model: v.string(),
|
|
533
|
+
},
|
|
291
534
|
handler: async (ctx, args) => {
|
|
292
|
-
|
|
293
|
-
input: args.input,
|
|
294
|
-
});
|
|
295
|
-
await opts.onCreateSession?.(ctx, session);
|
|
296
|
-
return session;
|
|
535
|
+
await config?.triggers?.[args.model]?.onDelete?.(ctx, args.doc);
|
|
297
536
|
},
|
|
298
537
|
}),
|
|
299
|
-
}
|
|
300
|
-
}
|
|
538
|
+
}),
|
|
301
539
|
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
307
|
-
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
|
|
313
|
-
|
|
314
|
-
|
|
315
|
-
|
|
316
|
-
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
|
|
326
|
-
|
|
540
|
+
registerRoutes: (
|
|
541
|
+
http: HttpRouter,
|
|
542
|
+
createAuth: (ctx: GenericCtx<DataModel>) => ReturnType<typeof betterAuth>,
|
|
543
|
+
opts: {
|
|
544
|
+
cors?:
|
|
545
|
+
| boolean
|
|
546
|
+
| {
|
|
547
|
+
// These values are appended to the default values
|
|
548
|
+
allowedOrigins?: string[];
|
|
549
|
+
allowedHeaders?: string[];
|
|
550
|
+
exposedHeaders?: string[];
|
|
551
|
+
};
|
|
552
|
+
} = {}
|
|
553
|
+
) => {
|
|
554
|
+
const authDummy = createAuth({} as any);
|
|
555
|
+
const path = authDummy.options.basePath ?? "/api/auth";
|
|
556
|
+
const authRequestHandler = httpActionGeneric(async (ctx, request) => {
|
|
557
|
+
if (config?.verbose) {
|
|
558
|
+
console.log("options.baseURL", authDummy.options.baseURL);
|
|
559
|
+
console.log("request headers", request.headers);
|
|
560
|
+
}
|
|
561
|
+
const auth = createAuth(ctx as any);
|
|
562
|
+
const response = await auth.handler(request);
|
|
563
|
+
if (config?.verbose) {
|
|
564
|
+
console.log("response headers", response.headers);
|
|
565
|
+
}
|
|
566
|
+
return response;
|
|
567
|
+
});
|
|
568
|
+
const wellKnown = http.lookup("/.well-known/openid-configuration", "GET");
|
|
569
|
+
|
|
570
|
+
// If registerRoutes is used multiple times, this may already be defined
|
|
571
|
+
if (!wellKnown) {
|
|
572
|
+
// Redirect root well-known to api well-known
|
|
573
|
+
http.route({
|
|
574
|
+
path: "/.well-known/openid-configuration",
|
|
575
|
+
method: "GET",
|
|
576
|
+
handler: httpActionGeneric(async () => {
|
|
577
|
+
const url = `${requireEnv("CONVEX_SITE_URL")}${path}/convex/.well-known/openid-configuration`;
|
|
578
|
+
return Response.redirect(url);
|
|
579
|
+
}),
|
|
580
|
+
});
|
|
327
581
|
}
|
|
328
|
-
return response;
|
|
329
|
-
});
|
|
330
582
|
|
|
331
|
-
|
|
583
|
+
if (!opts.cors) {
|
|
584
|
+
http.route({
|
|
585
|
+
pathPrefix: `${path}/`,
|
|
586
|
+
method: "GET",
|
|
587
|
+
handler: authRequestHandler,
|
|
588
|
+
});
|
|
332
589
|
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
|
|
340
|
-
|
|
341
|
-
|
|
342
|
-
|
|
590
|
+
http.route({
|
|
591
|
+
pathPrefix: `${path}/`,
|
|
592
|
+
method: "POST",
|
|
593
|
+
handler: authRequestHandler,
|
|
594
|
+
});
|
|
595
|
+
|
|
596
|
+
return;
|
|
597
|
+
}
|
|
598
|
+
const corsOpts =
|
|
599
|
+
typeof opts.cors === "boolean"
|
|
600
|
+
? { allowedOrigins: [], allowedHeaders: [], exposedHeaders: [] }
|
|
601
|
+
: opts.cors;
|
|
602
|
+
let trustedOriginsOption:
|
|
603
|
+
| string[]
|
|
604
|
+
| ((request: Request) => string[] | Promise<string[]>)
|
|
605
|
+
| undefined;
|
|
606
|
+
const cors = corsRouter(http, {
|
|
607
|
+
allowedOrigins: async (request) => {
|
|
608
|
+
trustedOriginsOption =
|
|
609
|
+
trustedOriginsOption ??
|
|
610
|
+
(await authDummy.$context).options.trustedOrigins ??
|
|
611
|
+
[];
|
|
612
|
+
const trustedOrigins = Array.isArray(trustedOriginsOption)
|
|
613
|
+
? trustedOriginsOption
|
|
614
|
+
: await trustedOriginsOption(request);
|
|
615
|
+
return trustedOrigins
|
|
616
|
+
.map((origin) =>
|
|
617
|
+
// Strip trailing wildcards, unsupported for allowedOrigins
|
|
618
|
+
origin.endsWith("*") && origin.length > 1
|
|
619
|
+
? origin.slice(0, -1)
|
|
620
|
+
: origin
|
|
621
|
+
)
|
|
622
|
+
.concat(corsOpts.allowedOrigins ?? []);
|
|
623
|
+
},
|
|
624
|
+
allowCredentials: true,
|
|
625
|
+
allowedHeaders: ["Content-Type", "Better-Auth-Cookie"].concat(
|
|
626
|
+
corsOpts.allowedHeaders ?? []
|
|
627
|
+
),
|
|
628
|
+
exposedHeaders: ["Set-Better-Auth-Cookie"].concat(
|
|
629
|
+
corsOpts.exposedHeaders ?? []
|
|
630
|
+
),
|
|
631
|
+
debug: config?.verbose,
|
|
632
|
+
enforceAllowOrigins: false,
|
|
343
633
|
});
|
|
344
|
-
}
|
|
345
634
|
|
|
346
|
-
|
|
347
|
-
http.route({
|
|
635
|
+
cors.route({
|
|
348
636
|
pathPrefix: `${path}/`,
|
|
349
637
|
method: "GET",
|
|
350
638
|
handler: authRequestHandler,
|
|
351
639
|
});
|
|
352
640
|
|
|
353
|
-
|
|
641
|
+
cors.route({
|
|
354
642
|
pathPrefix: `${path}/`,
|
|
355
643
|
method: "POST",
|
|
356
644
|
handler: authRequestHandler,
|
|
357
645
|
});
|
|
358
|
-
|
|
359
|
-
|
|
360
|
-
|
|
361
|
-
const corsOpts =
|
|
362
|
-
typeof opts.cors === "boolean"
|
|
363
|
-
? { allowedOrigins: [], allowedHeaders: [], exposedHeaders: [] }
|
|
364
|
-
: opts.cors;
|
|
365
|
-
const cors = corsRouter(http, {
|
|
366
|
-
allowedOrigins: async (request) => {
|
|
367
|
-
const trustedOriginsOption =
|
|
368
|
-
(await createAuth({} as any).$context).options.trustedOrigins ?? [];
|
|
369
|
-
const trustedOrigins = Array.isArray(trustedOriginsOption)
|
|
370
|
-
? trustedOriginsOption
|
|
371
|
-
: await trustedOriginsOption(request);
|
|
372
|
-
return trustedOrigins
|
|
373
|
-
.map((origin) =>
|
|
374
|
-
// Strip trailing wildcards, unsupported for allowedOrigins
|
|
375
|
-
origin.endsWith("*") && origin.length > 1
|
|
376
|
-
? origin.slice(0, -1)
|
|
377
|
-
: origin
|
|
378
|
-
)
|
|
379
|
-
.concat(corsOpts.allowedOrigins ?? []);
|
|
380
|
-
},
|
|
381
|
-
allowCredentials: true,
|
|
382
|
-
allowedHeaders: ["Content-Type", "Better-Auth-Cookie"].concat(
|
|
383
|
-
corsOpts.allowedHeaders ?? []
|
|
384
|
-
),
|
|
385
|
-
exposedHeaders: ["Set-Better-Auth-Cookie"].concat(
|
|
386
|
-
corsOpts.exposedHeaders ?? []
|
|
387
|
-
),
|
|
388
|
-
debug: this.config?.verbose,
|
|
389
|
-
enforceAllowOrigins: false,
|
|
390
|
-
});
|
|
391
|
-
|
|
392
|
-
cors.route({
|
|
393
|
-
pathPrefix: `${path}/`,
|
|
394
|
-
method: "GET",
|
|
395
|
-
handler: authRequestHandler,
|
|
396
|
-
});
|
|
397
|
-
|
|
398
|
-
cors.route({
|
|
399
|
-
pathPrefix: `${path}/`,
|
|
400
|
-
method: "POST",
|
|
401
|
-
handler: authRequestHandler,
|
|
402
|
-
});
|
|
403
|
-
}
|
|
404
|
-
}
|
|
646
|
+
},
|
|
647
|
+
};
|
|
648
|
+
};
|
|
405
649
|
|
|
406
650
|
/* Type utils follow */
|
|
407
651
|
|