@convex-dev/better-auth 0.10.11 → 0.10.12
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/client/adapter-utils.d.ts.map +1 -1
- package/dist/client/adapter-utils.js +1 -1
- package/dist/client/adapter-utils.js.map +1 -1
- package/dist/client/create-api.d.ts +2 -2
- package/dist/component/adapter.d.ts +2 -2
- package/dist/plugins/convex/index.d.ts.map +1 -1
- package/dist/plugins/convex/index.js +20 -3
- package/dist/plugins/convex/index.js.map +1 -1
- package/dist/plugins/cross-domain/client.d.ts.map +1 -1
- package/dist/plugins/cross-domain/client.js +17 -2
- package/dist/plugins/cross-domain/client.js.map +1 -1
- package/dist/plugins/cross-domain/index.d.ts.map +1 -1
- package/dist/plugins/cross-domain/index.js +11 -6
- package/dist/plugins/cross-domain/index.js.map +1 -1
- package/dist/react/index.d.ts.map +1 -1
- package/dist/react/index.js +20 -10
- package/dist/react/index.js.map +1 -1
- package/package.json +7 -7
- package/src/client/adapter-utils.ts +3 -2
- package/src/plugins/convex/index.ts +22 -5
- package/src/plugins/cross-domain/client.test.ts +99 -1
- package/src/plugins/cross-domain/client.ts +20 -2
- package/src/plugins/cross-domain/index.ts +16 -7
- package/src/react/index.tsx +24 -13
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter-utils.d.ts","sourceRoot":"","sources":["../../src/client/adapter-utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAa,KAAK,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,eAAe,CAAC;AAIvB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,eAAO,MAAM,qBAAqB;;;;;;;;;;4DA0BhC,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kHAY/B,CAAC;
|
|
1
|
+
{"version":3,"file":"adapter-utils.d.ts","sourceRoot":"","sources":["../../src/client/adapter-utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAa,KAAK,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,KAAK,EACV,cAAc,EACd,gBAAgB,EAChB,eAAe,EACf,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,qBAAqB,EACtB,MAAM,eAAe,CAAC;AAIvB,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAEzD,eAAO,MAAM,qBAAqB;;;;;;;;;;4DA0BhC,CAAC;AAEH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;kHAY/B,CAAC;AAkBH,eAAO,MAAM,eAAe,GAC1B,kBAAkB,kBAAkB,EACpC,OAAO,MAAM,EACb,OAAO,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,YAQ3B,CAAC;AA0JF,eAAO,MAAM,iBAAiB,GAC5B,MAAM,SAAS,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,EAEzC,KAAK,eAAe,CAAC,gBAAgB,CAAC,EACtC,QAAQ,MAAM,EACd,kBAAkB,kBAAkB,EACpC,OAAO,MAAM,EACb,OAAO,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC1B,MAAM,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,kBA6B1B,CAAC;AAIF,eAAO,MAAM,YAAY,GACvB,CAAC,SAAS,qBAAqB,CAAC,gBAAgB,CAAC,EACjD,CAAC,SAAS,cAAc,CAAC,gBAAgB,EAAE,CAAC,CAAC,EAE7C,KAAK,CAAC,GAAG,IAAI,EACb,SAAS,MAAM,EAAE,sBAYlB,CAAC;AAsKF,eAAO,MAAM,QAAQ,GACnB,GAAG,SAAS,cAAc,CAAC,gBAAgB,EAAE,CAAC,CAAC,EAC/C,CAAC,SAAS,qBAAqB,CAAC,gBAAgB,CAAC,EAEjD,KAAK,eAAe,CAAC,gBAAgB,CAAC,EACtC,QAAQ,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,EAClC,kBAAkB,kBAAkB,EACpC,MAAM,KAAK,CAAC,OAAO,oBAAoB,CAAC,GAAG;IACzC,cAAc,EAAE,iBAAiB,CAAC;CACnC,KACA,OAAO,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAiJ/B,CAAC;AAEF,eAAO,MAAM,OAAO,GAClB,GAAG,SAAS,cAAc,CAAC,gBAAgB,EAAE,CAAC,CAAC,EAC/C,CAAC,SAAS,qBAAqB,CAAC,gBAAgB,CAAC,EAEjD,KAAK,eAAe,CAAC,gBAAgB,CAAC,EACtC,QAAQ,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,EAClC,kBAAkB,kBAAkB,EACpC,MAAM,KAAK,CAAC,OAAO,oBAAoB,CAAC,KACvC,OAAO,CAAC,GAAG,GAAG,IAAI,CAUpB,CAAC"}
|
|
@@ -21,7 +21,7 @@ export const adapterArgsValidator = v.object({
|
|
|
21
21
|
offset: v.optional(v.number()),
|
|
22
22
|
});
|
|
23
23
|
const isUniqueField = (betterAuthSchema, model, field) => {
|
|
24
|
-
const fields = betterAuthSchema
|
|
24
|
+
const fields = Object.values(betterAuthSchema).find((value) => value.modelName === model)?.fields;
|
|
25
25
|
if (!fields) {
|
|
26
26
|
return false;
|
|
27
27
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"adapter-utils.js","sourceRoot":"","sources":["../../src/client/adapter-utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"adapter-utils.js","sourceRoot":"","sources":["../../src/client/adapter-utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -58,12 +58,12 @@ export declare const createApi: <Schema extends SchemaDefinition<any, any>>(sche
|
|
|
58
58
|
value: string | number | boolean | string[] | number[] | null;
|
|
59
59
|
field: string;
|
|
60
60
|
}[] | undefined;
|
|
61
|
-
model: TableNames;
|
|
62
61
|
update: {
|
|
63
62
|
[x: string]: unknown;
|
|
64
63
|
[x: number]: unknown;
|
|
65
64
|
[x: symbol]: unknown;
|
|
66
65
|
};
|
|
66
|
+
model: TableNames;
|
|
67
67
|
};
|
|
68
68
|
}, Promise<any>>;
|
|
69
69
|
updateMany: import("convex/server").RegisteredMutation<"public", {
|
|
@@ -75,12 +75,12 @@ export declare const createApi: <Schema extends SchemaDefinition<any, any>>(sche
|
|
|
75
75
|
value: string | number | boolean | string[] | number[] | null;
|
|
76
76
|
field: string;
|
|
77
77
|
}[] | undefined;
|
|
78
|
-
model: TableNames;
|
|
79
78
|
update: {
|
|
80
79
|
[x: string]: unknown;
|
|
81
80
|
[x: number]: unknown;
|
|
82
81
|
[x: symbol]: unknown;
|
|
83
82
|
};
|
|
83
|
+
model: TableNames;
|
|
84
84
|
};
|
|
85
85
|
paginationOpts: {
|
|
86
86
|
id?: number;
|
|
@@ -51,12 +51,12 @@ export declare const create: import("convex/server").RegisteredMutation<"public"
|
|
|
51
51
|
value: string | number | boolean | string[] | number[] | null;
|
|
52
52
|
field: string;
|
|
53
53
|
}[] | undefined;
|
|
54
|
-
model: import("./_generated/dataModel.js").TableNames;
|
|
55
54
|
update: {
|
|
56
55
|
[x: string]: unknown;
|
|
57
56
|
[x: number]: unknown;
|
|
58
57
|
[x: symbol]: unknown;
|
|
59
58
|
};
|
|
59
|
+
model: import("./_generated/dataModel.js").TableNames;
|
|
60
60
|
};
|
|
61
61
|
}, Promise<any>>, updateMany: import("convex/server").RegisteredMutation<"public", {
|
|
62
62
|
onUpdateHandle?: string | undefined;
|
|
@@ -67,12 +67,12 @@ export declare const create: import("convex/server").RegisteredMutation<"public"
|
|
|
67
67
|
value: string | number | boolean | string[] | number[] | null;
|
|
68
68
|
field: string;
|
|
69
69
|
}[] | undefined;
|
|
70
|
-
model: import("./_generated/dataModel.js").TableNames;
|
|
71
70
|
update: {
|
|
72
71
|
[x: string]: unknown;
|
|
73
72
|
[x: number]: unknown;
|
|
74
73
|
[x: symbol]: unknown;
|
|
75
74
|
};
|
|
75
|
+
model: import("./_generated/dataModel.js").TableNames;
|
|
76
76
|
};
|
|
77
77
|
paginationOpts: {
|
|
78
78
|
id?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/convex/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,OAAO,EACP,IAAI,EACL,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAU7D,OAAO,KAAK,EAAE,UAAU,EAAgB,MAAM,eAAe,CAAC;AAE9D,eAAO,MAAM,eAAe,eAAe,CAAC;AA8C5C,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iCAjGkE,CAAC;iCAErC,CAAC;;;;;;;;;6BAU7B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/convex/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAEV,OAAO,EACP,IAAI,EACL,MAAM,aAAa,CAAC;AACrB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAU7D,OAAO,KAAK,EAAE,UAAU,EAAgB,MAAM,eAAe,CAAC;AAE9D,eAAO,MAAM,eAAe,eAAe,CAAC;AA8C5C,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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;iCAjGkE,CAAC;iCAErC,CAAC;;;;;;;;;6BAU7B,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuhBH,CAAC"}
|
|
@@ -124,17 +124,34 @@ export const convex = (opts) => {
|
|
|
124
124
|
hooks: {
|
|
125
125
|
before: [
|
|
126
126
|
...bearer.hooks.before,
|
|
127
|
-
//
|
|
127
|
+
// In query context, no writes can succeed. No-op adapter write
|
|
128
|
+
// methods and session refresh to prevent errors from fire-and-forget
|
|
129
|
+
// side effects in Better Auth plugins (session cleanup, expired
|
|
130
|
+
// api-key deletion, org state correction, etc.).
|
|
128
131
|
{
|
|
129
132
|
matcher: (ctx) => {
|
|
130
|
-
return
|
|
131
|
-
ctx.path === "/get-session");
|
|
133
|
+
return !ctx.context.adapter.options?.isRunMutationCtx;
|
|
132
134
|
},
|
|
133
135
|
handler: createAuthMiddleware(async (ctx) => {
|
|
134
136
|
ctx.query = { ...ctx.query, disableRefresh: true };
|
|
135
137
|
ctx.context.internalAdapter.deleteSession = async (..._args) => {
|
|
136
138
|
//skip
|
|
137
139
|
};
|
|
140
|
+
const knownSafePaths = ["/api-key/list", "/api-key/get"];
|
|
141
|
+
const noopWrite = (method) => {
|
|
142
|
+
return async (..._args) => {
|
|
143
|
+
if (!knownSafePaths.includes(ctx.path)) {
|
|
144
|
+
// eslint-disable-next-line no-console
|
|
145
|
+
console.warn(`[convex-better-auth] Write operation "${method}" skipped in query context for ${ctx.path}`);
|
|
146
|
+
}
|
|
147
|
+
return 0;
|
|
148
|
+
};
|
|
149
|
+
};
|
|
150
|
+
ctx.context.adapter.create = noopWrite("create");
|
|
151
|
+
ctx.context.adapter.update = noopWrite("update");
|
|
152
|
+
ctx.context.adapter.updateMany = noopWrite("updateMany");
|
|
153
|
+
ctx.context.adapter.delete = noopWrite("delete");
|
|
154
|
+
ctx.context.adapter.deleteMany = noopWrite("deleteMany");
|
|
138
155
|
return { context: ctx };
|
|
139
156
|
}),
|
|
140
157
|
},
|
|
@@ -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 +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;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,UAAU,gBAAgB;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,QAAQ,GAAG,KAAK,GAAG,MAAM,CAAC;CACtC;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,GACb,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAkB/B;AAOD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,UA4B/D;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,UAcvC;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;;wBAUsB,UAAU,CAAC,OAAO,WAAW,CAAC;;QAIpD;;;;;;;;;;;;;;WAcG;;QAKH;;;;;;;;;;WAUG;;QAIH;;;;;;;WAOG;8BACiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
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;AACvE,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAC7D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,UAAU,gBAAgB;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,QAAQ,GAAG,KAAK,GAAG,MAAM,CAAC;CACtC;AAED,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,GACb,GAAG,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAkB/B;AAOD,wBAAgB,YAAY,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,UA4B/D;AAED,wBAAgB,SAAS,CAAC,MAAM,EAAE,MAAM,UAcvC;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;;wBAUsB,UAAU,CAAC,OAAO,WAAW,CAAC;;QAIpD;;;;;;;;;;;;;;WAcG;;QAKH;;;;;;;;;;WAUG;;QAIH;;;;;;;WAOG;8BACiB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAqGu5W,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBA7Bh7W,iBAAiB;;;CA4BlD,CAAC"}
|
|
@@ -141,9 +141,24 @@ export const crossDomainClient = (opts = {}) => {
|
|
|
141
141
|
const prevCookie = storage.getItem(cookieName);
|
|
142
142
|
const toSetCookie = getSetCookie(setCookie || "", prevCookie ?? undefined);
|
|
143
143
|
await storage.setItem(cookieName, toSetCookie);
|
|
144
|
-
// Only notify
|
|
144
|
+
// Only notify when the session token value actually changed.
|
|
145
|
+
// max-age recalculation with Date.now() causes the stored
|
|
146
|
+
// cookie JSON to always differ, so comparing values directly
|
|
147
|
+
// prevents infinite get-session polling loops.
|
|
145
148
|
if (setCookie.includes(".session_token=")) {
|
|
146
|
-
|
|
149
|
+
const parsed = parseSetCookieHeader(setCookie);
|
|
150
|
+
let prevParsed = {};
|
|
151
|
+
try {
|
|
152
|
+
prevParsed = JSON.parse(prevCookie || "{}");
|
|
153
|
+
}
|
|
154
|
+
catch {
|
|
155
|
+
// noop
|
|
156
|
+
}
|
|
157
|
+
const tokenKey = [...parsed.keys()].find((k) => k.includes("session_token"));
|
|
158
|
+
if (tokenKey &&
|
|
159
|
+
prevParsed[tokenKey]?.value !== parsed.get(tokenKey)?.value) {
|
|
160
|
+
store?.notify("$sessionSignal");
|
|
161
|
+
}
|
|
147
162
|
}
|
|
148
163
|
}
|
|
149
164
|
if (context.request.url.toString().includes("/get-session") &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/plugins/cross-domain/client.ts"],"names":[],"mappings":"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
|
|
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":"AAQA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,WAAW,GAAI,aAAa;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/plugins/cross-domain/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,eAAO,MAAM,WAAW,GAAI,aAAa;IAAE,OAAO,EAAE,MAAM,CAAA;CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAqM3D,CAAC"}
|
|
@@ -5,11 +5,13 @@ import { z } from "zod";
|
|
|
5
5
|
export const crossDomain = ({ siteUrl }) => {
|
|
6
6
|
const oneTimeToken = oneTimeTokenPlugin();
|
|
7
7
|
const rewriteCallbackURL = (callbackURL) => {
|
|
8
|
-
if (
|
|
8
|
+
if (!callbackURL) {
|
|
9
9
|
return callbackURL;
|
|
10
10
|
}
|
|
11
|
-
|
|
12
|
-
|
|
11
|
+
if (!callbackURL.startsWith("/")) {
|
|
12
|
+
return callbackURL;
|
|
13
|
+
}
|
|
14
|
+
return new URL(callbackURL, siteUrl).toString();
|
|
13
15
|
};
|
|
14
16
|
const isExpoNative = (ctx) => {
|
|
15
17
|
return ctx.headers?.has("expo-origin");
|
|
@@ -43,8 +45,9 @@ export const crossDomain = ({ siteUrl }) => {
|
|
|
43
45
|
before: [
|
|
44
46
|
{
|
|
45
47
|
matcher(ctx) {
|
|
46
|
-
return (Boolean(ctx.request?.headers.
|
|
47
|
-
ctx.headers?.
|
|
48
|
+
return (Boolean(ctx.request?.headers.has("better-auth-cookie") ||
|
|
49
|
+
ctx.headers?.has("better-auth-cookie")) &&
|
|
50
|
+
!isExpoNative(ctx));
|
|
48
51
|
},
|
|
49
52
|
handler: createAuthMiddleware(async (ctx) => {
|
|
50
53
|
const existingHeaders = (ctx.request?.headers ||
|
|
@@ -108,7 +111,9 @@ export const crossDomain = ({ siteUrl }) => {
|
|
|
108
111
|
after: [
|
|
109
112
|
{
|
|
110
113
|
matcher(ctx) {
|
|
111
|
-
return
|
|
114
|
+
return (Boolean(ctx.request?.headers.has("better-auth-cookie") ||
|
|
115
|
+
ctx.headers?.has("better-auth-cookie")) &&
|
|
116
|
+
!isExpoNative(ctx));
|
|
112
117
|
},
|
|
113
118
|
handler: createAuthMiddleware(async (ctx) => {
|
|
114
119
|
const setCookie = ctx.context.responseHeaders?.get("set-cookie");
|
|
@@ -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,EACL,kBAAkB,EAClB,oBAAoB,EACpB,YAAY,IAAI,kBAAkB,GACnC,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAExB,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,EAAE,OAAO,EAAuB,EAAE,EAAE;IAC9D,MAAM,YAAY,GAAG,kBAAkB,EAAE,CAAC;IAE1C,MAAM,kBAAkB,GAAG,CAAC,WAAoB,EAAE,EAAE;QAClD,IAAI,WAAW,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,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/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAE1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAOvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EAClB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,KAAK,iBAAiB,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAC9D,KAAK,YAAY,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;AACpD,KAAK,sBAAsB,GAAG,CAC1B,iBAAiB,GACjB,YAAY,GACZ,sBAAsB,CACzB,EAAE,CAAC;AACJ,KAAK,yBAAyB,GAAG,CAAC,YAAY,GAAG,sBAAsB,CAAC,EAAE,CAAC;AAC3E,KAAK,qBAAqB,CACxB,OAAO,SAAS,sBAAsB,GAAG,yBAAyB,IAChE,UAAU,CACZ,OAAO,gBAAgB,CACrB,sBAAsB,GAAG;IACvB,OAAO,EAAE,OAAO,CAAC;CAClB,CACF,CACF,CAAC;AACF,MAAM,MAAM,UAAU,GAClB,qBAAqB,CAAC,sBAAsB,CAAC,GAC7C,qBAAqB,CAAC,yBAAyB,CAAC,CAAC;AAIrD,KAAK,kBAAkB,GAAG;IACxB,OAAO,CAAC,UAAU,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC5C,SAAS,IAAI,IAAI,CAAC;CACnB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,MAAM,EACN,UAAU,EACV,YAAY,GACb,EAAE;IACD,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/react/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAE1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAOvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAC1D,OAAO,KAAK,EACV,YAAY,EACZ,iBAAiB,EAClB,MAAM,4BAA4B,CAAC;AACpC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAElD,KAAK,iBAAiB,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAC;AAC9D,KAAK,YAAY,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;AACpD,KAAK,sBAAsB,GAAG,CAC1B,iBAAiB,GACjB,YAAY,GACZ,sBAAsB,CACzB,EAAE,CAAC;AACJ,KAAK,yBAAyB,GAAG,CAAC,YAAY,GAAG,sBAAsB,CAAC,EAAE,CAAC;AAC3E,KAAK,qBAAqB,CACxB,OAAO,SAAS,sBAAsB,GAAG,yBAAyB,IAChE,UAAU,CACZ,OAAO,gBAAgB,CACrB,sBAAsB,GAAG;IACvB,OAAO,EAAE,OAAO,CAAC;CAClB,CACF,CACF,CAAC;AACF,MAAM,MAAM,UAAU,GAClB,qBAAqB,CAAC,sBAAsB,CAAC,GAC7C,qBAAqB,CAAC,yBAAyB,CAAC,CAAC;AAIrD,KAAK,kBAAkB,GAAG;IACxB,OAAO,CAAC,UAAU,EAAE,gBAAgB,GAAG,IAAI,CAAC;IAC5C,SAAS,IAAI,IAAI,CAAC;CACnB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,wBAAwB,CAAC,EACvC,QAAQ,EACR,MAAM,EACN,UAAU,EACV,YAAY,GACb,EAAE;IACD,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,kBAAkB,CAAC;IAC3B,UAAU,EAAE,UAAU,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC9B,2CAqCA;AAuHD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAuCG;AACH,eAAO,MAAM,YAAY,GAAI,iFAwB1B,iBAAiB,CAAC;IACnB,QAAQ,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,UAAU,EAAE,UAAU,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,KAAK,CAAC,SAAS,CAAC;IACvC,aAAa,EAAE,iBAAiB,CAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC;IACjE,WAAW,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;CAC1C,CAAC,4CA4BD,CAAC"}
|
package/dist/react/index.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import { Component, useCallback, useEffect, useMemo, useState } from "react";
|
|
2
|
+
import { Component, useCallback, useEffect, useMemo, useRef, useState } from "react";
|
|
3
3
|
import { Authenticated, ConvexProviderWithAuth, useConvexAuth, useQuery, } from "convex/react";
|
|
4
4
|
/**
|
|
5
5
|
* A wrapper React component which provides a {@link react.ConvexReactClient}
|
|
@@ -11,11 +11,15 @@ export function ConvexBetterAuthProvider({ children, client, authClient, initial
|
|
|
11
11
|
const useBetterAuth = useUseAuthFromBetterAuth(authClient, initialToken);
|
|
12
12
|
useEffect(() => {
|
|
13
13
|
(async () => {
|
|
14
|
-
|
|
14
|
+
if (typeof window === "undefined" || !window.location?.href) {
|
|
15
|
+
return;
|
|
16
|
+
}
|
|
17
|
+
const url = new URL(window.location.href);
|
|
15
18
|
const token = url.searchParams.get("ott");
|
|
16
19
|
if (token) {
|
|
17
20
|
const authClientWithCrossDomain = authClient;
|
|
18
21
|
url.searchParams.delete("ott");
|
|
22
|
+
window.history.replaceState({}, "", url);
|
|
19
23
|
const result = await authClientWithCrossDomain.crossDomain.oneTimeToken.verify({
|
|
20
24
|
token,
|
|
21
25
|
});
|
|
@@ -30,7 +34,6 @@ export function ConvexBetterAuthProvider({ children, client, authClient, initial
|
|
|
30
34
|
});
|
|
31
35
|
authClientWithCrossDomain.updateSession();
|
|
32
36
|
}
|
|
33
|
-
window.history.replaceState({}, "", url);
|
|
34
37
|
}
|
|
35
38
|
})();
|
|
36
39
|
}, [authClient]);
|
|
@@ -39,6 +42,7 @@ export function ConvexBetterAuthProvider({ children, client, authClient, initial
|
|
|
39
42
|
let initialTokenUsed = false;
|
|
40
43
|
function useUseAuthFromBetterAuth(authClient, initialToken) {
|
|
41
44
|
const [cachedToken, setCachedToken] = useState(initialTokenUsed ? null : (initialToken ?? null));
|
|
45
|
+
const pendingTokenRef = useRef(null);
|
|
42
46
|
useEffect(() => {
|
|
43
47
|
if (!initialTokenUsed) {
|
|
44
48
|
initialTokenUsed = true;
|
|
@@ -56,18 +60,24 @@ function useUseAuthFromBetterAuth(authClient, initialToken) {
|
|
|
56
60
|
if (cachedToken && !forceRefreshToken) {
|
|
57
61
|
return cachedToken;
|
|
58
62
|
}
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
+
if (!forceRefreshToken && pendingTokenRef.current) {
|
|
64
|
+
return pendingTokenRef.current;
|
|
65
|
+
}
|
|
66
|
+
pendingTokenRef.current = authClient.convex
|
|
67
|
+
.token({ fetchOptions: { throw: false } })
|
|
68
|
+
.then(({ data }) => {
|
|
63
69
|
const token = data?.token || null;
|
|
64
70
|
setCachedToken(token);
|
|
65
71
|
return token;
|
|
66
|
-
}
|
|
67
|
-
|
|
72
|
+
})
|
|
73
|
+
.catch(() => {
|
|
68
74
|
setCachedToken(null);
|
|
69
75
|
return null;
|
|
70
|
-
}
|
|
76
|
+
})
|
|
77
|
+
.finally(() => {
|
|
78
|
+
pendingTokenRef.current = null;
|
|
79
|
+
});
|
|
80
|
+
return pendingTokenRef.current;
|
|
71
81
|
},
|
|
72
82
|
// Build a new fetchAccessToken to trigger setAuth() whenever the
|
|
73
83
|
// session changes.
|
package/dist/react/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/react/index.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/react/index.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
"bugs": {
|
|
7
7
|
"url": "https://github.com/get-convex/better-auth/issues"
|
|
8
8
|
},
|
|
9
|
-
"version": "0.10.
|
|
9
|
+
"version": "0.10.12",
|
|
10
10
|
"license": "Apache-2.0",
|
|
11
11
|
"keywords": [
|
|
12
12
|
"convex",
|
|
@@ -18,22 +18,22 @@
|
|
|
18
18
|
],
|
|
19
19
|
"type": "module",
|
|
20
20
|
"scripts": {
|
|
21
|
-
"dev": "cd examples/react && npm run dev",
|
|
22
|
-
"clean": "rm -rf dist *.tsbuildinfo",
|
|
21
|
+
"dev": "npm run build && cd examples/react && npm run dev",
|
|
23
22
|
"build": "tsc --project tsconfig.build.json",
|
|
23
|
+
"build:codegen": "cd examples/react && npx convex codegen --component-dir ../../src/component && cd ../.. && npm run build",
|
|
24
|
+
"build:clean": "rm -rf dist *.tsbuildinfo && npm run build:codegen",
|
|
24
25
|
"typecheck": "tsc --noEmit && tsc -p examples/next && tsc -p examples/next/convex && tsc -p examples/react && tsc -p examples/react/convex && tsc -p examples/tanstack && tsc -p examples/tanstack/convex",
|
|
25
26
|
"lint": "eslint .",
|
|
26
27
|
"all": "run-p -r 'dev' 'test:watch'",
|
|
27
28
|
"test": "vitest run --typecheck",
|
|
28
29
|
"test:watch": "vitest --typecheck --clearScreen false",
|
|
29
30
|
"test:debug": "vitest --inspect-brk --no-file-parallelism",
|
|
31
|
+
"test:e2e": "npm run build && cd e2e && npm run test",
|
|
30
32
|
"test:coverage": "vitest run --coverage --coverage.reporter=text",
|
|
31
|
-
"
|
|
32
|
-
"prepublishOnly": "npm
|
|
33
|
-
"preversion": "npm run clean && npm ci && npm run build && run-p test lint typecheck",
|
|
33
|
+
"preversion": "npm ci && npm run build:clean && run-p test lint typecheck",
|
|
34
|
+
"prepublishOnly": "npm whoami || npm login",
|
|
34
35
|
"alpha": "npm version prerelease --preid alpha && npm publish --tag alpha && git push --follow-tags",
|
|
35
36
|
"release": "npm version patch && npm publish && git push --follow-tags",
|
|
36
|
-
"prerelease": "npm run check-npm-auth",
|
|
37
37
|
"version": "vim -c 'normal o' -c 'normal o## '$npm_package_version CHANGELOG.md && prettier -w CHANGELOG.md && git add CHANGELOG.md"
|
|
38
38
|
},
|
|
39
39
|
"files": [
|
|
@@ -62,8 +62,9 @@ const isUniqueField = (
|
|
|
62
62
|
model: string,
|
|
63
63
|
field: string
|
|
64
64
|
) => {
|
|
65
|
-
const fields =
|
|
66
|
-
|
|
65
|
+
const fields = Object.values(betterAuthSchema).find(
|
|
66
|
+
(value) => value.modelName === model
|
|
67
|
+
)?.fields;
|
|
67
68
|
if (!fields) {
|
|
68
69
|
return false;
|
|
69
70
|
}
|
|
@@ -262,13 +262,13 @@ export const convex = (opts: {
|
|
|
262
262
|
hooks: {
|
|
263
263
|
before: [
|
|
264
264
|
...bearer.hooks.before,
|
|
265
|
-
//
|
|
265
|
+
// In query context, no writes can succeed. No-op adapter write
|
|
266
|
+
// methods and session refresh to prevent errors from fire-and-forget
|
|
267
|
+
// side effects in Better Auth plugins (session cleanup, expired
|
|
268
|
+
// api-key deletion, org state correction, etc.).
|
|
266
269
|
{
|
|
267
270
|
matcher: (ctx) => {
|
|
268
|
-
return
|
|
269
|
-
!ctx.context.adapter.options?.isRunMutationCtx &&
|
|
270
|
-
ctx.path === "/get-session"
|
|
271
|
-
);
|
|
271
|
+
return !ctx.context.adapter.options?.isRunMutationCtx;
|
|
272
272
|
},
|
|
273
273
|
handler: createAuthMiddleware(async (ctx) => {
|
|
274
274
|
ctx.query = { ...ctx.query, disableRefresh: true };
|
|
@@ -277,6 +277,23 @@ export const convex = (opts: {
|
|
|
277
277
|
) => {
|
|
278
278
|
//skip
|
|
279
279
|
};
|
|
280
|
+
const knownSafePaths = ["/api-key/list", "/api-key/get"];
|
|
281
|
+
const noopWrite = (method: string) => {
|
|
282
|
+
return async (..._args: any[]) => {
|
|
283
|
+
if (!knownSafePaths.includes(ctx.path)) {
|
|
284
|
+
// eslint-disable-next-line no-console
|
|
285
|
+
console.warn(
|
|
286
|
+
`[convex-better-auth] Write operation "${method}" skipped in query context for ${ctx.path}`
|
|
287
|
+
);
|
|
288
|
+
}
|
|
289
|
+
return 0;
|
|
290
|
+
};
|
|
291
|
+
};
|
|
292
|
+
ctx.context.adapter.create = noopWrite("create") as any;
|
|
293
|
+
ctx.context.adapter.update = noopWrite("update") as any;
|
|
294
|
+
ctx.context.adapter.updateMany = noopWrite("updateMany") as any;
|
|
295
|
+
ctx.context.adapter.delete = noopWrite("delete") as any;
|
|
296
|
+
ctx.context.adapter.deleteMany = noopWrite("deleteMany") as any;
|
|
280
297
|
return { context: ctx };
|
|
281
298
|
}),
|
|
282
299
|
},
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { describe, it, expect, beforeEach } from "vitest";
|
|
1
|
+
import { describe, it, expect, beforeEach, vi } from "vitest";
|
|
2
2
|
import { getCookie, getSetCookie, parseSetCookieHeader, crossDomainClient } from "./client.js";
|
|
3
3
|
|
|
4
4
|
describe("parseSetCookieHeader", () => {
|
|
@@ -138,6 +138,18 @@ describe("crossDomainClient", () => {
|
|
|
138
138
|
return plugin.fetchPlugins[0].hooks!.onSuccess!;
|
|
139
139
|
}
|
|
140
140
|
|
|
141
|
+
function getOnSuccessHookWithStore() {
|
|
142
|
+
const plugin = crossDomainClient({ storage: mockStorage });
|
|
143
|
+
const notify = vi.fn();
|
|
144
|
+
const mockStore = {
|
|
145
|
+
notify,
|
|
146
|
+
atoms: { session: { set: () => {}, get: () => ({}) } },
|
|
147
|
+
};
|
|
148
|
+
// getActions sets the internal store reference
|
|
149
|
+
plugin.getActions({} as any, mockStore as any);
|
|
150
|
+
return { onSuccess: plugin.fetchPlugins[0].hooks!.onSuccess!, notify };
|
|
151
|
+
}
|
|
152
|
+
|
|
141
153
|
describe("getSessionData", () => {
|
|
142
154
|
it("returns null when storage is empty", () => {
|
|
143
155
|
const actions = getActions();
|
|
@@ -214,4 +226,90 @@ describe("crossDomainClient", () => {
|
|
|
214
226
|
expect(storage.get(localCacheName)).toBe(JSON.stringify(sessionData));
|
|
215
227
|
});
|
|
216
228
|
});
|
|
229
|
+
|
|
230
|
+
describe("session signal notification", () => {
|
|
231
|
+
it("notifies when session token changes", async () => {
|
|
232
|
+
const { onSuccess, notify } = getOnSuccessHookWithStore();
|
|
233
|
+
await onSuccess({
|
|
234
|
+
data: null,
|
|
235
|
+
request: { url: new URL("https://example.com/api/auth/sign-in") },
|
|
236
|
+
response: {
|
|
237
|
+
headers: new Headers({
|
|
238
|
+
"set-better-auth-cookie":
|
|
239
|
+
"better-auth.session_token=new-token; Max-Age=3600",
|
|
240
|
+
}),
|
|
241
|
+
},
|
|
242
|
+
} as any);
|
|
243
|
+
|
|
244
|
+
expect(notify).toHaveBeenCalledWith("$sessionSignal");
|
|
245
|
+
});
|
|
246
|
+
|
|
247
|
+
it("does not notify when session token value is unchanged", async () => {
|
|
248
|
+
// Pre-populate storage with existing token
|
|
249
|
+
storage.set(
|
|
250
|
+
cookieName,
|
|
251
|
+
JSON.stringify({
|
|
252
|
+
"better-auth.session_token": {
|
|
253
|
+
value: "same-token",
|
|
254
|
+
expires: new Date(Date.now() + 3600000).toISOString(),
|
|
255
|
+
},
|
|
256
|
+
})
|
|
257
|
+
);
|
|
258
|
+
|
|
259
|
+
const { onSuccess, notify } = getOnSuccessHookWithStore();
|
|
260
|
+
await onSuccess({
|
|
261
|
+
data: null,
|
|
262
|
+
request: { url: new URL("https://example.com/api/auth/get-session") },
|
|
263
|
+
response: {
|
|
264
|
+
headers: new Headers({
|
|
265
|
+
"set-better-auth-cookie":
|
|
266
|
+
"better-auth.session_token=same-token; Max-Age=3600",
|
|
267
|
+
}),
|
|
268
|
+
},
|
|
269
|
+
} as any);
|
|
270
|
+
|
|
271
|
+
expect(notify).not.toHaveBeenCalled();
|
|
272
|
+
});
|
|
273
|
+
|
|
274
|
+
it("notifies when session token value differs from stored", async () => {
|
|
275
|
+
storage.set(
|
|
276
|
+
cookieName,
|
|
277
|
+
JSON.stringify({
|
|
278
|
+
"better-auth.session_token": {
|
|
279
|
+
value: "old-token",
|
|
280
|
+
expires: new Date(Date.now() + 3600000).toISOString(),
|
|
281
|
+
},
|
|
282
|
+
})
|
|
283
|
+
);
|
|
284
|
+
|
|
285
|
+
const { onSuccess, notify } = getOnSuccessHookWithStore();
|
|
286
|
+
await onSuccess({
|
|
287
|
+
data: null,
|
|
288
|
+
request: { url: new URL("https://example.com/api/auth/get-session") },
|
|
289
|
+
response: {
|
|
290
|
+
headers: new Headers({
|
|
291
|
+
"set-better-auth-cookie":
|
|
292
|
+
"better-auth.session_token=new-token; Max-Age=3600",
|
|
293
|
+
}),
|
|
294
|
+
},
|
|
295
|
+
} as any);
|
|
296
|
+
|
|
297
|
+
expect(notify).toHaveBeenCalledWith("$sessionSignal");
|
|
298
|
+
});
|
|
299
|
+
|
|
300
|
+
it("does not notify for non-session cookies", async () => {
|
|
301
|
+
const { onSuccess, notify } = getOnSuccessHookWithStore();
|
|
302
|
+
await onSuccess({
|
|
303
|
+
data: null,
|
|
304
|
+
request: { url: new URL("https://example.com/api/auth/something") },
|
|
305
|
+
response: {
|
|
306
|
+
headers: new Headers({
|
|
307
|
+
"set-better-auth-cookie": "other_cookie=value; Max-Age=3600",
|
|
308
|
+
}),
|
|
309
|
+
},
|
|
310
|
+
} as any);
|
|
311
|
+
|
|
312
|
+
expect(notify).not.toHaveBeenCalled();
|
|
313
|
+
});
|
|
314
|
+
});
|
|
217
315
|
});
|
|
@@ -181,9 +181,27 @@ export const crossDomainClient = (
|
|
|
181
181
|
prevCookie ?? undefined
|
|
182
182
|
);
|
|
183
183
|
await storage.setItem(cookieName, toSetCookie);
|
|
184
|
-
// Only notify
|
|
184
|
+
// Only notify when the session token value actually changed.
|
|
185
|
+
// max-age recalculation with Date.now() causes the stored
|
|
186
|
+
// cookie JSON to always differ, so comparing values directly
|
|
187
|
+
// prevents infinite get-session polling loops.
|
|
185
188
|
if (setCookie.includes(".session_token=")) {
|
|
186
|
-
|
|
189
|
+
const parsed = parseSetCookieHeader(setCookie);
|
|
190
|
+
let prevParsed: Record<string, StoredCookie> = {};
|
|
191
|
+
try {
|
|
192
|
+
prevParsed = JSON.parse(prevCookie || "{}");
|
|
193
|
+
} catch {
|
|
194
|
+
// noop
|
|
195
|
+
}
|
|
196
|
+
const tokenKey = [...parsed.keys()].find((k) =>
|
|
197
|
+
k.includes("session_token")
|
|
198
|
+
);
|
|
199
|
+
if (
|
|
200
|
+
tokenKey &&
|
|
201
|
+
prevParsed[tokenKey]?.value !== parsed.get(tokenKey)?.value
|
|
202
|
+
) {
|
|
203
|
+
store?.notify("$sessionSignal");
|
|
204
|
+
}
|
|
187
205
|
}
|
|
188
206
|
}
|
|
189
207
|
|
|
@@ -12,11 +12,13 @@ export const crossDomain = ({ siteUrl }: { siteUrl: string }) => {
|
|
|
12
12
|
const oneTimeToken = oneTimeTokenPlugin();
|
|
13
13
|
|
|
14
14
|
const rewriteCallbackURL = (callbackURL?: string) => {
|
|
15
|
-
if (
|
|
15
|
+
if (!callbackURL) {
|
|
16
16
|
return callbackURL;
|
|
17
17
|
}
|
|
18
|
-
|
|
19
|
-
|
|
18
|
+
if (!callbackURL.startsWith("/")) {
|
|
19
|
+
return callbackURL;
|
|
20
|
+
}
|
|
21
|
+
return new URL(callbackURL, siteUrl).toString();
|
|
20
22
|
};
|
|
21
23
|
|
|
22
24
|
const isExpoNative = (ctx: { headers?: Headers }) => {
|
|
@@ -54,9 +56,10 @@ export const crossDomain = ({ siteUrl }: { siteUrl: string }) => {
|
|
|
54
56
|
matcher(ctx) {
|
|
55
57
|
return (
|
|
56
58
|
Boolean(
|
|
57
|
-
ctx.request?.headers.
|
|
58
|
-
ctx.headers?.
|
|
59
|
-
) &&
|
|
59
|
+
ctx.request?.headers.has("better-auth-cookie") ||
|
|
60
|
+
ctx.headers?.has("better-auth-cookie")
|
|
61
|
+
) &&
|
|
62
|
+
!isExpoNative(ctx)
|
|
60
63
|
);
|
|
61
64
|
},
|
|
62
65
|
handler: createAuthMiddleware(async (ctx) => {
|
|
@@ -129,7 +132,13 @@ export const crossDomain = ({ siteUrl }: { siteUrl: string }) => {
|
|
|
129
132
|
after: [
|
|
130
133
|
{
|
|
131
134
|
matcher(ctx) {
|
|
132
|
-
return
|
|
135
|
+
return (
|
|
136
|
+
Boolean(
|
|
137
|
+
ctx.request?.headers.has("better-auth-cookie") ||
|
|
138
|
+
ctx.headers?.has("better-auth-cookie")
|
|
139
|
+
) &&
|
|
140
|
+
!isExpoNative(ctx)
|
|
141
|
+
);
|
|
133
142
|
},
|
|
134
143
|
handler: createAuthMiddleware(async (ctx) => {
|
|
135
144
|
const setCookie = ctx.context.responseHeaders?.get("set-cookie");
|
package/src/react/index.tsx
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { PropsWithChildren, ReactNode } from "react";
|
|
2
|
-
import { Component, useCallback, useEffect, useMemo, useState } from "react";
|
|
2
|
+
import { Component, useCallback, useEffect, useMemo, useRef, useState } from "react";
|
|
3
3
|
import type { AuthTokenFetcher } from "convex/browser";
|
|
4
4
|
import {
|
|
5
5
|
Authenticated,
|
|
@@ -64,12 +64,16 @@ export function ConvexBetterAuthProvider({
|
|
|
64
64
|
const useBetterAuth = useUseAuthFromBetterAuth(authClient, initialToken);
|
|
65
65
|
useEffect(() => {
|
|
66
66
|
(async () => {
|
|
67
|
-
|
|
67
|
+
if (typeof window === "undefined" || !window.location?.href) {
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
const url = new URL(window.location.href);
|
|
68
71
|
const token = url.searchParams.get("ott");
|
|
69
72
|
if (token) {
|
|
70
73
|
const authClientWithCrossDomain =
|
|
71
74
|
authClient as AuthClientWithPlugins<PluginsWithCrossDomain>;
|
|
72
75
|
url.searchParams.delete("ott");
|
|
76
|
+
window.history.replaceState({}, "", url);
|
|
73
77
|
const result =
|
|
74
78
|
await authClientWithCrossDomain.crossDomain.oneTimeToken.verify({
|
|
75
79
|
token,
|
|
@@ -85,7 +89,6 @@ export function ConvexBetterAuthProvider({
|
|
|
85
89
|
});
|
|
86
90
|
authClientWithCrossDomain.updateSession();
|
|
87
91
|
}
|
|
88
|
-
window.history.replaceState({}, "", url);
|
|
89
92
|
}
|
|
90
93
|
})();
|
|
91
94
|
}, [authClient]);
|
|
@@ -105,6 +108,7 @@ function useUseAuthFromBetterAuth(
|
|
|
105
108
|
const [cachedToken, setCachedToken] = useState<string | null>(
|
|
106
109
|
initialTokenUsed ? null : (initialToken ?? null)
|
|
107
110
|
);
|
|
111
|
+
const pendingTokenRef = useRef<Promise<string | null> | null>(null);
|
|
108
112
|
useEffect(() => {
|
|
109
113
|
if (!initialTokenUsed) {
|
|
110
114
|
initialTokenUsed = true;
|
|
@@ -129,17 +133,24 @@ function useUseAuthFromBetterAuth(
|
|
|
129
133
|
if (cachedToken && !forceRefreshToken) {
|
|
130
134
|
return cachedToken;
|
|
131
135
|
}
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
fetchOptions: { throw: false },
|
|
135
|
-
});
|
|
136
|
-
const token = data?.token || null;
|
|
137
|
-
setCachedToken(token);
|
|
138
|
-
return token;
|
|
139
|
-
} catch {
|
|
140
|
-
setCachedToken(null);
|
|
141
|
-
return null;
|
|
136
|
+
if (!forceRefreshToken && pendingTokenRef.current) {
|
|
137
|
+
return pendingTokenRef.current;
|
|
142
138
|
}
|
|
139
|
+
pendingTokenRef.current = authClient.convex
|
|
140
|
+
.token({ fetchOptions: { throw: false } })
|
|
141
|
+
.then(({ data }) => {
|
|
142
|
+
const token = data?.token || null;
|
|
143
|
+
setCachedToken(token);
|
|
144
|
+
return token;
|
|
145
|
+
})
|
|
146
|
+
.catch(() => {
|
|
147
|
+
setCachedToken(null);
|
|
148
|
+
return null;
|
|
149
|
+
})
|
|
150
|
+
.finally(() => {
|
|
151
|
+
pendingTokenRef.current = null;
|
|
152
|
+
});
|
|
153
|
+
return pendingTokenRef.current;
|
|
143
154
|
},
|
|
144
155
|
// Build a new fetchAccessToken to trigger setAuth() whenever the
|
|
145
156
|
// session changes.
|