@convex-dev/better-auth 0.11.4 → 0.12.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/auth-options.d.ts.map +1 -1
- package/dist/auth-options.js +1 -0
- package/dist/auth-options.js.map +1 -1
- package/dist/client/adapter-utils.d.ts +8 -2
- package/dist/client/adapter-utils.d.ts.map +1 -1
- package/dist/client/adapter-utils.js +8 -3
- package/dist/client/adapter-utils.js.map +1 -1
- package/dist/client/adapter.d.ts.map +1 -1
- package/dist/client/adapter.js +5 -0
- package/dist/client/adapter.js.map +1 -1
- package/dist/client/create-api.d.ts +6 -0
- package/dist/client/create-api.d.ts.map +1 -1
- package/dist/client/create-api.js +1 -0
- package/dist/client/create-api.js.map +1 -1
- package/dist/client/create-client.d.ts.map +1 -1
- package/dist/client/create-client.js +19 -2
- package/dist/client/create-client.js.map +1 -1
- package/dist/client/create-schema.d.ts.map +1 -1
- package/dist/client/create-schema.js +38 -8
- package/dist/client/create-schema.js.map +1 -1
- package/dist/component/_generated/component.d.ts +543 -28
- package/dist/component/_generated/component.d.ts.map +1 -1
- package/dist/component/_generated/server.d.ts.map +1 -1
- package/dist/component/adapter.d.ts +6 -0
- package/dist/component/adapter.d.ts.map +1 -1
- package/dist/component/schema.d.ts +9 -4
- package/dist/component/schema.d.ts.map +1 -1
- package/dist/component/schema.js +4 -2
- package/dist/component/schema.js.map +1 -1
- package/dist/component/testProfiles/adapterAdditionalFields.d.ts +6 -0
- package/dist/component/testProfiles/adapterAdditionalFields.d.ts.map +1 -1
- package/dist/component/testProfiles/adapterOrganizationJoins.d.ts +6 -0
- package/dist/component/testProfiles/adapterOrganizationJoins.d.ts.map +1 -1
- package/dist/component/testProfiles/adapterPluginTable.d.ts +6 -0
- package/dist/component/testProfiles/adapterPluginTable.d.ts.map +1 -1
- package/dist/component/testProfiles/adapterRenameField.d.ts +6 -0
- package/dist/component/testProfiles/adapterRenameField.d.ts.map +1 -1
- package/dist/component/testProfiles/adapterRenameUserCustom.d.ts +6 -0
- package/dist/component/testProfiles/adapterRenameUserCustom.d.ts.map +1 -1
- package/dist/component/testProfiles/adapterRenameUserTable.d.ts +6 -0
- package/dist/component/testProfiles/adapterRenameUserTable.d.ts.map +1 -1
- package/dist/component/testProfiles/schema.profile-additional-fields.d.ts +3 -1
- package/dist/component/testProfiles/schema.profile-additional-fields.d.ts.map +1 -1
- package/dist/component/testProfiles/schema.profile-plugin-table.d.ts +3 -1
- package/dist/component/testProfiles/schema.profile-plugin-table.d.ts.map +1 -1
- package/dist/nextjs/index.d.ts.map +1 -1
- package/dist/nextjs/index.js +4 -0
- package/dist/nextjs/index.js.map +1 -1
- package/dist/plugins/convex/client.d.ts +1 -0
- package/dist/plugins/convex/client.d.ts.map +1 -1
- package/dist/plugins/convex/client.js +2 -0
- package/dist/plugins/convex/client.js.map +1 -1
- package/dist/plugins/convex/index.d.ts +2 -1
- package/dist/plugins/convex/index.d.ts.map +1 -1
- package/dist/plugins/convex/index.js +15 -2
- package/dist/plugins/convex/index.js.map +1 -1
- package/dist/plugins/cross-domain/client.d.ts +1 -12
- package/dist/plugins/cross-domain/client.d.ts.map +1 -1
- package/dist/plugins/cross-domain/client.js +14 -26
- package/dist/plugins/cross-domain/client.js.map +1 -1
- package/dist/plugins/cross-domain/index.d.ts +1 -0
- package/dist/plugins/cross-domain/index.d.ts.map +1 -1
- package/dist/plugins/cross-domain/index.js +15 -4
- package/dist/plugins/cross-domain/index.js.map +1 -1
- package/dist/react-start/index.d.ts.map +1 -1
- package/dist/react-start/index.js +4 -0
- package/dist/react-start/index.js.map +1 -1
- package/dist/test/adapter-factory/basic.d.ts +4 -0
- package/dist/test/adapter-factory/basic.d.ts.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 +20 -0
- package/dist/test/adapter-factory/convex-custom.js.map +1 -1
- package/dist/utils/index.d.ts +1 -0
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +5 -1
- package/dist/utils/index.js.map +1 -1
- package/dist/version.d.ts +2 -0
- package/dist/version.d.ts.map +1 -0
- package/dist/version.js +2 -0
- package/dist/version.js.map +1 -0
- package/package.json +16 -19
- package/src/auth-options.ts +1 -0
- package/src/client/adapter-utils.ts +13 -5
- package/src/client/adapter.ts +7 -0
- package/src/client/create-api.ts +3 -0
- package/src/client/create-client.test.ts +40 -0
- package/src/client/create-client.ts +25 -2
- package/src/client/create-schema.ts +46 -8
- package/src/component/_generated/component.ts +718 -35
- package/src/component/_generated/server.ts +0 -5
- package/src/component/schema.ts +5 -3
- package/src/nextjs/index.ts +4 -0
- package/src/plugins/convex/client.ts +2 -0
- package/src/plugins/convex/index.ts +16 -3
- package/src/plugins/cross-domain/client.test.ts +41 -30
- package/src/plugins/cross-domain/client.ts +17 -44
- package/src/plugins/cross-domain/index.test.ts +129 -51
- package/src/plugins/cross-domain/index.ts +20 -7
- package/src/react-start/index.ts +4 -0
- package/src/test/adapter-factory/convex-custom.ts +23 -0
- package/src/utils/index.ts +6 -1
- package/src/version.ts +1 -0
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/plugins/convex/client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/plugins/convex/client.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAGzC,eAAO,MAAM,YAAY;;;wBAIK,UAAU,CAAC,OAAO,MAAM,CAAC;CAEtD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/plugins/convex/client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/plugins/convex/client.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAE3C,MAAM,CAAC,MAAM,YAAY,GAAG,GAAG,EAAE;IAC/B,OAAO;QACL,EAAE,EAAE,QAAQ;QACZ,OAAO,EAAE,OAAO;QAChB,kBAAkB,EAAE,EAA+B;KACnB,CAAC;AACrC,CAAC,CAAC"}
|
|
@@ -93,7 +93,7 @@ export declare const convex: (opts: {
|
|
|
93
93
|
* Handles error that occurs when existing JWKS key does not match configured
|
|
94
94
|
* algorithm, which will be common for 0.10 upgrades switching from EdDSA to RS256.
|
|
95
95
|
*
|
|
96
|
-
* @default
|
|
96
|
+
* @default false
|
|
97
97
|
*/
|
|
98
98
|
jwksRotateOnTokenGenerationError?: boolean;
|
|
99
99
|
/**
|
|
@@ -103,6 +103,7 @@ export declare const convex: (opts: {
|
|
|
103
103
|
options?: BetterAuthOptions;
|
|
104
104
|
}) => {
|
|
105
105
|
id: "convex";
|
|
106
|
+
version: string;
|
|
106
107
|
init: (ctx: import("better-auth").AuthContext) => void;
|
|
107
108
|
hooks: {
|
|
108
109
|
before: ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/convex/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAW7D,OAAO,KAAK,EAAE,UAAU,EAAgB,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/convex/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAoB,OAAO,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;AACnE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAW7D,OAAO,KAAK,EAAE,UAAU,EAAgB,MAAM,eAAe,CAAC;AAG9D,eAAO,MAAM,eAAe,eAAe,CAAC;AA6D5C,eAAO,MAAM,MAAM,GAAI,MAAM;IAC3B;;;;;;;;;;;;;;;;;;;;;;;;OAwBG;IACH,UAAU,EAAE,UAAU,CAAC;IACvB;;;;OAIG;IACH,GAAG,CAAC,EAAE;QACJ,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE;YACxB,IAAI,EAAE,IAAI,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;YACjC,OAAO,EAAE,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;SACxC,KAAK,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;KACtE,CAAC;IACF;;OAEG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;OAsCG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;;;;;;;;OASG;IACH,gCAAgC,CAAC,EAAE,OAAO,CAAC;IAC3C;;;OAGG;IACH,OAAO,CAAC,EAAE,iBAAiB,CAAC;CAC7B;;;;;;;;;;;;;;;;;;;;;;2DADmB,CAAC;;;;4CAGiC,CAAC;;;;;;;;;;;qCAO7C,CAAC;qCAEI,CAAC;;;;;;;;;iCAOW,CAAA;;;;;;;;;;;qCAQvB,CAAJ;qCAEW,CAAC;;;;;;;;;iCASJ,CAAR;;;;;;;;;;;qCAOY,CAAH;qCACuB,CAAC;;;;;;;;;iCASF,CAAC;;;;;;;;;;;;;;6EAqBkC,CAAA;;;;;;;;;;;;;;4BAamD,CAAC;;;;;;;;;;;;;;;;;;;mCAkBvD,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iCA7NvB,CAAC;iCAE5B,CAAC;;;;;;;;;6BAOT,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyjBN,CAAC"}
|
|
@@ -3,6 +3,7 @@ import { bearer as bearerPlugin } from "better-auth/plugins/bearer";
|
|
|
3
3
|
import { jwt as jwtPlugin } from "better-auth/plugins/jwt";
|
|
4
4
|
import { oidcProvider as oidcProviderPlugin } from "better-auth/plugins/oidc-provider";
|
|
5
5
|
import { omit } from "convex-helpers";
|
|
6
|
+
import { VERSION } from "../../version.js";
|
|
6
7
|
export const JWT_COOKIE_NAME = "convex_jwt";
|
|
7
8
|
const normalizeAfterHooks = (hooks) => {
|
|
8
9
|
return hooks.map((hook) => ({
|
|
@@ -47,6 +48,7 @@ export const convex = (opts) => {
|
|
|
47
48
|
issuer: `${process.env.CONVEX_SITE_URL}`,
|
|
48
49
|
jwks_uri: `${process.env.CONVEX_SITE_URL}${opts.options?.basePath ?? "/api/auth"}/convex/jwks`,
|
|
49
50
|
},
|
|
51
|
+
__skipDeprecationWarning: true,
|
|
50
52
|
});
|
|
51
53
|
const providerConfig = parseAuthConfig(opts.authConfig, opts);
|
|
52
54
|
const jwtOptions = {
|
|
@@ -54,9 +56,9 @@ export const convex = (opts) => {
|
|
|
54
56
|
issuer: `${process.env.CONVEX_SITE_URL}`,
|
|
55
57
|
audience: "convex",
|
|
56
58
|
expirationTime: `${jwtExpirationSeconds}s`,
|
|
57
|
-
definePayload: ({ user, session }) => ({
|
|
59
|
+
definePayload: async ({ user, session }) => ({
|
|
58
60
|
...(opts.jwt?.definePayload
|
|
59
|
-
? opts.jwt.definePayload({ user, session })
|
|
61
|
+
? await opts.jwt.definePayload({ user, session })
|
|
60
62
|
: omit(user, ["id", "image"])),
|
|
61
63
|
sessionId: session.id,
|
|
62
64
|
iat: Math.floor(new Date().getTime() / 1000),
|
|
@@ -117,6 +119,7 @@ export const convex = (opts) => {
|
|
|
117
119
|
};
|
|
118
120
|
return {
|
|
119
121
|
id: "convex",
|
|
122
|
+
version: VERSION,
|
|
120
123
|
init: (ctx) => {
|
|
121
124
|
const { options, logger: _logger } = ctx;
|
|
122
125
|
if (options.basePath !== "/api/auth" && !opts.options?.basePath) {
|
|
@@ -189,6 +192,7 @@ export const convex = (opts) => {
|
|
|
189
192
|
...ctx,
|
|
190
193
|
headers: {},
|
|
191
194
|
method: "GET",
|
|
195
|
+
asResponse: false,
|
|
192
196
|
returnHeaders: false,
|
|
193
197
|
returnStatus: false,
|
|
194
198
|
});
|
|
@@ -230,6 +234,7 @@ export const convex = (opts) => {
|
|
|
230
234
|
}, async (ctx) => {
|
|
231
235
|
const response = await oidcProvider.endpoints.getOpenIdConfig({
|
|
232
236
|
...ctx,
|
|
237
|
+
asResponse: false,
|
|
233
238
|
returnHeaders: false,
|
|
234
239
|
returnStatus: false,
|
|
235
240
|
});
|
|
@@ -313,6 +318,7 @@ export const convex = (opts) => {
|
|
|
313
318
|
}, async (ctx) => {
|
|
314
319
|
const response = await jwt.endpoints.getJwks({
|
|
315
320
|
...ctx,
|
|
321
|
+
asResponse: false,
|
|
316
322
|
returnHeaders: false,
|
|
317
323
|
returnStatus: false,
|
|
318
324
|
});
|
|
@@ -335,6 +341,9 @@ export const convex = (opts) => {
|
|
|
335
341
|
await jwtPlugin(jwtOptions).endpoints.getJwks({
|
|
336
342
|
...ctx,
|
|
337
343
|
method: "GET",
|
|
344
|
+
asResponse: false,
|
|
345
|
+
returnHeaders: false,
|
|
346
|
+
returnStatus: false,
|
|
338
347
|
});
|
|
339
348
|
const jwks = await ctx.context.adapter.findMany({
|
|
340
349
|
model: "jwks",
|
|
@@ -368,6 +377,9 @@ export const convex = (opts) => {
|
|
|
368
377
|
await jwtPlugin(jwtOptions).endpoints.getJwks({
|
|
369
378
|
...ctx,
|
|
370
379
|
method: "GET",
|
|
380
|
+
asResponse: false,
|
|
381
|
+
returnHeaders: false,
|
|
382
|
+
returnStatus: false,
|
|
371
383
|
});
|
|
372
384
|
const jwks = await ctx.context.adapter.findMany({
|
|
373
385
|
model: "jwks",
|
|
@@ -410,6 +422,7 @@ export const convex = (opts) => {
|
|
|
410
422
|
const runEndpoint = async () => {
|
|
411
423
|
const response = await jwt.endpoints.getToken({
|
|
412
424
|
...ctx,
|
|
425
|
+
asResponse: false,
|
|
413
426
|
returnHeaders: false,
|
|
414
427
|
returnStatus: false,
|
|
415
428
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/convex/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/convex/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,6 @@
|
|
|
1
1
|
import type { ClientStore } from "better-auth";
|
|
2
2
|
import type { BetterFetchOption } from "@better-fetch/fetch";
|
|
3
3
|
import type { crossDomain } from "./index.js";
|
|
4
|
-
interface CookieAttributes {
|
|
5
|
-
value: string;
|
|
6
|
-
expires?: Date;
|
|
7
|
-
"max-age"?: number;
|
|
8
|
-
domain?: string;
|
|
9
|
-
path?: string;
|
|
10
|
-
secure?: boolean;
|
|
11
|
-
httpOnly?: boolean;
|
|
12
|
-
sameSite?: "Strict" | "Lax" | "None";
|
|
13
|
-
}
|
|
14
|
-
export declare function parseSetCookieHeader(header: string): Map<string, CookieAttributes>;
|
|
15
4
|
export declare function getSetCookie(header: string, prevCookie?: string): string;
|
|
16
5
|
export declare function getCookie(cookie: string): string;
|
|
17
6
|
export declare const crossDomainClient: (opts?: {
|
|
@@ -23,6 +12,7 @@ export declare const crossDomainClient: (opts?: {
|
|
|
23
12
|
disableCache?: boolean;
|
|
24
13
|
}) => {
|
|
25
14
|
id: "cross-domain";
|
|
15
|
+
version: string;
|
|
26
16
|
$InferServerPlugin: ReturnType<typeof crossDomain>;
|
|
27
17
|
getActions(_: import("@better-fetch/fetch").BetterFetch, $store: ClientStore): {
|
|
28
18
|
/**
|
|
@@ -128,5 +118,4 @@ export declare const crossDomainClient: (opts?: {
|
|
|
128
118
|
}>;
|
|
129
119
|
}[];
|
|
130
120
|
};
|
|
131
|
-
export {};
|
|
132
121
|
//# sourceMappingURL=client.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/plugins/cross-domain/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA0B,WAAW,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"client.d.ts","sourceRoot":"","sources":["../../../src/plugins/cross-domain/client.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAA0B,WAAW,EAAE,MAAM,aAAa,CAAC;AAEvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAQ9C,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,UA4B/D;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,UAWvC;AAED,eAAO,MAAM,iBAAiB,GAC5B,OAAM;IACJ,OAAO,CAAC,EAAE;QACR,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,GAAG,CAAC;QAC7C,OAAO,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;KACzC,CAAC;IACF,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,YAAY,CAAC,EAAE,OAAO,CAAC;CACnB;;;wBAWsB,UAAU,CAAC,OAAO,WAAW,CAAC;;QAIpD;;;;;;;;;;;;;;WAcG;;QAKH;;;;;;;;;;WAUG;;QAIH;;;;;;;WAOG;8BACiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BA2G2gY,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBA7BpiY,iBAAiB;;;CA4BlD,CAAC"}
|
|
@@ -1,18 +1,5 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
const cookies = header.split(", ");
|
|
4
|
-
cookies.forEach((cookie) => {
|
|
5
|
-
const [nameValue, ...attributes] = cookie.split("; ");
|
|
6
|
-
const [name, value] = nameValue.split("=");
|
|
7
|
-
const cookieObj = { value };
|
|
8
|
-
attributes.forEach((attr) => {
|
|
9
|
-
const [attrName, attrValue] = attr.split("=");
|
|
10
|
-
cookieObj[attrName.toLowerCase()] = attrValue;
|
|
11
|
-
});
|
|
12
|
-
cookieMap.set(name, cookieObj);
|
|
13
|
-
});
|
|
14
|
-
return cookieMap;
|
|
15
|
-
}
|
|
1
|
+
import { parseSetCookieHeader } from "better-auth/cookies";
|
|
2
|
+
import { VERSION } from "../../version.js";
|
|
16
3
|
export function getSetCookie(header, prevCookie) {
|
|
17
4
|
const parsed = parseSetCookieHeader(header);
|
|
18
5
|
let toSetCookie = {};
|
|
@@ -51,13 +38,10 @@ export function getCookie(cookie) {
|
|
|
51
38
|
catch {
|
|
52
39
|
// noop
|
|
53
40
|
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
return `${acc}; ${key}=${value.value}`;
|
|
59
|
-
}, "");
|
|
60
|
-
return toSend;
|
|
41
|
+
return Object.entries(parsed)
|
|
42
|
+
.filter(([, value]) => !value.expires || new Date(value.expires) >= new Date())
|
|
43
|
+
.map(([key, value]) => `${key}=${value.value}`)
|
|
44
|
+
.join("; ");
|
|
61
45
|
}
|
|
62
46
|
export const crossDomainClient = (opts = {}) => {
|
|
63
47
|
let store = null;
|
|
@@ -66,6 +50,7 @@ export const crossDomainClient = (opts = {}) => {
|
|
|
66
50
|
const storage = opts?.storage || (typeof window !== "undefined" ? localStorage : undefined);
|
|
67
51
|
return {
|
|
68
52
|
id: "cross-domain",
|
|
53
|
+
version: VERSION,
|
|
69
54
|
$InferServerPlugin: {},
|
|
70
55
|
getActions(_, $store) {
|
|
71
56
|
store = $store;
|
|
@@ -117,8 +102,11 @@ export const crossDomainClient = (opts = {}) => {
|
|
|
117
102
|
return null;
|
|
118
103
|
try {
|
|
119
104
|
const parsed = JSON.parse(sessionData);
|
|
120
|
-
if (parsed &&
|
|
105
|
+
if (parsed &&
|
|
106
|
+
typeof parsed === "object" &&
|
|
107
|
+
Object.keys(parsed).length === 0) {
|
|
121
108
|
return null;
|
|
109
|
+
}
|
|
122
110
|
return parsed;
|
|
123
111
|
}
|
|
124
112
|
catch {
|
|
@@ -129,8 +117,8 @@ export const crossDomainClient = (opts = {}) => {
|
|
|
129
117
|
},
|
|
130
118
|
fetchPlugins: [
|
|
131
119
|
{
|
|
132
|
-
id: "
|
|
133
|
-
name: "
|
|
120
|
+
id: "cross-domain",
|
|
121
|
+
name: "Cross Domain",
|
|
134
122
|
hooks: {
|
|
135
123
|
async onSuccess(context) {
|
|
136
124
|
if (!storage) {
|
|
@@ -193,7 +181,7 @@ export const crossDomainClient = (opts = {}) => {
|
|
|
193
181
|
error: null,
|
|
194
182
|
isPending: false,
|
|
195
183
|
});
|
|
196
|
-
storage.setItem(localCacheName, "{}");
|
|
184
|
+
await storage.setItem(localCacheName, "{}");
|
|
197
185
|
}
|
|
198
186
|
return {
|
|
199
187
|
url,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/plugins/cross-domain/client.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/plugins/cross-domain/client.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/cross-domain/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/cross-domain/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,eAAO,MAAM,WAAW,GAAI,aAAa;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2DA0J7C,CAAA;;;;4CAEH,CAAL;;;;;;;;;;;qCAM6B,CAAC;qCACvB,CAAF;;;;;;;;;iCAME,CAAb;;;;;;;;;;;qCAQK,CAAL;qCAGa,CAAC;;;;;;;;;iCASH,CAAC;;;;;;;;;;;qCASP,CAAN;qCAE8B,CAAC;;;;;;;;;iCAEuM,CAAC;;;;;;;;;;;;;;6EAA4qB,CAAC;;;;;;;;;;;;;;4BAA+a,CAAC;;;;;;;;;;;;;;;;;;;mCAAgpB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;CADp9D,CAAC"}
|
|
@@ -3,6 +3,7 @@ import { generateRandomString } from "better-auth/crypto";
|
|
|
3
3
|
import { createAuthEndpoint, createAuthMiddleware } from "better-auth/api";
|
|
4
4
|
import { oneTimeToken as oneTimeTokenPlugin } from "better-auth/plugins/one-time-token";
|
|
5
5
|
import { z } from "zod";
|
|
6
|
+
import { VERSION } from "../../version.js";
|
|
6
7
|
export const crossDomain = ({ siteUrl }) => {
|
|
7
8
|
const oneTimeToken = oneTimeTokenPlugin();
|
|
8
9
|
const rewriteCallbackURL = (callbackURL) => {
|
|
@@ -19,6 +20,7 @@ export const crossDomain = ({ siteUrl }) => {
|
|
|
19
20
|
};
|
|
20
21
|
return {
|
|
21
22
|
id: "cross-domain",
|
|
23
|
+
version: VERSION,
|
|
22
24
|
// TODO: remove this in the next minor release, it doesn't
|
|
23
25
|
// actually affect ctx.trustedOrigins. cors allowedOrigins
|
|
24
26
|
// is using it, via options.trustedOrigins, though, so it's
|
|
@@ -47,8 +49,7 @@ export const crossDomain = ({ siteUrl }) => {
|
|
|
47
49
|
{
|
|
48
50
|
matcher(ctx) {
|
|
49
51
|
return (Boolean(ctx.request?.headers.has("better-auth-cookie") ||
|
|
50
|
-
ctx.headers?.has("better-auth-cookie")) &&
|
|
51
|
-
!isExpoNative(ctx));
|
|
52
|
+
ctx.headers?.has("better-auth-cookie")) && !isExpoNative(ctx));
|
|
52
53
|
},
|
|
53
54
|
handler: createAuthMiddleware(async (ctx) => {
|
|
54
55
|
const existingHeaders = (ctx.request?.headers ||
|
|
@@ -90,6 +91,16 @@ export const crossDomain = ({ siteUrl }) => {
|
|
|
90
91
|
return Boolean(ctx.method === "POST" && !isExpoNative(ctx));
|
|
91
92
|
},
|
|
92
93
|
handler: createAuthMiddleware(async (ctx) => {
|
|
94
|
+
// Set callbackURL to siteUrl for redirect-triggering paths with
|
|
95
|
+
// no callbackURL defined.
|
|
96
|
+
if (ctx.body &&
|
|
97
|
+
!ctx.body.callbackURL &&
|
|
98
|
+
(ctx.path?.startsWith("/sign-in/social") ||
|
|
99
|
+
ctx.path?.startsWith("/sign-in/oauth2") ||
|
|
100
|
+
ctx.path?.startsWith("/sign-in/magic-link") ||
|
|
101
|
+
ctx.path?.startsWith("/send-verification-email"))) {
|
|
102
|
+
ctx.body.callbackURL = siteUrl;
|
|
103
|
+
}
|
|
93
104
|
if (ctx.body?.callbackURL) {
|
|
94
105
|
ctx.body.callbackURL = rewriteCallbackURL(ctx.body.callbackURL);
|
|
95
106
|
}
|
|
@@ -107,8 +118,7 @@ export const crossDomain = ({ siteUrl }) => {
|
|
|
107
118
|
{
|
|
108
119
|
matcher(ctx) {
|
|
109
120
|
return (Boolean(ctx.request?.headers.has("better-auth-cookie") ||
|
|
110
|
-
ctx.headers?.has("better-auth-cookie")) &&
|
|
111
|
-
!isExpoNative(ctx));
|
|
121
|
+
ctx.headers?.has("better-auth-cookie")) && !isExpoNative(ctx));
|
|
112
122
|
},
|
|
113
123
|
handler: createAuthMiddleware(async (ctx) => {
|
|
114
124
|
const setCookie = ctx.context.responseHeaders?.get("set-cookie");
|
|
@@ -161,6 +171,7 @@ export const crossDomain = ({ siteUrl }) => {
|
|
|
161
171
|
}, async (ctx) => {
|
|
162
172
|
const response = await oneTimeToken.endpoints.verifyOneTimeToken({
|
|
163
173
|
...ctx,
|
|
174
|
+
asResponse: false,
|
|
164
175
|
returnHeaders: false,
|
|
165
176
|
returnStatus: false,
|
|
166
177
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/cross-domain/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC3E,OAAO,EAAE,YAAY,IAAI,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACxF,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/plugins/cross-domain/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/react-start/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAGvB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/react-start/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,iBAAiB,EACjB,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,eAAe,CAAC;AAGvB,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAyEzD,eAAO,MAAM,0BAA0B,GACrC,MAAM,IAAI,CAAC,eAAe,EAAE,cAAc,CAAC,GAAG;IAC5C,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB;;uBA4CoB,OAAO;qBACH,KAAK,SAAS,iBAAiB,CAAC,OAAO,CAAC,SACtD,KAAK,WACH,gBAAgB,CAAC,KAAK,CAAC,KAC/B,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;wBAMX,QAAQ,SAAS,iBAAiB,CAAC,UAAU,CAAC,YAC5D,QAAQ,WACT,gBAAgB,CAAC,QAAQ,CAAC,KAClC,OAAO,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;sBAMhB,MAAM,SAAS,iBAAiB,CAAC,QAAQ,CAAC,UACxD,MAAM,WACL,gBAAgB,CAAC,MAAM,CAAC,KAChC,OAAO,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;CAOzC,CAAC"}
|
|
@@ -38,6 +38,10 @@ const handler = (request, opts) => {
|
|
|
38
38
|
const headers = new Headers(request.headers);
|
|
39
39
|
headers.set("accept-encoding", "application/json");
|
|
40
40
|
headers.set("host", new URL(opts.convexSiteUrl).host);
|
|
41
|
+
headers.set("x-forwarded-host", requestUrl.host);
|
|
42
|
+
headers.set("x-forwarded-proto", requestUrl.protocol.replace(/:$/, ""));
|
|
43
|
+
headers.set("x-better-auth-forwarded-host", requestUrl.host);
|
|
44
|
+
headers.set("x-better-auth-forwarded-proto", requestUrl.protocol.replace(/:$/, ""));
|
|
41
45
|
return fetch(nextUrl, {
|
|
42
46
|
method: request.method,
|
|
43
47
|
headers,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/react-start/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/react-start/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -162,6 +162,10 @@ export declare const getNormalTestSuiteTests: (helpers: Helpers, debugTools?: De
|
|
|
162
162
|
test: () => Promise<void>;
|
|
163
163
|
};
|
|
164
164
|
"update - should support multiple where conditions under AND connector with unique field": () => Promise<void>;
|
|
165
|
+
"findMany - eq operator with null value (single condition) should use IS NULL": () => Promise<void>;
|
|
166
|
+
"findMany - eq and ne operators with null value in AND group should use IS NULL / IS NOT NULL": () => Promise<void>;
|
|
167
|
+
"findMany - eq and ne operators with null value in OR group should use IS NULL / IS NOT NULL": () => Promise<void>;
|
|
168
|
+
"update - should return updated record when where condition uses null value": () => Promise<void>;
|
|
165
169
|
};
|
|
166
170
|
export {};
|
|
167
171
|
//# sourceMappingURL=basic.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"basic.d.ts","sourceRoot":"","sources":["../../../src/test/adapter-factory/basic.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAIvE,KAAK,OAAO,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACpE,KAAK,UAAU,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC;AAKnD,eAAO,MAAM,uBAAuB,GAClC,SAAS,OAAO,EAChB,aAAa,UAAU
|
|
1
|
+
{"version":3,"file":"basic.d.ts","sourceRoot":"","sources":["../../../src/test/adapter-factory/basic.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAC;AAIvE,KAAK,OAAO,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACpE,KAAK,UAAU,GAAG;IAAE,MAAM,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAA;CAAE,CAAC;AAKnD,eAAO,MAAM,uBAAuB,GAClC,SAAS,OAAO,EAChB,aAAa,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiLxB,CAAC"}
|
|
@@ -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 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> & {
|
|
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" | "should reject case-insensitive where clauses", 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;;;;;;;;;;;;eAkNnB,CAAC;;qBAIN,CAAV;qBACqB,CAAC;
|
|
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;mBAujBrB,CAAC"}
|
|
@@ -660,5 +660,25 @@ export const convexCustomTestSuite = createTestSuite("convex-custom", {}, ({ ada
|
|
|
660
660
|
})).toEqual(user);
|
|
661
661
|
expect(typeof user.createdAt).toBe("number");
|
|
662
662
|
},
|
|
663
|
+
"should reject case-insensitive where clauses": async () => {
|
|
664
|
+
await adapter.create({
|
|
665
|
+
model: "user",
|
|
666
|
+
data: {
|
|
667
|
+
name: "foo",
|
|
668
|
+
email: "foo@bar.com",
|
|
669
|
+
},
|
|
670
|
+
});
|
|
671
|
+
await expect(adapter.findOne({
|
|
672
|
+
model: "user",
|
|
673
|
+
where: [
|
|
674
|
+
{
|
|
675
|
+
field: "email",
|
|
676
|
+
value: "FOO@BAR.COM",
|
|
677
|
+
operator: "eq",
|
|
678
|
+
mode: "insensitive",
|
|
679
|
+
},
|
|
680
|
+
],
|
|
681
|
+
})).rejects.toThrow(/mode: "insensitive"/);
|
|
682
|
+
},
|
|
663
683
|
}));
|
|
664
684
|
//# sourceMappingURL=convex-custom.js.map
|