@convex-dev/better-auth 0.12.0 → 0.12.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/client/adapter.d.ts +0 -1
- package/dist/client/adapter.d.ts.map +1 -1
- package/dist/client/adapter.js.map +1 -1
- package/dist/client/create-client.d.ts +0 -2
- package/dist/client/create-client.d.ts.map +1 -1
- package/dist/client/create-client.js.map +1 -1
- package/dist/component/_generated/api.d.ts +0 -2
- package/dist/component/_generated/api.d.ts.map +1 -1
- package/dist/component/_generated/api.js.map +1 -1
- package/dist/component/_generated/component.d.ts +0 -3
- package/dist/component/_generated/component.d.ts.map +1 -1
- package/dist/plugins/cross-domain/client.d.ts.map +1 -1
- package/dist/plugins/cross-domain/client.js +21 -1
- package/dist/plugins/cross-domain/client.js.map +1 -1
- package/dist/utils/index.d.ts.map +1 -1
- package/dist/utils/index.js +1 -0
- package/dist/utils/index.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +2 -3
- package/src/client/adapter.test.ts +225 -2
- package/src/client/adapter.ts +0 -1
- package/src/client/create-client.ts +0 -2
- package/src/component/_generated/api.ts +0 -2
- package/src/component/_generated/component.ts +0 -3
- package/src/plugins/cross-domain/client.test.ts +26 -7
- package/src/plugins/cross-domain/client.ts +28 -2
- package/src/utils/index.ts +1 -0
- package/src/version.ts +1 -1
- package/dist/component/adapterTest.d.ts +0 -3
- package/dist/component/adapterTest.d.ts.map +0 -1
- package/dist/component/adapterTest.js +0 -202
- package/dist/component/adapterTest.js.map +0 -1
- package/src/component/adapterTest.ts +0 -275
|
@@ -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;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,
|
|
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,UAavC;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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAmIg6V,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;qBA7Bz7V,iBAAiB;;;CA4BlD,CAAC"}
|
|
@@ -154,7 +154,27 @@ export const crossDomainClient = (opts = {}) => {
|
|
|
154
154
|
const data = context.data;
|
|
155
155
|
storage.setItem(localCacheName, JSON.stringify(data));
|
|
156
156
|
if (data === null) {
|
|
157
|
-
|
|
157
|
+
// Preserve non-session cookies (e.g. two_factor) when
|
|
158
|
+
// get-session returns null during 2FA pending state.
|
|
159
|
+
// Previously this unconditionally set cookieName to "{}",
|
|
160
|
+
// which wiped the two_factor challenge token needed for
|
|
161
|
+
// verifyTotp in cross-domain setups.
|
|
162
|
+
const prev = storage.getItem(cookieName);
|
|
163
|
+
try {
|
|
164
|
+
const parsed = JSON.parse(prev || "{}");
|
|
165
|
+
const preserved = {};
|
|
166
|
+
for (const [key, val] of Object.entries(parsed)) {
|
|
167
|
+
if (!key.includes("session_token") &&
|
|
168
|
+
!key.includes("session_data") &&
|
|
169
|
+
!key.includes("convex_jwt")) {
|
|
170
|
+
preserved[key] = val;
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
storage.setItem(cookieName, JSON.stringify(preserved));
|
|
174
|
+
}
|
|
175
|
+
catch {
|
|
176
|
+
storage.setItem(cookieName, "{}");
|
|
177
|
+
}
|
|
158
178
|
}
|
|
159
179
|
}
|
|
160
180
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"client.js","sourceRoot":"","sources":["../../../src/plugins/cross-domain/client.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAG3D,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAO3C,MAAM,UAAU,YAAY,CAAC,MAAc,EAAE,UAAmB;IAC9D,MAAM,MAAM,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAC;IAC5C,IAAI,WAAW,GAAiC,EAAE,CAAC;IACnD,MAAM,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,EAAE;QAC7B,MAAM,SAAS,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;QACpC,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,CAAC;QACjC,MAAM,OAAO,GAAG,SAAS;YACvB,CAAC,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC7B,CAAC,CAAC,MAAM;gBACN,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;gBAC9C,CAAC,CAAC,IAAI,CAAC;QACX,WAAW,CAAC,GAAG,CAAC,GAAG;YACjB,KAAK,EAAE,MAAM,CAAC,OAAO,CAAC;YACtB,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI;SAChD,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,IAAI,UAAU,EAAE,CAAC;QACf,IAAI,CAAC;YACH,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;YAChD,WAAW,GAAG;gBACZ,GAAG,gBAAgB;gBACnB,GAAG,WAAW;aACf,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC;YACP,EAAE;QACJ,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;AACrC,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,MAAc;IACtC,IAAI,MAAM,GAAG,EAAkC,CAAC;IAChD,IAAI,CAAC;QACH,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAiC,CAAC;IAC9D,CAAC;IAAC,MAAM,CAAC;QACP,OAAO;IACT,CAAC;IACD,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SAC1B,MAAM,
|
|
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/utils/index.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EACV,YAAY,EACZ,mBAAmB,EACnB,iBAAiB,EACjB,gBAAgB,EAChB,gBAAgB,EAChB,kBAAkB,EAClB,eAAe,EAChB,MAAM,eAAe,CAAC;AAGvB,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,yBAAyB,CAAC;AACnD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,MAAM,oBAAoB,GAC5B,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,GAC7B,CAAC,CACC,OAAO,CAAC,EAAE,OAAO,KAEf,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,GAC7B,OAAO,CAAC,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,CAAC,CAAC,CAAC;AAEhD,KAAK,gBAAgB,GAAG;IACtB,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;IACjD,OAAO,EAAE;QACP,OAAO,CAAC,EAAE,aAAa,CAAC;QACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,cAAc,CAAC,EAAE,oBAAoB,CAAC;QACtC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;KACxB,CAAC;IACF,QAAQ,EAAE,OAAO,CAAC;QAChB,OAAO,EAAE;YACP,cAAc,CAAC,EAAE,oBAAoB,CAAC;YACtC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;SACxB,CAAC;KACH,CAAC,CAAC;CACJ,CAAC;AAEF,MAAM,MAAM,UAAU,CACpB,SAAS,SAAS,gBAAgB,EAClC,CAAC,SAAS,gBAAgB,GAAG,gBAAgB,IAC3C,CAAC,GAAG,EAAE,UAAU,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;AAEtC,MAAM,MAAM,aAAa,CAAC,CAAC,SAAS,mBAAmB,IAAI,iBAAiB,CAC1E,UAAU,EACV,UAAU,GAAG,QAAQ,EACrB,CAAC,CACF,CAAC;AAEF,MAAM,MAAM,UAAU,CAAC,SAAS,SAAS,gBAAgB,GAAG,gBAAgB,IACxE,eAAe,CAAC,SAAS,CAAC,GAC1B,kBAAkB,CAAC,SAAS,CAAC,GAC7B,gBAAgB,CAAC,SAAS,CAAC,CAAC;AAEhC,MAAM,MAAM,cAAc,CAAC,SAAS,SAAS,gBAAgB,IAAI,CAC7D,kBAAkB,CAAC,SAAS,CAAC,GAC7B,gBAAgB,CAAC,SAAS,CAAC,CAC9B,GAAG;IACF,WAAW,EAAE,kBAAkB,CAAC,SAAS,CAAC,CAAC,aAAa,CAAC,CAAC;CAC3D,CAAC;AAEF,eAAO,MAAM,UAAU,GAAI,SAAS,SAAS,gBAAgB,EAC3D,KAAK,UAAU,CAAC,SAAS,CAAC,KACzB,GAAG,IAAI,eAAe,CAAC,SAAS,CAElC,CAAC;AAEF,eAAO,MAAM,aAAa,GAAI,SAAS,SAAS,gBAAgB,EAC9D,KAAK,UAAU,CAAC,SAAS,CAAC,KACzB,GAAG,IAAI,kBAAkB,CAAC,SAAS,CAErC,CAAC;AAEF,eAAO,MAAM,WAAW,GAAI,SAAS,SAAS,gBAAgB,EAC5D,KAAK,UAAU,CAAC,SAAS,CAAC,KACzB,GAAG,IAAI,gBAAgB,CAAC,SAAS,CAEnC,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,SAAS,SAAS,gBAAgB,EACjE,KAAK,UAAU,CAAC,SAAS,CAAC,KACzB,GAAG,IAAI,cAAc,CAAC,SAAS,CAEjC,CAAC;AAEF,eAAO,MAAM,eAAe,GAAI,SAAS,SAAS,gBAAgB,EAChE,KAAK,UAAU,CAAC,SAAS,CAAC,KACzB,eAAe,CAAC,SAAS,CAK3B,CAAC;AAEF,eAAO,MAAM,kBAAkB,GAAI,SAAS,SAAS,gBAAgB,EACnE,KAAK,UAAU,CAAC,SAAS,CAAC,KACzB,kBAAkB,CAAC,SAAS,CAK9B,CAAC;AAEF,eAAO,MAAM,gBAAgB,GAAI,SAAS,SAAS,gBAAgB,EACjE,KAAK,UAAU,CAAC,SAAS,CAAC,KACzB,gBAAgB,CAAC,SAAS,CAK5B,CAAC;AAEF,eAAO,MAAM,qBAAqB,GAAI,SAAS,SAAS,gBAAgB,EACtE,KAAK,UAAU,CAAC,SAAS,CAAC,KACzB,cAAc,CAAC,SAAS,CAK1B,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE;QACT,OAAO,EAAE,OAAO,CAAC;QACjB,0BAA0B,CAAC,EAAE,MAAM,CAAC;QACpC,WAAW,EAAE,CAAC,KAAK,EAAE,OAAO,KAAK,OAAO,CAAC;KAC1C,CAAC;CACH,CAAC;AAEF,eAAO,MAAM,QAAQ,GACnB,SAAS,MAAM,EACf,SAAS,OAAO,EAChB,OAAO,eAAe;;;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/index.js
CHANGED
|
@@ -39,6 +39,7 @@ export const requireRunMutationCtx = (ctx) => {
|
|
|
39
39
|
return ctx;
|
|
40
40
|
};
|
|
41
41
|
export const getToken = async (siteUrl, headers, opts) => {
|
|
42
|
+
headers.set("host", new URL(siteUrl).host);
|
|
42
43
|
const fetchToken = async () => {
|
|
43
44
|
const basePath = opts?.basePath
|
|
44
45
|
? (opts.basePath.startsWith("/") ? opts.basePath : `/${opts.basePath}`)
|
package/dist/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAUvD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAmD7B,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,GAA0B,EACS,EAAE;IACrC,OAAO,IAAI,IAAI,GAAG,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,GAA0B,EACY,EAAE;IACxC,OAAO,IAAI,IAAI,GAAG,IAAI,WAAW,IAAI,GAAG,CAAC;AAC3C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,WAAW,GAAG,CACzB,GAA0B,EACU,EAAE;IACtC,OAAO,WAAW,IAAI,GAAG,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,GAA0B,EACQ,EAAE;IACpC,OAAO,aAAa,IAAI,GAAG,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,GAA0B,EACE,EAAE;IAC9B,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;QACrB,MAAM,IAAI,KAAK,CAAC,wBAAwB,CAAC,CAAC;IAC5C,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAChC,GAA0B,EACK,EAAE;IACjC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CAAC,2BAA2B,CAAC,CAAC;IAC/C,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,GAA0B,EACG,EAAE;IAC/B,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,GAA0B,EACC,EAAE;IAC7B,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACzD,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAaF,MAAM,CAAC,MAAM,QAAQ,GAAG,KAAK,EAC3B,OAAe,EACf,OAAgB,EAChB,IAAsB,EACtB,EAAE;IACF,MAAM,UAAU,GAAG,KAAK,IAAI,EAAE;QAC5B,MAAM,QAAQ,GAAG,IAAI,EAAE,QAAQ;YAC7B,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;iBAClE,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;YACxB,CAAC,CAAC,WAAW,CAAC;QAChB,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,WAAW,CAChC,GAAG,QAAQ,eAAe,EAC1B;YACE,OAAO,EAAE,OAAO;YAChB,OAAO;SACR,CACF,CAAC;QACF,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;IAC/C,CAAC,CAAC;IACF,IAAI,CAAC,IAAI,EAAE,QAAQ,EAAE,OAAO,IAAI,IAAI,CAAC,YAAY,EAAE,CAAC;QAClD,OAAO,MAAM,UAAU,EAAE,CAAC;IAC5B,CAAC;IACD,MAAM,KAAK,GAAG,gBAAgB,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QACnD,UAAU,EAAE,eAAe;QAC3B,YAAY,EAAE,IAAI,EAAE,YAAY;KACjC,CAAC,CAAC;IACH,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,OAAO,MAAM,UAAU,EAAE,CAAC;IAC5B,CAAC;IACD,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACrC,MAAM,GAAG,GAAG,MAAM,EAAE,GAAG,CAAC;QACxB,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC;QACpD,MAAM,SAAS,GAAG,GAAG;YACnB,CAAC,CAAC,GAAG,GAAG,GAAG,GAAG,CAAC,IAAI,EAAE,QAAQ,EAAE,0BAA0B,IAAI,EAAE,CAAC;YAChE,CAAC,CAAC,IAAI,CAAC;QACT,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC;QACnC,CAAC;IACH,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,sCAAsC;QACtC,OAAO,CAAC,KAAK,CAAC,oBAAoB,EAAE,KAAK,CAAC,CAAC;IAC7C,CAAC;IACD,OAAO,MAAM,UAAU,EAAE,CAAC;AAC5B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,cAA4B,EAAE,EAAE;IACxD,MAAM,gBAAgB,GACpB,MAAM,IAAI,cAAc,IAAI,cAAc,CAAC,IAAI,EAAE,UAAU,CAAC,YAAY,CAAC;QACvE,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,CAAC,CAAC,SAAS,CAAC;IAEhB,IAAI,CAAC,gBAAgB,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CACvB,gBAAgB,EAAE,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,SAAS,EAAE,EAAE,CAAC,IAAI,IAAI,CACjE,CAAC;IACF,MAAM,UAAU,GAAG;QACjB,GAAG,MAAM;QACT,UAAU,EAAE,IAAI,MAAM,CAAC,UAAU,GAAG;QACpC,SAAS,EAAE,IAAI,MAAM,CAAC,SAAS,GAAG;KAC5B,CAAC;IACT,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export declare const VERSION = "0.
|
|
1
|
+
export declare const VERSION = "0.12.0";
|
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
package/dist/version.js
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
|
-
export const VERSION = "0.12.
|
|
1
|
+
export const VERSION = "0.12.1";
|
|
2
2
|
//# sourceMappingURL=version.js.map
|
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.12.
|
|
9
|
+
"version": "0.12.1",
|
|
10
10
|
"license": "Apache-2.0",
|
|
11
11
|
"keywords": [
|
|
12
12
|
"convex",
|
|
@@ -30,10 +30,9 @@
|
|
|
30
30
|
"test:e2e": "npm run build && cd e2e && npm run test",
|
|
31
31
|
"test:coverage": "vitest run --coverage --coverage.reporter=text",
|
|
32
32
|
"preversion": "npm ci && npm run build:clean && npm run test && npm run lint && npm run typecheck",
|
|
33
|
-
"prepublishOnly": "node scripts/sync-version.mjs",
|
|
34
33
|
"alpha": "npm version prerelease --preid alpha && npm publish --tag alpha && git push --follow-tags",
|
|
35
34
|
"release": "npm version patch && npm publish && git push --follow-tags",
|
|
36
|
-
"version": "(npm whoami || npm login) && vim -c 'normal o' -c 'normal o## '$npm_package_version CHANGELOG.md && prettier -w CHANGELOG.md && git add CHANGELOG.md"
|
|
35
|
+
"version": "(npm whoami || npm login) && node scripts/sync-version.mjs && vim -c 'normal o' -c 'normal o## '$npm_package_version CHANGELOG.md && prettier -w CHANGELOG.md && git add CHANGELOG.md src/version.ts"
|
|
37
36
|
},
|
|
38
37
|
"files": [
|
|
39
38
|
"dist",
|
|
@@ -2,8 +2,29 @@
|
|
|
2
2
|
|
|
3
3
|
import { describe, it } from "vitest";
|
|
4
4
|
import { convexTest } from "convex-test";
|
|
5
|
-
import {
|
|
5
|
+
import {
|
|
6
|
+
testAdapter,
|
|
7
|
+
transactionsTestSuite,
|
|
8
|
+
uuidTestSuite,
|
|
9
|
+
} from "@better-auth/test-utils/adapter";
|
|
10
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
11
|
+
import { internal } from "../component/_generated/api.js";
|
|
6
12
|
import schema from "../component/testProfiles/schema.profile-plugin-table.js";
|
|
13
|
+
import { createClient } from "./index.js";
|
|
14
|
+
import type { DataModel } from "../component/_generated/dataModel.js";
|
|
15
|
+
import type { ComponentApi } from "../component/_generated/component.js";
|
|
16
|
+
import {
|
|
17
|
+
additionalFieldsAuthFlowTestSuite,
|
|
18
|
+
additionalFieldsNormalTestSuite,
|
|
19
|
+
convexCustomTestSuite,
|
|
20
|
+
coreAuthFlowTestSuite,
|
|
21
|
+
coreNormalTestSuite,
|
|
22
|
+
multiJoinsMissingRowsTestSuite,
|
|
23
|
+
pluginTableNormalTestSuite,
|
|
24
|
+
renameFieldAndJoinTestSuite,
|
|
25
|
+
renameModelUserCustomTestSuite,
|
|
26
|
+
renameModelUserTableTestSuite,
|
|
27
|
+
} from "../test/adapter-factory/index.js";
|
|
7
28
|
|
|
8
29
|
const MIN_NODE_MAJOR = 24;
|
|
9
30
|
const currentNodeMajor = Number.parseInt(
|
|
@@ -11,6 +32,85 @@ const currentNodeMajor = Number.parseInt(
|
|
|
11
32
|
10
|
|
12
33
|
);
|
|
13
34
|
|
|
35
|
+
const NORMAL_DISABLED_TESTS = [
|
|
36
|
+
// dynamic-schema-plugin-table/dynamic-schema-additional-fields:
|
|
37
|
+
// Convex validators are static in this harness, so runtime schema mutation
|
|
38
|
+
// tests are validated in dedicated profiles instead.
|
|
39
|
+
"create - should apply default values to fields",
|
|
40
|
+
"create - should return null for nullable foreign keys",
|
|
41
|
+
"create - should support arrays",
|
|
42
|
+
"create - should support json",
|
|
43
|
+
// convex-id-generation:
|
|
44
|
+
// Convex controls generated IDs at write time.
|
|
45
|
+
"create - should use generateId if provided",
|
|
46
|
+
// offset-unsupported:
|
|
47
|
+
// Convex adapter rejects offset pagination.
|
|
48
|
+
"findMany - should be able to perform a complex limited join",
|
|
49
|
+
"findMany - should find many models with limit and offset",
|
|
50
|
+
"findMany - should find many models with offset",
|
|
51
|
+
"findMany - should find many models with sortBy and limit and offset",
|
|
52
|
+
"findMany - should find many models with sortBy and limit and offset and where",
|
|
53
|
+
"findMany - should find many models with sortBy and offset",
|
|
54
|
+
"findMany - should find many with both one-to-one and one-to-many joins",
|
|
55
|
+
"findMany - should find many with join and offset",
|
|
56
|
+
"findMany - should find many with join, where, limit, and offset",
|
|
57
|
+
"findMany - should find many with one-to-one join",
|
|
58
|
+
"findMany - should handle mixed joins correctly when some are missing",
|
|
59
|
+
"findMany - should return empty array when base records don't exist with joins",
|
|
60
|
+
"findMany - should return null for one-to-one join when joined records don't exist",
|
|
61
|
+
"findMany - should select fields with one-to-one join",
|
|
62
|
+
// profile-specific coverage:
|
|
63
|
+
// These are intentionally exercised in dedicated profile suites.
|
|
64
|
+
"findOne - backwards join with modified field name (session base, users-table join)",
|
|
65
|
+
"findOne - multiple joins should return result even when some joined tables have no matching rows",
|
|
66
|
+
"findOne - should find a model with modified field name",
|
|
67
|
+
"findOne - should find a model with modified model name",
|
|
68
|
+
"findOne - should join a model with modified field name",
|
|
69
|
+
"findOne - should not apply defaultValue if value not found",
|
|
70
|
+
"findOne - should return an object for one-to-one joins",
|
|
71
|
+
"findOne - should return null for failed base model lookup that has joins",
|
|
72
|
+
"findOne - should return null for one-to-one join when joined record doesn't exist",
|
|
73
|
+
"findOne - should select fields with one-to-one join",
|
|
74
|
+
"findOne - should work with both one-to-one and one-to-many joins",
|
|
75
|
+
] as const;
|
|
76
|
+
|
|
77
|
+
const UUID_SUITE_TESTS = ["init - tests"] as const;
|
|
78
|
+
|
|
79
|
+
const toDisableMap = (testNames: readonly string[]) =>
|
|
80
|
+
Object.fromEntries(testNames.map((testName) => [testName, true]));
|
|
81
|
+
|
|
82
|
+
const toEnableOnlyMap = (testNames: readonly string[]) => ({
|
|
83
|
+
ALL: true,
|
|
84
|
+
...Object.fromEntries(testNames.map((testName) => [testName, false])),
|
|
85
|
+
});
|
|
86
|
+
|
|
87
|
+
const getOverrideBetterAuthOptions = (
|
|
88
|
+
opts: BetterAuthOptions
|
|
89
|
+
): BetterAuthOptions => ({
|
|
90
|
+
...opts,
|
|
91
|
+
advanced: {
|
|
92
|
+
...opts.advanced,
|
|
93
|
+
database: {
|
|
94
|
+
...opts.advanced?.database,
|
|
95
|
+
generateId: "uuid",
|
|
96
|
+
},
|
|
97
|
+
},
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
type AdapterModule = ComponentApi["adapter"];
|
|
101
|
+
type TestProfileName =
|
|
102
|
+
| "adapterAdditionalFields"
|
|
103
|
+
| "adapterPluginTable"
|
|
104
|
+
| "adapterRenameField"
|
|
105
|
+
| "adapterRenameUserCustom"
|
|
106
|
+
| "adapterRenameUserTable"
|
|
107
|
+
| "adapterOrganizationJoins";
|
|
108
|
+
|
|
109
|
+
type InternalWithTestProfiles = {
|
|
110
|
+
adapter: AdapterModule;
|
|
111
|
+
testProfiles: Record<TestProfileName, AdapterModule>;
|
|
112
|
+
};
|
|
113
|
+
|
|
14
114
|
if (currentNodeMajor < MIN_NODE_MAJOR) {
|
|
15
115
|
describe("Better Auth Adapter Tests", () => {
|
|
16
116
|
it.skip(
|
|
@@ -21,6 +121,129 @@ if (currentNodeMajor < MIN_NODE_MAJOR) {
|
|
|
21
121
|
} else {
|
|
22
122
|
describe("Better Auth Adapter Tests", async () => {
|
|
23
123
|
const t = convexTest(schema, import.meta.glob("../component/**/*.*s"));
|
|
24
|
-
|
|
124
|
+
|
|
125
|
+
// Bridge `convexAdapter`'s ctx surface to `convexTest`. Each adapter call
|
|
126
|
+
// re-enters convex-test's AsyncLocalStorage frame via t.query / t.mutation,
|
|
127
|
+
// which is required by convex-test ≥0.0.45. State persists across calls
|
|
128
|
+
// because the test database lives on `t`, not in ALS.
|
|
129
|
+
const wrappedCtx = {
|
|
130
|
+
runQuery: t.query.bind(t),
|
|
131
|
+
runMutation: t.mutation.bind(t),
|
|
132
|
+
} as any;
|
|
133
|
+
|
|
134
|
+
const internalWithTestProfiles =
|
|
135
|
+
internal as unknown as InternalWithTestProfiles;
|
|
136
|
+
const profileApi = (name: TestProfileName): { adapter: AdapterModule } => ({
|
|
137
|
+
adapter: internalWithTestProfiles.testProfiles[name],
|
|
138
|
+
});
|
|
139
|
+
|
|
140
|
+
const baseProfileClient = createClient<DataModel>(
|
|
141
|
+
{ adapter: internalWithTestProfiles.adapter },
|
|
142
|
+
{ verbose: false }
|
|
143
|
+
);
|
|
144
|
+
const additionalFieldsProfileClient = createClient<DataModel>(
|
|
145
|
+
profileApi("adapterAdditionalFields"),
|
|
146
|
+
{ verbose: false }
|
|
147
|
+
);
|
|
148
|
+
const pluginTableProfileClient = createClient<DataModel>(
|
|
149
|
+
profileApi("adapterPluginTable"),
|
|
150
|
+
{ verbose: false }
|
|
151
|
+
);
|
|
152
|
+
const renameFieldProfileClient = createClient<DataModel>(
|
|
153
|
+
profileApi("adapterRenameField"),
|
|
154
|
+
{ verbose: false }
|
|
155
|
+
);
|
|
156
|
+
const renameUserCustomProfileClient = createClient<DataModel>(
|
|
157
|
+
profileApi("adapterRenameUserCustom"),
|
|
158
|
+
{ verbose: false }
|
|
159
|
+
);
|
|
160
|
+
const renameUserTableProfileClient = createClient<DataModel>(
|
|
161
|
+
profileApi("adapterRenameUserTable"),
|
|
162
|
+
{ verbose: false }
|
|
163
|
+
);
|
|
164
|
+
const organizationJoinsProfileClient = createClient<DataModel>(
|
|
165
|
+
profileApi("adapterOrganizationJoins"),
|
|
166
|
+
{ verbose: false }
|
|
167
|
+
);
|
|
168
|
+
|
|
169
|
+
const noMigrations = () => {
|
|
170
|
+
// Convex schema is static — no migrations needed.
|
|
171
|
+
};
|
|
172
|
+
|
|
173
|
+
const { execute: executeBaseProfile } = await testAdapter({
|
|
174
|
+
adapter: () => baseProfileClient.adapter(wrappedCtx),
|
|
175
|
+
runMigrations: noMigrations,
|
|
176
|
+
overrideBetterAuthOptions: getOverrideBetterAuthOptions,
|
|
177
|
+
tests: [
|
|
178
|
+
coreNormalTestSuite({
|
|
179
|
+
disableTests: toDisableMap(NORMAL_DISABLED_TESTS),
|
|
180
|
+
}),
|
|
181
|
+
uuidTestSuite({
|
|
182
|
+
disableTests: toEnableOnlyMap(UUID_SUITE_TESTS),
|
|
183
|
+
}),
|
|
184
|
+
transactionsTestSuite({ disableTests: { ALL: true } }),
|
|
185
|
+
coreAuthFlowTestSuite(),
|
|
186
|
+
convexCustomTestSuite(),
|
|
187
|
+
],
|
|
188
|
+
});
|
|
189
|
+
|
|
190
|
+
const { execute: executeAdditionalFieldsProfile } = await testAdapter({
|
|
191
|
+
adapter: () => additionalFieldsProfileClient.adapter(wrappedCtx),
|
|
192
|
+
runMigrations: noMigrations,
|
|
193
|
+
overrideBetterAuthOptions: getOverrideBetterAuthOptions,
|
|
194
|
+
prefixTests: "profile:additional-fields",
|
|
195
|
+
tests: [
|
|
196
|
+
additionalFieldsNormalTestSuite(),
|
|
197
|
+
additionalFieldsAuthFlowTestSuite(),
|
|
198
|
+
],
|
|
199
|
+
});
|
|
200
|
+
|
|
201
|
+
const { execute: executePluginTableProfile } = await testAdapter({
|
|
202
|
+
adapter: () => pluginTableProfileClient.adapter(wrappedCtx),
|
|
203
|
+
runMigrations: noMigrations,
|
|
204
|
+
overrideBetterAuthOptions: getOverrideBetterAuthOptions,
|
|
205
|
+
prefixTests: "profile:plugin-table",
|
|
206
|
+
tests: [pluginTableNormalTestSuite()],
|
|
207
|
+
});
|
|
208
|
+
|
|
209
|
+
const { execute: executeRenameFieldProfile } = await testAdapter({
|
|
210
|
+
adapter: () => renameFieldProfileClient.adapter(wrappedCtx),
|
|
211
|
+
runMigrations: noMigrations,
|
|
212
|
+
overrideBetterAuthOptions: getOverrideBetterAuthOptions,
|
|
213
|
+
prefixTests: "profile:rename-field-join",
|
|
214
|
+
tests: [renameFieldAndJoinTestSuite()],
|
|
215
|
+
});
|
|
216
|
+
|
|
217
|
+
const { execute: executeRenameUserCustomProfile } = await testAdapter({
|
|
218
|
+
adapter: () => renameUserCustomProfileClient.adapter(wrappedCtx),
|
|
219
|
+
runMigrations: noMigrations,
|
|
220
|
+
overrideBetterAuthOptions: getOverrideBetterAuthOptions,
|
|
221
|
+
prefixTests: "profile:rename-user-custom",
|
|
222
|
+
tests: [renameModelUserCustomTestSuite()],
|
|
223
|
+
});
|
|
224
|
+
|
|
225
|
+
const { execute: executeRenameUserTableProfile } = await testAdapter({
|
|
226
|
+
adapter: () => renameUserTableProfileClient.adapter(wrappedCtx),
|
|
227
|
+
runMigrations: noMigrations,
|
|
228
|
+
overrideBetterAuthOptions: getOverrideBetterAuthOptions,
|
|
229
|
+
prefixTests: "profile:rename-user-table",
|
|
230
|
+
tests: [renameModelUserTableTestSuite()],
|
|
231
|
+
});
|
|
232
|
+
|
|
233
|
+
const { execute: executeOrganizationJoinsProfile } = await testAdapter({
|
|
234
|
+
adapter: () => organizationJoinsProfileClient.adapter(wrappedCtx),
|
|
235
|
+
runMigrations: noMigrations,
|
|
236
|
+
overrideBetterAuthOptions: getOverrideBetterAuthOptions,
|
|
237
|
+
prefixTests: "profile:organization-joins",
|
|
238
|
+
tests: [multiJoinsMissingRowsTestSuite()],
|
|
239
|
+
});
|
|
240
|
+
|
|
241
|
+
await executeBaseProfile();
|
|
242
|
+
await executeAdditionalFieldsProfile();
|
|
243
|
+
await executePluginTableProfile();
|
|
244
|
+
await executeRenameFieldProfile();
|
|
245
|
+
await executeRenameUserCustomProfile();
|
|
246
|
+
await executeRenameUserTableProfile();
|
|
247
|
+
await executeOrganizationJoinsProfile();
|
|
25
248
|
});
|
|
26
249
|
}
|
package/src/client/adapter.ts
CHANGED
|
@@ -17,7 +17,6 @@ import type { Infer } from "convex/values";
|
|
|
17
17
|
import { convexAdapter } from "./adapter.js";
|
|
18
18
|
import { corsRouter } from "convex-helpers/server/cors";
|
|
19
19
|
import type defaultSchema from "../component/schema.js";
|
|
20
|
-
import type { ComponentApi } from "../component/_generated/component.js";
|
|
21
20
|
import type { CreateAuth, GenericCtx } from "./index.js";
|
|
22
21
|
import type { TrustedOriginsOption } from "../utils/index.js";
|
|
23
22
|
|
|
@@ -70,7 +69,6 @@ type SlimComponentApi = {
|
|
|
70
69
|
deleteOne: FunctionReference<"mutation", "internal">;
|
|
71
70
|
deleteMany: FunctionReference<"mutation", "internal">;
|
|
72
71
|
};
|
|
73
|
-
adapterTest?: ComponentApi["adapterTest"];
|
|
74
72
|
};
|
|
75
73
|
|
|
76
74
|
type RouteCorsOptions =
|
|
@@ -9,7 +9,6 @@
|
|
|
9
9
|
*/
|
|
10
10
|
|
|
11
11
|
import type * as adapter from "../adapter.js";
|
|
12
|
-
import type * as adapterTest from "../adapterTest.js";
|
|
13
12
|
import type * as testProfiles_adapterAdditionalFields from "../testProfiles/adapterAdditionalFields.js";
|
|
14
13
|
import type * as testProfiles_adapterOrganizationJoins from "../testProfiles/adapterOrganizationJoins.js";
|
|
15
14
|
import type * as testProfiles_adapterPluginTable from "../testProfiles/adapterPluginTable.js";
|
|
@@ -26,7 +25,6 @@ import { anyApi, componentsGeneric } from "convex/server";
|
|
|
26
25
|
|
|
27
26
|
const fullApi: ApiFromModules<{
|
|
28
27
|
adapter: typeof adapter;
|
|
29
|
-
adapterTest: typeof adapterTest;
|
|
30
28
|
"testProfiles/adapterAdditionalFields": typeof testProfiles_adapterAdditionalFields;
|
|
31
29
|
"testProfiles/adapterOrganizationJoins": typeof testProfiles_adapterOrganizationJoins;
|
|
32
30
|
"testProfiles/adapterPluginTable": typeof testProfiles_adapterPluginTable;
|
|
@@ -1893,9 +1893,6 @@ export type ComponentApi<Name extends string | undefined = string | undefined> =
|
|
|
1893
1893
|
Name
|
|
1894
1894
|
>;
|
|
1895
1895
|
};
|
|
1896
|
-
adapterTest: {
|
|
1897
|
-
runTests: FunctionReference<"action", "internal", any, any, Name>;
|
|
1898
|
-
};
|
|
1899
1896
|
testProfiles: {
|
|
1900
1897
|
adapterAdditionalFields: {
|
|
1901
1898
|
create: FunctionReference<
|
|
@@ -191,13 +191,10 @@ describe("crossDomainClient", () => {
|
|
|
191
191
|
});
|
|
192
192
|
|
|
193
193
|
describe("onSuccess handler", () => {
|
|
194
|
-
it("clears cookies when get-session returns null", async () => {
|
|
195
|
-
storage.set(
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
"better-auth.session_token": { value: "stale", expires: null },
|
|
199
|
-
})
|
|
200
|
-
);
|
|
194
|
+
it("clears session cookies when get-session returns null", async () => {
|
|
195
|
+
storage.set(cookieName, JSON.stringify({
|
|
196
|
+
"better-auth.session_token": { value: "stale", expires: null },
|
|
197
|
+
}));
|
|
201
198
|
|
|
202
199
|
const onSuccess = getOnSuccessHook();
|
|
203
200
|
await onSuccess({
|
|
@@ -209,6 +206,28 @@ describe("crossDomainClient", () => {
|
|
|
209
206
|
expect(storage.get(cookieName)).toBe("{}");
|
|
210
207
|
});
|
|
211
208
|
|
|
209
|
+
it("preserves two_factor cookie when get-session returns null", async () => {
|
|
210
|
+
storage.set(cookieName, JSON.stringify({
|
|
211
|
+
"better-auth.session_token": { value: "stale", expires: null },
|
|
212
|
+
"better-auth.session_data": { value: "data", expires: null },
|
|
213
|
+
"better-auth.convex_jwt": { value: "jwt", expires: null },
|
|
214
|
+
"better-auth.two_factor": { value: "2fa-challenge-token", expires: null },
|
|
215
|
+
}));
|
|
216
|
+
|
|
217
|
+
const onSuccess = getOnSuccessHook();
|
|
218
|
+
await onSuccess({
|
|
219
|
+
data: null,
|
|
220
|
+
request: { url: new URL("https://example.com/api/auth/get-session") },
|
|
221
|
+
response: { headers: new Headers() },
|
|
222
|
+
} as any);
|
|
223
|
+
|
|
224
|
+
const result = JSON.parse(storage.get(cookieName)!);
|
|
225
|
+
expect(result["better-auth.two_factor"]).toEqual({ value: "2fa-challenge-token", expires: null });
|
|
226
|
+
expect(result["better-auth.session_token"]).toBeUndefined();
|
|
227
|
+
expect(result["better-auth.session_data"]).toBeUndefined();
|
|
228
|
+
expect(result["better-auth.convex_jwt"]).toBeUndefined();
|
|
229
|
+
});
|
|
230
|
+
|
|
212
231
|
it("preserves cookies when get-session returns data", async () => {
|
|
213
232
|
const existingCookies = JSON.stringify({
|
|
214
233
|
"better-auth.session_token": { value: "valid", expires: null },
|
|
@@ -47,7 +47,9 @@ export function getCookie(cookie: string) {
|
|
|
47
47
|
// noop
|
|
48
48
|
}
|
|
49
49
|
return Object.entries(parsed)
|
|
50
|
-
.filter(
|
|
50
|
+
.filter(
|
|
51
|
+
([, value]) => !value.expires || new Date(value.expires) >= new Date()
|
|
52
|
+
)
|
|
51
53
|
.map(([key, value]) => `${key}=${value.value}`)
|
|
52
54
|
.join("; ");
|
|
53
55
|
}
|
|
@@ -185,7 +187,31 @@ export const crossDomainClient = (
|
|
|
185
187
|
const data = context.data;
|
|
186
188
|
storage.setItem(localCacheName, JSON.stringify(data));
|
|
187
189
|
if (data === null) {
|
|
188
|
-
|
|
190
|
+
// Preserve non-session cookies (e.g. two_factor) when
|
|
191
|
+
// get-session returns null during 2FA pending state.
|
|
192
|
+
// Previously this unconditionally set cookieName to "{}",
|
|
193
|
+
// which wiped the two_factor challenge token needed for
|
|
194
|
+
// verifyTotp in cross-domain setups.
|
|
195
|
+
const prev = storage.getItem(cookieName);
|
|
196
|
+
try {
|
|
197
|
+
const parsed = JSON.parse(prev || "{}") as Record<
|
|
198
|
+
string,
|
|
199
|
+
unknown
|
|
200
|
+
>;
|
|
201
|
+
const preserved: Record<string, unknown> = {};
|
|
202
|
+
for (const [key, val] of Object.entries(parsed)) {
|
|
203
|
+
if (
|
|
204
|
+
!key.includes("session_token") &&
|
|
205
|
+
!key.includes("session_data") &&
|
|
206
|
+
!key.includes("convex_jwt")
|
|
207
|
+
) {
|
|
208
|
+
preserved[key] = val;
|
|
209
|
+
}
|
|
210
|
+
}
|
|
211
|
+
storage.setItem(cookieName, JSON.stringify(preserved));
|
|
212
|
+
} catch {
|
|
213
|
+
storage.setItem(cookieName, "{}");
|
|
214
|
+
}
|
|
189
215
|
}
|
|
190
216
|
}
|
|
191
217
|
},
|
package/src/utils/index.ts
CHANGED
|
@@ -137,6 +137,7 @@ export const getToken = async (
|
|
|
137
137
|
headers: Headers,
|
|
138
138
|
opts?: GetTokenOptions
|
|
139
139
|
) => {
|
|
140
|
+
headers.set("host", new URL(siteUrl).host)
|
|
140
141
|
const fetchToken = async () => {
|
|
141
142
|
const basePath = opts?.basePath
|
|
142
143
|
? (opts.basePath.startsWith("/") ? opts.basePath : `/${opts.basePath}`)
|
package/src/version.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
export const VERSION = "0.12.
|
|
1
|
+
export const VERSION = "0.12.1";
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"adapterTest.d.ts","sourceRoot":"","sources":["../../src/component/adapterTest.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAyGlD,eAAO,MAAM,QAAQ,gFAoKpB,CAAC"}
|