@convex-dev/better-auth 0.8.0-alpha.9 → 0.8.1
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 +337 -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 +42 -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 +337 -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 +42 -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 +558 -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
|
@@ -1,29 +1,22 @@
|
|
|
1
|
-
import { BetterAuthOptions } from "better-auth/types";
|
|
2
|
-
import { z } from "zod";
|
|
3
1
|
export declare const JWT_COOKIE_NAME = "convex_jwt";
|
|
4
|
-
export declare const convex:
|
|
2
|
+
export declare const convex: (opts?: {
|
|
5
3
|
jwtExpirationSeconds?: number;
|
|
6
4
|
deleteExpiredSessionsOnLogin?: boolean;
|
|
7
|
-
options?:
|
|
5
|
+
options?: {
|
|
6
|
+
basePath?: string;
|
|
7
|
+
};
|
|
8
8
|
}) => {
|
|
9
9
|
id: "convex";
|
|
10
|
+
init: ({ logger, options }: import("better-auth").AuthContext) => void;
|
|
10
11
|
hooks: {
|
|
11
|
-
before:
|
|
12
|
+
before: {
|
|
12
13
|
matcher(context: import("better-auth").HookEndpointContext): boolean;
|
|
13
14
|
handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
|
|
14
15
|
context: {
|
|
15
16
|
headers: Headers;
|
|
16
17
|
};
|
|
17
18
|
} | undefined>;
|
|
18
|
-
}
|
|
19
|
-
matcher: (ctx: import("better-auth").HookEndpointContext) => boolean;
|
|
20
|
-
handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<{
|
|
21
|
-
context: import("better-call").MiddlewareContext<import("better-call").MiddlewareOptions, import("better-auth").AuthContext & {
|
|
22
|
-
returned?: unknown;
|
|
23
|
-
responseHeaders?: Headers;
|
|
24
|
-
}>;
|
|
25
|
-
}>;
|
|
26
|
-
})[];
|
|
19
|
+
}[];
|
|
27
20
|
after: ({
|
|
28
21
|
matcher(): true;
|
|
29
22
|
handler: (inputContext: import("better-call").MiddlewareInputContext<import("better-call").MiddlewareOptions>) => Promise<Response | {
|
|
@@ -36,126 +29,6 @@ export declare const convex: <O extends BetterAuthOptions>(opts?: {
|
|
|
36
29
|
})[];
|
|
37
30
|
};
|
|
38
31
|
endpoints: {
|
|
39
|
-
getSession: {
|
|
40
|
-
<AsResponse extends boolean = false, ReturnHeaders extends boolean = false>(inputCtx_0: {
|
|
41
|
-
body?: undefined;
|
|
42
|
-
} & {
|
|
43
|
-
method?: "GET" | undefined;
|
|
44
|
-
} & {
|
|
45
|
-
query?: {
|
|
46
|
-
disableCookieCache?: string | boolean | undefined;
|
|
47
|
-
disableRefresh?: boolean | undefined;
|
|
48
|
-
} | undefined;
|
|
49
|
-
} & {
|
|
50
|
-
params?: Record<string, any>;
|
|
51
|
-
} & {
|
|
52
|
-
request?: Request;
|
|
53
|
-
} & {
|
|
54
|
-
headers: HeadersInit;
|
|
55
|
-
} & {
|
|
56
|
-
asResponse?: boolean;
|
|
57
|
-
returnHeaders?: boolean;
|
|
58
|
-
use?: import("better-call").Middleware[];
|
|
59
|
-
path?: string;
|
|
60
|
-
} & {
|
|
61
|
-
asResponse?: AsResponse | undefined;
|
|
62
|
-
returnHeaders?: ReturnHeaders | undefined;
|
|
63
|
-
}): Promise<[AsResponse] extends [true] ? Response : [ReturnHeaders] extends [true] ? {
|
|
64
|
-
headers: Headers;
|
|
65
|
-
response: {
|
|
66
|
-
user: Omit<import("better-auth").UnionToIntersection<import("better-auth").StripEmptyObjects<{
|
|
67
|
-
id: string;
|
|
68
|
-
createdAt: Date;
|
|
69
|
-
updatedAt: Date;
|
|
70
|
-
email: string;
|
|
71
|
-
emailVerified: boolean;
|
|
72
|
-
name: string;
|
|
73
|
-
image?: string | null | undefined;
|
|
74
|
-
} & (O extends BetterAuthOptions ? import("better-auth").AdditionalUserFieldsOutput<O> : O extends import("better-auth").Auth ? import("better-auth").AdditionalUserFieldsOutput<O["options"]> : {})>> & {
|
|
75
|
-
userId: string;
|
|
76
|
-
}, "userId"> & {
|
|
77
|
-
id: string;
|
|
78
|
-
};
|
|
79
|
-
session: import("better-auth").UnionToIntersection<import("better-auth").StripEmptyObjects<{
|
|
80
|
-
id: string;
|
|
81
|
-
createdAt: Date;
|
|
82
|
-
updatedAt: Date;
|
|
83
|
-
userId: string;
|
|
84
|
-
expiresAt: Date;
|
|
85
|
-
token: string;
|
|
86
|
-
ipAddress?: string | null | undefined;
|
|
87
|
-
userAgent?: string | null | undefined;
|
|
88
|
-
} & (O extends BetterAuthOptions ? import("better-auth").AdditionalSessionFieldsOutput<O> : O extends import("better-auth").Auth ? import("better-auth").AdditionalSessionFieldsOutput<O["options"]> : {})>> & {
|
|
89
|
-
userId: string;
|
|
90
|
-
};
|
|
91
|
-
} | null;
|
|
92
|
-
} : {
|
|
93
|
-
user: Omit<import("better-auth").UnionToIntersection<import("better-auth").StripEmptyObjects<{
|
|
94
|
-
id: string;
|
|
95
|
-
createdAt: Date;
|
|
96
|
-
updatedAt: Date;
|
|
97
|
-
email: string;
|
|
98
|
-
emailVerified: boolean;
|
|
99
|
-
name: string;
|
|
100
|
-
image?: string | null | undefined;
|
|
101
|
-
} & (O extends BetterAuthOptions ? import("better-auth").AdditionalUserFieldsOutput<O> : O extends import("better-auth").Auth ? import("better-auth").AdditionalUserFieldsOutput<O["options"]> : {})>> & {
|
|
102
|
-
userId: string;
|
|
103
|
-
}, "userId"> & {
|
|
104
|
-
id: string;
|
|
105
|
-
};
|
|
106
|
-
session: import("better-auth").UnionToIntersection<import("better-auth").StripEmptyObjects<{
|
|
107
|
-
id: string;
|
|
108
|
-
createdAt: Date;
|
|
109
|
-
updatedAt: Date;
|
|
110
|
-
userId: string;
|
|
111
|
-
expiresAt: Date;
|
|
112
|
-
token: string;
|
|
113
|
-
ipAddress?: string | null | undefined;
|
|
114
|
-
userAgent?: string | null | undefined;
|
|
115
|
-
} & (O extends BetterAuthOptions ? import("better-auth").AdditionalSessionFieldsOutput<O> : O extends import("better-auth").Auth ? import("better-auth").AdditionalSessionFieldsOutput<O["options"]> : {})>> & {
|
|
116
|
-
userId: string;
|
|
117
|
-
};
|
|
118
|
-
} | null>;
|
|
119
|
-
options: {
|
|
120
|
-
method: "GET";
|
|
121
|
-
query: z.ZodOptional<z.ZodObject<{
|
|
122
|
-
disableCookieCache: z.ZodOptional<z.ZodUnion<[z.ZodBoolean, z.ZodEffects<z.ZodString, boolean, string>]>>;
|
|
123
|
-
disableRefresh: z.ZodOptional<z.ZodBoolean>;
|
|
124
|
-
}, "strip", z.ZodTypeAny, {
|
|
125
|
-
disableCookieCache?: boolean | undefined;
|
|
126
|
-
disableRefresh?: boolean | undefined;
|
|
127
|
-
}, {
|
|
128
|
-
disableCookieCache?: string | boolean | undefined;
|
|
129
|
-
disableRefresh?: boolean | undefined;
|
|
130
|
-
}>>;
|
|
131
|
-
metadata: {
|
|
132
|
-
CUSTOM_SESSION: boolean;
|
|
133
|
-
openapi: {
|
|
134
|
-
description: string;
|
|
135
|
-
responses: {
|
|
136
|
-
"200": {
|
|
137
|
-
description: string;
|
|
138
|
-
content: {
|
|
139
|
-
"application/json": {
|
|
140
|
-
schema: {
|
|
141
|
-
type: "array";
|
|
142
|
-
nullable: boolean;
|
|
143
|
-
items: {
|
|
144
|
-
$ref: string;
|
|
145
|
-
};
|
|
146
|
-
};
|
|
147
|
-
};
|
|
148
|
-
};
|
|
149
|
-
};
|
|
150
|
-
};
|
|
151
|
-
};
|
|
152
|
-
};
|
|
153
|
-
requireHeaders: true;
|
|
154
|
-
} & {
|
|
155
|
-
use: any[];
|
|
156
|
-
};
|
|
157
|
-
path: "/get-session";
|
|
158
|
-
};
|
|
159
32
|
getOpenIdConfig: {
|
|
160
33
|
<AsResponse extends boolean = false, ReturnHeaders extends boolean = false>(inputCtx_0?: ({
|
|
161
34
|
body?: undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/plugins/convex/index.ts"],"names":[],"mappings":"AASA,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/plugins/convex/index.ts"],"names":[],"mappings":"AASA,eAAO,MAAM,eAAe,eAAe,CAAC;AAE5C,eAAO,MAAM,MAAM,GACjB,OAAM;IACJ,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,4BAA4B,CAAC,EAAE,OAAO,CAAC;IACvC,OAAO,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC5B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qCAmQyw3F,CAAC;qCAAkD,CAAC;;;;;;;;;iCAA0Q,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAD/k4F,CAAC"}
|
|
@@ -1,22 +1,8 @@
|
|
|
1
1
|
import { createAuthMiddleware, sessionMiddleware } from "better-auth/api";
|
|
2
|
-
import { createAuthEndpoint,
|
|
3
|
-
import { omit } from "convex-helpers";
|
|
4
|
-
import { z } from "zod";
|
|
2
|
+
import { createAuthEndpoint, jwt as jwtPlugin, bearer as bearerPlugin, oidcProvider as oidcProviderPlugin, } from "better-auth/plugins";
|
|
5
3
|
export const JWT_COOKIE_NAME = "convex_jwt";
|
|
6
4
|
export const convex = (opts = {}) => {
|
|
7
|
-
const { jwtExpirationSeconds = 60 * 15
|
|
8
|
-
const customSession = customSessionPlugin(async ({ user, session }) => {
|
|
9
|
-
// Doing terrible things with types because user and session aren't actually
|
|
10
|
-
// objects and we need plugin inference to work
|
|
11
|
-
const { userId, ...userData } = omit(user, ["id"]);
|
|
12
|
-
return {
|
|
13
|
-
user: { ...userData, id: userId },
|
|
14
|
-
session: {
|
|
15
|
-
...session,
|
|
16
|
-
userId,
|
|
17
|
-
},
|
|
18
|
-
};
|
|
19
|
-
}, opts.options);
|
|
5
|
+
const { jwtExpirationSeconds = 60 * 15 } = opts;
|
|
20
6
|
const oidcProvider = oidcProviderPlugin({
|
|
21
7
|
loginPage: "/not-used",
|
|
22
8
|
metadata: {
|
|
@@ -29,12 +15,8 @@ export const convex = (opts = {}) => {
|
|
|
29
15
|
issuer: `${process.env.CONVEX_SITE_URL}`,
|
|
30
16
|
audience: "convex",
|
|
31
17
|
expirationTime: `${jwtExpirationSeconds}s`,
|
|
32
|
-
getSubject: (session) => {
|
|
33
|
-
// Return the userId from the app user table
|
|
34
|
-
return session.user.userId;
|
|
35
|
-
},
|
|
36
18
|
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
37
|
-
definePayload: ({ user: { id,
|
|
19
|
+
definePayload: ({ user: { id, image, ...user }, session }) => ({
|
|
38
20
|
...user,
|
|
39
21
|
sessionId: session.id,
|
|
40
22
|
iat: Math.floor(new Date().getTime() / 1000),
|
|
@@ -53,66 +35,16 @@ export const convex = (opts = {}) => {
|
|
|
53
35
|
};
|
|
54
36
|
return {
|
|
55
37
|
id: "convex",
|
|
38
|
+
init: ({ logger, options }) => {
|
|
39
|
+
if (options.plugins?.every((p) => p.id !== "cross-domain") &&
|
|
40
|
+
!options.baseURL) {
|
|
41
|
+
logger.warn("Better Auth baseURL is undefined. This is probably a mistake.");
|
|
42
|
+
}
|
|
43
|
+
},
|
|
56
44
|
hooks: {
|
|
57
|
-
before: [
|
|
58
|
-
{
|
|
59
|
-
matcher: (ctx) => {
|
|
60
|
-
return !!ctx.body?.userId;
|
|
61
|
-
},
|
|
62
|
-
handler: createAuthMiddleware(async (ctx) => {
|
|
63
|
-
const user = await ctx.context.adapter.findOne({
|
|
64
|
-
model: "user",
|
|
65
|
-
where: [
|
|
66
|
-
{
|
|
67
|
-
field: "userId",
|
|
68
|
-
operator: "eq",
|
|
69
|
-
value: ctx.body?.userId,
|
|
70
|
-
},
|
|
71
|
-
],
|
|
72
|
-
});
|
|
73
|
-
if (!user) {
|
|
74
|
-
throw new Error("User not found");
|
|
75
|
-
}
|
|
76
|
-
ctx.body.userId = user.id;
|
|
77
|
-
return {
|
|
78
|
-
context: ctx,
|
|
79
|
-
};
|
|
80
|
-
}),
|
|
81
|
-
},
|
|
82
|
-
...bearer.hooks.before,
|
|
83
|
-
],
|
|
45
|
+
before: [...bearer.hooks.before],
|
|
84
46
|
after: [
|
|
85
47
|
...oidcProvider.hooks.after,
|
|
86
|
-
{
|
|
87
|
-
matcher: (ctx) => {
|
|
88
|
-
return (deleteExpiredSessionsOnLogin &&
|
|
89
|
-
(ctx.path?.startsWith("/sign-in") ||
|
|
90
|
-
ctx.path?.startsWith("/callback")));
|
|
91
|
-
},
|
|
92
|
-
handler: createAuthMiddleware(async (ctx) => {
|
|
93
|
-
// Delete expired sessions at login
|
|
94
|
-
const userId = ctx.context.newSession?.user.id;
|
|
95
|
-
if (!userId) {
|
|
96
|
-
return;
|
|
97
|
-
}
|
|
98
|
-
await ctx.context.adapter.deleteMany({
|
|
99
|
-
model: "session",
|
|
100
|
-
where: [
|
|
101
|
-
{
|
|
102
|
-
field: "userId",
|
|
103
|
-
operator: "eq",
|
|
104
|
-
value: userId,
|
|
105
|
-
connector: "AND",
|
|
106
|
-
},
|
|
107
|
-
{
|
|
108
|
-
operator: "lte",
|
|
109
|
-
field: "expiresAt",
|
|
110
|
-
value: new Date().getTime(),
|
|
111
|
-
},
|
|
112
|
-
],
|
|
113
|
-
});
|
|
114
|
-
}),
|
|
115
|
-
},
|
|
116
48
|
{
|
|
117
49
|
matcher: (ctx) => {
|
|
118
50
|
return (ctx.path.startsWith("/sign-in") ||
|
|
@@ -164,53 +96,6 @@ export const convex = (opts = {}) => {
|
|
|
164
96
|
],
|
|
165
97
|
},
|
|
166
98
|
endpoints: {
|
|
167
|
-
getSession: createAuthEndpoint("/get-session", {
|
|
168
|
-
method: "GET",
|
|
169
|
-
query: z.optional(z.object({
|
|
170
|
-
// If cookie cache is enabled, it will disable the cache
|
|
171
|
-
// and fetch the session from the database
|
|
172
|
-
disableCookieCache: z
|
|
173
|
-
.boolean({
|
|
174
|
-
description: "Disable cookie cache and fetch session from database",
|
|
175
|
-
})
|
|
176
|
-
.or(z.string().transform((v) => v === "true"))
|
|
177
|
-
.optional(),
|
|
178
|
-
disableRefresh: z
|
|
179
|
-
.boolean({
|
|
180
|
-
description: "Disable session refresh. Useful for checking session status, without updating the session",
|
|
181
|
-
})
|
|
182
|
-
.optional(),
|
|
183
|
-
})),
|
|
184
|
-
metadata: {
|
|
185
|
-
CUSTOM_SESSION: true,
|
|
186
|
-
openapi: {
|
|
187
|
-
description: "Get custom session data",
|
|
188
|
-
responses: {
|
|
189
|
-
"200": {
|
|
190
|
-
description: "Success",
|
|
191
|
-
content: {
|
|
192
|
-
"application/json": {
|
|
193
|
-
schema: {
|
|
194
|
-
type: "array",
|
|
195
|
-
nullable: true,
|
|
196
|
-
items: {
|
|
197
|
-
$ref: "#/components/schemas/Session",
|
|
198
|
-
},
|
|
199
|
-
},
|
|
200
|
-
},
|
|
201
|
-
},
|
|
202
|
-
},
|
|
203
|
-
},
|
|
204
|
-
},
|
|
205
|
-
},
|
|
206
|
-
requireHeaders: true,
|
|
207
|
-
}, async (ctx) => {
|
|
208
|
-
const response = await customSession.endpoints.getSession({
|
|
209
|
-
...ctx,
|
|
210
|
-
returnHeaders: false,
|
|
211
|
-
});
|
|
212
|
-
return response;
|
|
213
|
-
}),
|
|
214
99
|
getOpenIdConfig: createAuthEndpoint("/convex/.well-known/openid-configuration", {
|
|
215
100
|
method: "GET",
|
|
216
101
|
metadata: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/convex/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAC1E,OAAO,EAEL,kBAAkB,EAClB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/convex/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -111,7 +111,7 @@ export const crossDomain = ({ siteUrl }) => {
|
|
|
111
111
|
// Mostly copied from the one-time-token plugin
|
|
112
112
|
const session = ctx.context.newSession;
|
|
113
113
|
if (!session) {
|
|
114
|
-
|
|
114
|
+
ctx.context.logger.error("No session found");
|
|
115
115
|
return;
|
|
116
116
|
}
|
|
117
117
|
const token = generateRandomString(32);
|
|
@@ -123,7 +123,7 @@ export const crossDomain = ({ siteUrl }) => {
|
|
|
123
123
|
});
|
|
124
124
|
const redirectTo = ctx.context.responseHeaders?.get("location");
|
|
125
125
|
if (!redirectTo) {
|
|
126
|
-
|
|
126
|
+
ctx.context.logger.error("No redirect to found");
|
|
127
127
|
return;
|
|
128
128
|
}
|
|
129
129
|
const url = new URL(redirectTo);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/cross-domain/index.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/plugins/cross-domain/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,44 +1,25 @@
|
|
|
1
1
|
import { betterAuth } from "better-auth";
|
|
2
|
-
import { GenericActionCtx } from "convex/server";
|
|
3
|
-
export declare const getCookieName: (createAuth: (ctx:
|
|
4
|
-
export declare const
|
|
5
|
-
|
|
2
|
+
import { FunctionReference, FunctionReturnType, GenericActionCtx } from "convex/server";
|
|
3
|
+
export declare const getCookieName: (createAuth: (ctx: any) => ReturnType<typeof betterAuth>) => string;
|
|
4
|
+
export declare const setupFetchClient: (createAuth: (ctx: any) => ReturnType<typeof betterAuth>) => Promise<{
|
|
5
|
+
fetchQuery<Query extends FunctionReference<"query">, FuncRef extends FunctionReference<any, any>>(query: Query, args: FuncRef["_args"]): Promise<FunctionReturnType<Query>>;
|
|
6
|
+
fetchMutation<Mutation extends FunctionReference<"mutation">, FuncRef extends FunctionReference<any, any>>(mutation: Mutation, args: FuncRef["_args"]): Promise<FunctionReturnType<Mutation>>;
|
|
7
|
+
fetchAction<Action extends FunctionReference<"action">, FuncRef extends FunctionReference<any, any>>(action: Action, args: FuncRef["_args"]): Promise<FunctionReturnType<Action>>;
|
|
8
|
+
}>;
|
|
9
|
+
export declare const fetchSession: <T extends (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>>(request: Request, opts?: {
|
|
10
|
+
convexSiteUrl?: string;
|
|
6
11
|
verbose?: boolean;
|
|
7
12
|
}) => Promise<{
|
|
8
13
|
session: ReturnType<T>["$Infer"]["Session"] | null;
|
|
9
14
|
}>;
|
|
10
|
-
export declare const
|
|
11
|
-
convexSiteUrl
|
|
15
|
+
export declare const getAuth: (request: Request, getCookie: (name: string) => string | null, createAuth: (ctx: any) => ReturnType<typeof betterAuth>, opts?: {
|
|
16
|
+
convexSiteUrl?: string;
|
|
17
|
+
}) => Promise<{
|
|
18
|
+
userId: string | undefined;
|
|
19
|
+
token: string | null;
|
|
20
|
+
}>;
|
|
21
|
+
export declare const reactStartHandler: (request: Request, opts?: {
|
|
22
|
+
convexSiteUrl?: string;
|
|
12
23
|
verbose?: boolean;
|
|
13
24
|
}) => Promise<Response>;
|
|
14
|
-
export declare const reactStartHelpers: (createAuth: (ctx: GenericActionCtx<any>) => ReturnType<typeof betterAuth>, opts: {
|
|
15
|
-
convexSiteUrl: string;
|
|
16
|
-
verbose?: boolean;
|
|
17
|
-
}) => {
|
|
18
|
-
fetchSession: (request: Request) => Promise<{
|
|
19
|
-
session: {
|
|
20
|
-
session: {
|
|
21
|
-
id: string;
|
|
22
|
-
createdAt: Date;
|
|
23
|
-
updatedAt: Date;
|
|
24
|
-
userId: string;
|
|
25
|
-
expiresAt: Date;
|
|
26
|
-
token: string;
|
|
27
|
-
ipAddress?: string | null | undefined;
|
|
28
|
-
userAgent?: string | null | undefined;
|
|
29
|
-
};
|
|
30
|
-
user: {
|
|
31
|
-
id: string;
|
|
32
|
-
createdAt: Date;
|
|
33
|
-
updatedAt: Date;
|
|
34
|
-
email: string;
|
|
35
|
-
emailVerified: boolean;
|
|
36
|
-
name: string;
|
|
37
|
-
image?: string | null | undefined;
|
|
38
|
-
};
|
|
39
|
-
} | null;
|
|
40
|
-
}>;
|
|
41
|
-
reactStartHandler: (request: Request) => Promise<Response>;
|
|
42
|
-
getCookieName: () => Promise<string>;
|
|
43
|
-
};
|
|
44
25
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EACL,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAIvB,eAAO,MAAM,aAAa,GACxB,YAAY,CAAC,GAAG,EAAE,GAAG,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,WAKxD,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAC3B,YAAY,CAAC,GAAG,EAAE,GAAG,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC;eAcnD,KAAK,SAAS,iBAAiB,CAAC,OAAO,CAAC,EACxC,OAAO,SAAS,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,SAEpC,KAAK,QACN,OAAO,CAAC,OAAO,CAAC,GACrB,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;kBAInC,QAAQ,SAAS,iBAAiB,CAAC,UAAU,CAAC,EAC9C,OAAO,SAAS,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,YAEjC,QAAQ,QACZ,OAAO,CAAC,OAAO,CAAC,GACrB,OAAO,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;gBAItC,MAAM,SAAS,iBAAiB,CAAC,QAAQ,CAAC,EAC1C,OAAO,SAAS,iBAAiB,CAAC,GAAG,EAAE,GAAG,CAAC,UAEnC,MAAM,QACR,OAAO,CAAC,OAAO,CAAC,GACrB,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;EAIzC,CAAC;AAEF,eAAO,MAAM,YAAY,GACvB,CAAC,SAAS,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,EAEvE,SAAS,OAAO,EAChB,OAAO;IACL,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;;EAuBF,CAAC;AAEF,eAAO,MAAM,OAAO,GAClB,SAAS,OAAO,EAChB,WAAW,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,EAC1C,YAAY,CAAC,GAAG,EAAE,GAAG,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,EACvD,OAAO;IAAE,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE;;;EASlC,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,SAAS,OAAO,EAChB,OAAO;IAAE,aAAa,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,sBAUrD,CAAC"}
|
|
@@ -1,27 +1,43 @@
|
|
|
1
1
|
import { createCookieGetter } from "better-auth/cookies";
|
|
2
2
|
import { betterFetch } from "@better-fetch/fetch";
|
|
3
3
|
import { JWT_COOKIE_NAME } from "../plugins/convex/index.js";
|
|
4
|
-
import {
|
|
5
|
-
export const getCookieName =
|
|
6
|
-
const
|
|
7
|
-
const createCookie = createCookieGetter(auth.options);
|
|
4
|
+
import { ConvexHttpClient } from "convex/browser";
|
|
5
|
+
export const getCookieName = (createAuth) => {
|
|
6
|
+
const createCookie = createCookieGetter(createAuth({}).options);
|
|
8
7
|
const cookie = createCookie(JWT_COOKIE_NAME);
|
|
9
8
|
return cookie.name;
|
|
10
9
|
};
|
|
11
|
-
const
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
10
|
+
export const setupFetchClient = async (createAuth) => {
|
|
11
|
+
const { getCookie } = await import("@tanstack/react-start/server");
|
|
12
|
+
const createClient = () => {
|
|
13
|
+
const sessionCookieName = getCookieName(createAuth);
|
|
14
|
+
const token = getCookie(sessionCookieName);
|
|
15
|
+
const client = new ConvexHttpClient(process.env.VITE_CONVEX_URL);
|
|
16
|
+
if (token) {
|
|
17
|
+
client.setAuth(token);
|
|
18
|
+
}
|
|
19
|
+
return client;
|
|
20
|
+
};
|
|
21
|
+
return {
|
|
22
|
+
fetchQuery(query, args) {
|
|
23
|
+
return createClient().query(query, args);
|
|
24
|
+
},
|
|
25
|
+
fetchMutation(mutation, args) {
|
|
26
|
+
return createClient().mutation(mutation, args);
|
|
27
|
+
},
|
|
28
|
+
fetchAction(action, args) {
|
|
29
|
+
return createClient().action(action, args);
|
|
30
|
+
},
|
|
31
|
+
};
|
|
19
32
|
};
|
|
20
33
|
export const fetchSession = async (request, opts) => {
|
|
21
34
|
if (!request) {
|
|
22
35
|
throw new Error("No request found");
|
|
23
36
|
}
|
|
24
|
-
const convexSiteUrl =
|
|
37
|
+
const convexSiteUrl = opts?.convexSiteUrl ?? process.env.VITE_CONVEX_SITE_URL;
|
|
38
|
+
if (!convexSiteUrl) {
|
|
39
|
+
throw new Error("VITE_CONVEX_SITE_URL is not set");
|
|
40
|
+
}
|
|
25
41
|
const { data: session } = await betterFetch("/api/auth/get-session", {
|
|
26
42
|
baseURL: convexSiteUrl,
|
|
27
43
|
headers: {
|
|
@@ -32,28 +48,23 @@ export const fetchSession = async (request, opts) => {
|
|
|
32
48
|
session,
|
|
33
49
|
};
|
|
34
50
|
};
|
|
51
|
+
export const getAuth = async (request, getCookie, createAuth, opts) => {
|
|
52
|
+
const sessionCookieName = getCookieName(createAuth);
|
|
53
|
+
const token = getCookie(sessionCookieName);
|
|
54
|
+
const { session } = await fetchSession(request, opts);
|
|
55
|
+
return {
|
|
56
|
+
userId: session?.user.id,
|
|
57
|
+
token,
|
|
58
|
+
};
|
|
59
|
+
};
|
|
35
60
|
export const reactStartHandler = (request, opts) => {
|
|
36
61
|
const requestUrl = new URL(request.url);
|
|
37
|
-
const convexSiteUrl =
|
|
62
|
+
const convexSiteUrl = opts?.convexSiteUrl ?? process.env.VITE_CONVEX_SITE_URL;
|
|
63
|
+
if (!convexSiteUrl) {
|
|
64
|
+
throw new Error("VITE_CONVEX_SITE_URL is not set");
|
|
65
|
+
}
|
|
38
66
|
const nextUrl = `${convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
|
|
39
67
|
request.headers.set("accept-encoding", "application/json");
|
|
40
68
|
return fetch(nextUrl, new Request(request, { redirect: "manual" }));
|
|
41
69
|
};
|
|
42
|
-
export const reactStartHelpers = (createAuth, opts) => {
|
|
43
|
-
if (!opts.convexSiteUrl) {
|
|
44
|
-
throw new Error("opts.convexSiteUrl is required");
|
|
45
|
-
}
|
|
46
|
-
if (opts.convexSiteUrl.endsWith(".convex.cloud")) {
|
|
47
|
-
throw new Error(oneLine(`
|
|
48
|
-
opts.convexSiteUrl ends with .convex.cloud, which is your cloud URL.
|
|
49
|
-
Use your Convex site URL instead.
|
|
50
|
-
https://docs.convex.dev/production/environment-variables#system-environment-variables
|
|
51
|
-
`));
|
|
52
|
-
}
|
|
53
|
-
return {
|
|
54
|
-
fetchSession: (request) => fetchSession(request, opts),
|
|
55
|
-
reactStartHandler: (request) => reactStartHandler(request, opts),
|
|
56
|
-
getCookieName: () => getCookieName(createAuth),
|
|
57
|
-
};
|
|
58
|
-
};
|
|
59
70
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"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"}
|