@convex-dev/better-auth 0.7.0-alpha.5 → 0.7.0-alpha.6
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commonjs/react-start/index.d.ts.map +1 -1
- package/dist/commonjs/react-start/index.js +7 -3
- package/dist/commonjs/react-start/index.js.map +1 -1
- package/dist/esm/react-start/index.d.ts.map +1 -1
- package/dist/esm/react-start/index.js +7 -3
- package/dist/esm/react-start/index.js.map +1 -1
- package/package.json +1 -1
- package/src/react-start/index.ts +9 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjD,eAAO,MAAM,aAAa,GACxB,YAAY,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,oBAM1E,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjD,eAAO,MAAM,aAAa,GACxB,YAAY,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,oBAM1E,CAAC;AAiBF,eAAO,MAAM,YAAY,GACvB,CAAC,SAAS,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,EAEvE,SAAS,OAAO,EAChB,OAAO;IACL,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;;EAmBF,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,SAAS,OAAO,EAChB,OAAO;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,sBAUpD,CAAC"}
|
|
@@ -13,7 +13,7 @@ const requireConvexSiteUrl = (opts) => {
|
|
|
13
13
|
throw new Error("VITE_CONVEX_SITE_URL is not set");
|
|
14
14
|
}
|
|
15
15
|
if (opts?.verbose) {
|
|
16
|
-
console.log(
|
|
16
|
+
console.log(`${opts.calledFrom} convexSiteUrl`, baseURL);
|
|
17
17
|
}
|
|
18
18
|
return baseURL;
|
|
19
19
|
};
|
|
@@ -22,7 +22,7 @@ export const fetchSession = async (request, opts) => {
|
|
|
22
22
|
throw new Error("No request found");
|
|
23
23
|
}
|
|
24
24
|
const { data: session } = await betterFetch("/api/auth/get-session", {
|
|
25
|
-
baseURL: requireConvexSiteUrl(opts),
|
|
25
|
+
baseURL: requireConvexSiteUrl({ ...opts, calledFrom: "fetchSession" }),
|
|
26
26
|
headers: {
|
|
27
27
|
cookie: request.headers.get("cookie") ?? "",
|
|
28
28
|
},
|
|
@@ -33,7 +33,11 @@ export const fetchSession = async (request, opts) => {
|
|
|
33
33
|
};
|
|
34
34
|
export const reactStartHandler = (request, opts) => {
|
|
35
35
|
const requestUrl = new URL(request.url);
|
|
36
|
-
const
|
|
36
|
+
const convexSiteUrl = requireConvexSiteUrl({
|
|
37
|
+
...opts,
|
|
38
|
+
calledFrom: "reactStartHandler",
|
|
39
|
+
});
|
|
40
|
+
const nextUrl = `${convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
|
|
37
41
|
request.headers.set("accept-encoding", "application/json");
|
|
38
42
|
return fetch(nextUrl, new Request(request, { redirect: "manual" }));
|
|
39
43
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,UAAyE,EACzE,EAAE;IACF,MAAM,IAAI,GAAG,UAAU,CAAC,EAAS,CAAC,CAAC;IACnC,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;IAC7C,OAAO,MAAM,CAAC,IAAI,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,UAAyE,EACzE,EAAE;IACF,MAAM,IAAI,GAAG,UAAU,CAAC,EAAS,CAAC,CAAC;IACnC,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;IAC7C,OAAO,MAAM,CAAC,IAAI,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,IAI7B,EAAE,EAAE;IACH,MAAM,OAAO,GAAG,IAAI,EAAE,aAAa,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC;IAC5E,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;IACD,IAAI,IAAI,EAAE,OAAO,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,UAAU,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAG/B,OAAgB,EAChB,IAGC,EACD,EAAE;IAGF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,WAAW,CACzC,uBAAuB,EACvB;QACE,OAAO,EAAE,oBAAoB,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC;QACtE,OAAO,EAAE;YACP,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE;SAC5C;KACF,CACF,CAAC;IACF,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,OAAgB,EAChB,IAAmD,EACnD,EAAE;IACF,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,aAAa,GAAG,oBAAoB,CAAC;QACzC,GAAG,IAAI;QACP,UAAU,EAAE,mBAAmB;KAChC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,GAAG,aAAa,GAAG,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;IAC7E,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;IAC3D,OAAO,KAAK,CAAC,OAAO,EAAE,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjD,eAAO,MAAM,aAAa,GACxB,YAAY,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,oBAM1E,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AAGjD,eAAO,MAAM,aAAa,GACxB,YAAY,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,oBAM1E,CAAC;AAiBF,eAAO,MAAM,YAAY,GACvB,CAAC,SAAS,CAAC,GAAG,EAAE,gBAAgB,CAAC,GAAG,CAAC,KAAK,UAAU,CAAC,OAAO,UAAU,CAAC,EAEvE,SAAS,OAAO,EAChB,OAAO;IACL,aAAa,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;;EAmBF,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,SAAS,OAAO,EAChB,OAAO;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,sBAUpD,CAAC"}
|
|
@@ -13,7 +13,7 @@ const requireConvexSiteUrl = (opts) => {
|
|
|
13
13
|
throw new Error("VITE_CONVEX_SITE_URL is not set");
|
|
14
14
|
}
|
|
15
15
|
if (opts?.verbose) {
|
|
16
|
-
console.log(
|
|
16
|
+
console.log(`${opts.calledFrom} convexSiteUrl`, baseURL);
|
|
17
17
|
}
|
|
18
18
|
return baseURL;
|
|
19
19
|
};
|
|
@@ -22,7 +22,7 @@ export const fetchSession = async (request, opts) => {
|
|
|
22
22
|
throw new Error("No request found");
|
|
23
23
|
}
|
|
24
24
|
const { data: session } = await betterFetch("/api/auth/get-session", {
|
|
25
|
-
baseURL: requireConvexSiteUrl(opts),
|
|
25
|
+
baseURL: requireConvexSiteUrl({ ...opts, calledFrom: "fetchSession" }),
|
|
26
26
|
headers: {
|
|
27
27
|
cookie: request.headers.get("cookie") ?? "",
|
|
28
28
|
},
|
|
@@ -33,7 +33,11 @@ export const fetchSession = async (request, opts) => {
|
|
|
33
33
|
};
|
|
34
34
|
export const reactStartHandler = (request, opts) => {
|
|
35
35
|
const requestUrl = new URL(request.url);
|
|
36
|
-
const
|
|
36
|
+
const convexSiteUrl = requireConvexSiteUrl({
|
|
37
|
+
...opts,
|
|
38
|
+
calledFrom: "reactStartHandler",
|
|
39
|
+
});
|
|
40
|
+
const nextUrl = `${convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
|
|
37
41
|
request.headers.set("accept-encoding", "application/json");
|
|
38
42
|
return fetch(nextUrl, new Request(request, { redirect: "manual" }));
|
|
39
43
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,UAAyE,EACzE,EAAE;IACF,MAAM,IAAI,GAAG,UAAU,CAAC,EAAS,CAAC,CAAC;IACnC,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;IAC7C,OAAO,MAAM,CAAC,IAAI,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/react-start/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,MAAM,aAAa,GAAG,KAAK,EAChC,UAAyE,EACzE,EAAE;IACF,MAAM,IAAI,GAAG,UAAU,CAAC,EAAS,CAAC,CAAC;IACnC,MAAM,YAAY,GAAG,kBAAkB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACtD,MAAM,MAAM,GAAG,YAAY,CAAC,eAAe,CAAC,CAAC;IAC7C,OAAO,MAAM,CAAC,IAAI,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,oBAAoB,GAAG,CAAC,IAI7B,EAAE,EAAE;IACH,MAAM,OAAO,GAAG,IAAI,EAAE,aAAa,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,oBAAoB,CAAC;IAC5E,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IACrD,CAAC;IACD,IAAI,IAAI,EAAE,OAAO,EAAE,CAAC;QAClB,OAAO,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,UAAU,gBAAgB,EAAE,OAAO,CAAC,CAAC;IAC3D,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAG/B,OAAgB,EAChB,IAGC,EACD,EAAE;IAGF,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,MAAM,WAAW,CACzC,uBAAuB,EACvB;QACE,OAAO,EAAE,oBAAoB,CAAC,EAAE,GAAG,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,CAAC;QACtE,OAAO,EAAE;YACP,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE;SAC5C;KACF,CACF,CAAC;IACF,OAAO;QACL,OAAO;KACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,OAAgB,EAChB,IAAmD,EACnD,EAAE;IACF,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACxC,MAAM,aAAa,GAAG,oBAAoB,CAAC;QACzC,GAAG,IAAI;QACP,UAAU,EAAE,mBAAmB;KAChC,CAAC,CAAC;IACH,MAAM,OAAO,GAAG,GAAG,aAAa,GAAG,UAAU,CAAC,QAAQ,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC;IAC7E,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;IAC3D,OAAO,KAAK,CAAC,OAAO,EAAE,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC;AACtE,CAAC,CAAC"}
|
package/package.json
CHANGED
package/src/react-start/index.ts
CHANGED
|
@@ -14,7 +14,8 @@ export const getCookieName = async (
|
|
|
14
14
|
};
|
|
15
15
|
|
|
16
16
|
const requireConvexSiteUrl = (opts?: {
|
|
17
|
-
|
|
17
|
+
calledFrom: string;
|
|
18
|
+
convexSiteUrl?: string;
|
|
18
19
|
verbose?: boolean;
|
|
19
20
|
}) => {
|
|
20
21
|
const baseURL = opts?.convexSiteUrl ?? import.meta.env.VITE_CONVEX_SITE_URL;
|
|
@@ -22,7 +23,7 @@ const requireConvexSiteUrl = (opts?: {
|
|
|
22
23
|
throw new Error("VITE_CONVEX_SITE_URL is not set");
|
|
23
24
|
}
|
|
24
25
|
if (opts?.verbose) {
|
|
25
|
-
console.log(
|
|
26
|
+
console.log(`${opts.calledFrom} convexSiteUrl`, baseURL);
|
|
26
27
|
}
|
|
27
28
|
return baseURL;
|
|
28
29
|
};
|
|
@@ -44,7 +45,7 @@ export const fetchSession = async <
|
|
|
44
45
|
const { data: session } = await betterFetch<Session>(
|
|
45
46
|
"/api/auth/get-session",
|
|
46
47
|
{
|
|
47
|
-
baseURL: requireConvexSiteUrl(opts),
|
|
48
|
+
baseURL: requireConvexSiteUrl({ ...opts, calledFrom: "fetchSession" }),
|
|
48
49
|
headers: {
|
|
49
50
|
cookie: request.headers.get("cookie") ?? "",
|
|
50
51
|
},
|
|
@@ -60,7 +61,11 @@ export const reactStartHandler = (
|
|
|
60
61
|
opts?: { convexSiteUrl: string; verbose?: boolean }
|
|
61
62
|
) => {
|
|
62
63
|
const requestUrl = new URL(request.url);
|
|
63
|
-
const
|
|
64
|
+
const convexSiteUrl = requireConvexSiteUrl({
|
|
65
|
+
...opts,
|
|
66
|
+
calledFrom: "reactStartHandler",
|
|
67
|
+
});
|
|
68
|
+
const nextUrl = `${convexSiteUrl}${requestUrl.pathname}${requestUrl.search}`;
|
|
64
69
|
request.headers.set("accept-encoding", "application/json");
|
|
65
70
|
return fetch(nextUrl, new Request(request, { redirect: "manual" }));
|
|
66
71
|
};
|