@robelest/convex-auth 0.0.4-preview.21 → 0.0.4-preview.23

package/dist/server/ssr.js

@@ -310,204 +310,195 @@ function server(options) {
 			const host = request.headers.get("host") ?? new URL(request.url).host;
 			const currentCookies = parseAuthCookies(request.headers.get("cookie"), host, cookieNamespace);
 			return Fx.run(Fx.match(actionDispatch, actionDispatch.action, {
-				sessionStart: (_) => Fx.from({
-					ok: async () => {
-						const refreshDispatch = args.refreshToken === void 0 ? { kind: "passthrough" } : currentCookies.refreshToken === null ? { kind: "refreshRequestedWithoutCookie" } : {
-							kind: "hydrateRefreshFromCookie",
-							refreshToken: currentCookies.refreshToken
-						};
-						const refreshResponse = await Fx.run(Fx.match(refreshDispatch, refreshDispatch.kind, {
-							passthrough: async () => null,
-							hydrateRefreshFromCookie: async ({ refreshToken }) => {
-								args.refreshToken = refreshToken;
-								return null;
-							},
-							refreshRequestedWithoutCookie: async () => {
-								const currentToken = currentCookies.token;
-								const decodedToken = currentToken === null ? null : await Fx.run(Fx.attempt(async () => jwtDecode(currentToken), (decoded) => decoded, () => null));
-								const tokenDispatch = currentToken !== null && decodedToken?.exp !== void 0 && decodedToken.iss !== void 0 && acceptedIssuers.has(normalizeIssuer(decodedToken.iss)) && decodedToken.exp * 1e3 > Date.now() ? {
-									kind: "validToken",
-									token: currentToken
-								} : { kind: "missingToken" };
-								return await Fx.run(Fx.match(tokenDispatch, tokenDispatch.kind, {
-									validToken: ({ token }) => new Response(JSON.stringify({ tokens: {
-										token,
-										refreshToken: "dummy"
-									} }), {
-										status: 200,
-										headers: { "Content-Type": "application/json" }
-									}),
-									missingToken: () => new Response(JSON.stringify({ tokens: null }), {
-										status: 200,
-										headers: { "Content-Type": "application/json" }
-									})
-								}));
-							}
-						}));
-						const refreshDecision = refreshResponse !== null ? {
-							kind: "shortCircuit",
-							response: refreshResponse
-						} : { kind: "continue" };
-						const maybeShortCircuitResponse = await Fx.run(Fx.match(refreshDecision, refreshDecision.kind, {
-							shortCircuit: ({ response }) => response,
-							continue: () => null
-						}));
-						if (maybeShortCircuitResponse !== null) return maybeShortCircuitResponse;
-						const client = new ConvexHttpClient(convexUrl);
-						const authDispatch = args.refreshToken === void 0 && args.params?.code === void 0 && currentCookies.token !== null ? {
-							kind: "attachAuth",
-							token: currentCookies.token
-						} : { kind: "skipAuth" };
-						await Fx.run(Fx.match(authDispatch, authDispatch.kind, {
-							attachAuth: ({ token }) => {
-								client.setAuth(token);
-							},
-							skipAuth: () => void 0
-						}));
-						return Fx.run(Fx.from({
-							ok: () => client.action(signInActionRef, args),
-							err: (error) => error
-						}).pipe(Fx.fold({
-							ok: (result) => Fx.run(Fx.match(result, result.kind, {
-								redirect: (redirectResult) => {
-									const response = new Response(JSON.stringify({
-										kind: "redirect",
-										redirect: redirectResult.redirect,
-										verifier: redirectResult.verifier
-									}), {
-										status: 200,
-										headers: { "Content-Type": "application/json" }
-									});
-									for (const value of serializeAuthCookies({
-										...currentCookies,
-										verifier: redirectResult.verifier
-									}, host, cookieConfig, cookieNamespace)) response.headers.append("Set-Cookie", value);
-									return Fx.succeed(response);
-								},
-								signedIn: (signedInResult) => {
-									const response = new Response(JSON.stringify({
-										kind: "signedIn",
-										tokens: signedInResult.tokens === null ? null : {
-											token: signedInResult.tokens.token,
-											refreshToken: "dummy"
-										}
-									}), {
-										status: 200,
-										headers: { "Content-Type": "application/json" }
-									});
-									for (const value of serializeAuthCookies({
-										token: signedInResult.tokens?.token ?? null,
-										refreshToken: signedInResult.tokens?.refreshToken ?? null,
-										verifier: null
-									}, host, cookieConfig, cookieNamespace)) response.headers.append("Set-Cookie", value);
-									return Fx.succeed(response);
-								},
-								started: (startedResult) => Fx.succeed(new Response(JSON.stringify(startedResult), {
-									status: 200,
-									headers: { "Content-Type": "application/json" }
-								})),
-								passkeyOptions: (passkeyOptionsResult) => Fx.succeed(new Response(JSON.stringify(passkeyOptionsResult), {
+				sessionStart: (_) => Fx.promise(async () => {
+					const refreshDispatch = args.refreshToken === void 0 ? { kind: "passthrough" } : currentCookies.refreshToken === null ? { kind: "refreshRequestedWithoutCookie" } : {
+						kind: "hydrateRefreshFromCookie",
+						refreshToken: currentCookies.refreshToken
+					};
+					const refreshResponse = await Fx.run(Fx.match(refreshDispatch, refreshDispatch.kind, {
+						passthrough: async () => null,
+						hydrateRefreshFromCookie: async ({ refreshToken }) => {
+							args.refreshToken = refreshToken;
+							return null;
+						},
+						refreshRequestedWithoutCookie: async () => {
+							const currentToken = currentCookies.token;
+							const decodedToken = currentToken === null ? null : await Fx.run(Fx.attempt(async () => jwtDecode(currentToken), (decoded) => decoded, () => null));
+							const tokenDispatch = currentToken !== null && decodedToken?.exp !== void 0 && decodedToken.iss !== void 0 && acceptedIssuers.has(normalizeIssuer(decodedToken.iss)) && decodedToken.exp * 1e3 > Date.now() ? {
+								kind: "validToken",
+								token: currentToken
+							} : { kind: "missingToken" };
+							return await Fx.run(Fx.match(tokenDispatch, tokenDispatch.kind, {
+								validToken: ({ token }) => new Response(JSON.stringify({ tokens: {
+									token,
+									refreshToken: "dummy"
+								} }), {
 									status: 200,
 									headers: { "Content-Type": "application/json" }
-								})),
-								totpRequired: (totpRequiredResult) => Fx.succeed(new Response(JSON.stringify(totpRequiredResult), {
+								}),
+								missingToken: () => new Response(JSON.stringify({ tokens: null }), {
 									status: 200,
 									headers: { "Content-Type": "application/json" }
-								})),
-								totpSetup: (totpSetupResult) => Fx.succeed(new Response(JSON.stringify(totpSetupResult), {
+								})
+							}));
+						}
+					}));
+					const refreshDecision = refreshResponse !== null ? {
+						kind: "shortCircuit",
+						response: refreshResponse
+					} : { kind: "continue" };
+					const maybeShortCircuitResponse = await Fx.run(Fx.match(refreshDecision, refreshDecision.kind, {
+						shortCircuit: ({ response }) => response,
+						continue: () => null
+					}));
+					if (maybeShortCircuitResponse !== null) return maybeShortCircuitResponse;
+					const client = new ConvexHttpClient(convexUrl);
+					const authDispatch = args.refreshToken === void 0 && args.params?.code === void 0 && currentCookies.token !== null ? {
+						kind: "attachAuth",
+						token: currentCookies.token
+					} : { kind: "skipAuth" };
+					await Fx.run(Fx.match(authDispatch, authDispatch.kind, {
+						attachAuth: ({ token }) => {
+							client.setAuth(token);
+						},
+						skipAuth: () => void 0
+					}));
+					return Fx.run(Fx.from({
+						ok: () => client.action(signInActionRef, args),
+						err: (error) => error
+					}).pipe(Fx.fold({
+						ok: (result) => Fx.run(Fx.match(result, result.kind, {
+							redirect: (redirectResult) => {
+								const response = new Response(JSON.stringify({
+									kind: "redirect",
+									redirect: redirectResult.redirect,
+									verifier: redirectResult.verifier
+								}), {
 									status: 200,
 									headers: { "Content-Type": "application/json" }
-								})),
-								deviceCode: (deviceCodeResult) => Fx.succeed(new Response(JSON.stringify(deviceCodeResult), {
+								});
+								for (const value of serializeAuthCookies({
+									...currentCookies,
+									verifier: redirectResult.verifier
+								}, host, cookieConfig, cookieNamespace)) response.headers.append("Set-Cookie", value);
+								return Fx.succeed(response);
+							},
+							signedIn: (signedInResult) => {
+								const response = new Response(JSON.stringify({
+									kind: "signedIn",
+									tokens: signedInResult.tokens === null ? null : {
+										token: signedInResult.tokens.token,
+										refreshToken: "dummy"
+									}
+								}), {
 									status: 200,
 									headers: { "Content-Type": "application/json" }
-								}))
-							})),
-							err: (error) => {
-								const errorBody = error instanceof ConvexError && typeof error.data === "object" && error.data !== null && "code" in error.data ? {
-									error: error.data.message ?? String(error),
-									authError: error.data
-								} : { error: error instanceof Error ? error.message : String(error) };
-								const response = new Response(JSON.stringify(errorBody), {
-									status: 400,
-									headers: { "Content-Type": "application/json" }
 								});
-								const clearSession = args.refreshToken !== void 0 && error instanceof ConvexError && typeof error.data === "object" && error.data !== null && error.data.code === "INVALID_REFRESH_TOKEN";
 								for (const value of serializeAuthCookies({
-									token: clearSession ? null : currentCookies.token,
-									refreshToken: clearSession ? null : currentCookies.refreshToken,
+									token: signedInResult.tokens?.token ?? null,
+									refreshToken: signedInResult.tokens?.refreshToken ?? null,
 									verifier: null
 								}, host, cookieConfig, cookieNamespace)) response.headers.append("Set-Cookie", value);
-								return response;
-							}
-						})));
-					},
-					err: (e) => e
-				}),
-				sessionStop: (_) => Fx.from({
-					ok: async () => {
-						await Fx.run(Fx.from({
-							ok: () => (() => {
-								const client = new ConvexHttpClient(convexUrl);
-								if (currentCookies.token !== null) client.setAuth(currentCookies.token);
-								return client.action(signOutActionRef);
-							})(),
-							err: (error) => error
-						}).pipe(Fx.recover((error) => {
-							console.error("[convex-auth/server] proxy sign-out failed", error);
-							const fallbackDispatch = currentCookies.refreshToken !== null ? {
-								kind: "attemptFallback",
-								refreshToken: currentCookies.refreshToken
-							} : { kind: "skipFallback" };
-							return Fx.match(fallbackDispatch, fallbackDispatch.kind, {
-								attemptFallback: ({ refreshToken }) => Fx.from({
-									ok: async () => {
-										const refreshed = await new ConvexHttpClient(convexUrl).action(signInActionRef, { refreshToken });
-										const refreshedTokens = await Fx.run(Fx.match(refreshed, refreshed.kind, {
-											signedIn: (signedInResult) => Fx.succeed(signedInResult.tokens),
-											redirect: () => Fx.fatal(/* @__PURE__ */ new Error("Invalid `auth:signIn` result for sign-out fallback refresh")),
-											started: () => Fx.fatal(/* @__PURE__ */ new Error("Invalid `auth:signIn` result for sign-out fallback refresh")),
-											passkeyOptions: () => Fx.fatal(/* @__PURE__ */ new Error("Invalid `auth:signIn` result for sign-out fallback refresh")),
-											totpRequired: () => Fx.fatal(/* @__PURE__ */ new Error("Invalid `auth:signIn` result for sign-out fallback refresh")),
-											totpSetup: () => Fx.fatal(/* @__PURE__ */ new Error("Invalid `auth:signIn` result for sign-out fallback refresh")),
-											deviceCode: () => Fx.fatal(/* @__PURE__ */ new Error("Invalid `auth:signIn` result for sign-out fallback refresh"))
-										}));
-										const fallbackSignOutDispatch = refreshedTokens !== null ? {
-											kind: "signOutWithRefreshed",
-											token: refreshedTokens.token
-										} : { kind: "skipRefreshedSignOut" };
-										await Fx.run(Fx.match(fallbackSignOutDispatch, fallbackSignOutDispatch.kind, {
-											signOutWithRefreshed: ({ token }) => Fx.from({
-												ok: async () => {
-													const client = new ConvexHttpClient(convexUrl);
-													client.setAuth(token);
-													await client.action(signOutActionRef);
-												},
-												err: (error$1) => error$1
-											}),
-											skipRefreshedSignOut: () => Fx.succeed(void 0)
-										}));
-									},
-									err: (fallbackError) => fallbackError
-								}).pipe(Fx.recover((fallbackError) => {
-									console.error("[convex-auth/server] proxy sign-out fallback failed", fallbackError);
-									return Fx.succeed(void 0);
-								})),
-								skipFallback: () => Fx.succeed(void 0)
+								return Fx.succeed(response);
+							},
+							started: (startedResult) => Fx.succeed(new Response(JSON.stringify(startedResult), {
+								status: 200,
+								headers: { "Content-Type": "application/json" }
+							})),
+							passkeyOptions: (passkeyOptionsResult) => Fx.succeed(new Response(JSON.stringify(passkeyOptionsResult), {
+								status: 200,
+								headers: { "Content-Type": "application/json" }
+							})),
+							totpRequired: (totpRequiredResult) => Fx.succeed(new Response(JSON.stringify(totpRequiredResult), {
+								status: 200,
+								headers: { "Content-Type": "application/json" }
+							})),
+							totpSetup: (totpSetupResult) => Fx.succeed(new Response(JSON.stringify(totpSetupResult), {
+								status: 200,
+								headers: { "Content-Type": "application/json" }
+							})),
+							deviceCode: (deviceCodeResult) => Fx.succeed(new Response(JSON.stringify(deviceCodeResult), {
+								status: 200,
+								headers: { "Content-Type": "application/json" }
+							}))
+						})),
+						err: (error) => {
+							const errorBody = error instanceof ConvexError && typeof error.data === "object" && error.data !== null && "code" in error.data ? {
+								error: error.data.message ?? String(error),
+								authError: error.data
+							} : { error: error instanceof Error ? error.message : String(error) };
+							const response = new Response(JSON.stringify(errorBody), {
+								status: 400,
+								headers: { "Content-Type": "application/json" }
 							});
-						}), Fx.map(() => void 0)));
-						const response = new Response(JSON.stringify(null), {
-							status: 200,
-							headers: { "Content-Type": "application/json" }
+							const clearSession = args.refreshToken !== void 0 && error instanceof ConvexError && typeof error.data === "object" && error.data !== null && error.data.code === "INVALID_REFRESH_TOKEN";
+							for (const value of serializeAuthCookies({
+								token: clearSession ? null : currentCookies.token,
+								refreshToken: clearSession ? null : currentCookies.refreshToken,
+								verifier: null
+							}, host, cookieConfig, cookieNamespace)) response.headers.append("Set-Cookie", value);
+							return response;
+						}
+					})));
+				}),
+				sessionStop: (_) => Fx.promise(async () => {
+					await Fx.run(Fx.from({
+						ok: () => (() => {
+							const client = new ConvexHttpClient(convexUrl);
+							if (currentCookies.token !== null) client.setAuth(currentCookies.token);
+							return client.action(signOutActionRef);
+						})(),
+						err: (error) => error
+					}).pipe(Fx.recover((error) => {
+						console.error("[convex-auth/server] proxy sign-out failed", error);
+						const fallbackDispatch = currentCookies.refreshToken !== null ? {
+							kind: "attemptFallback",
+							refreshToken: currentCookies.refreshToken
+						} : { kind: "skipFallback" };
+						return Fx.match(fallbackDispatch, fallbackDispatch.kind, {
+							attemptFallback: ({ refreshToken }) => Fx.from({
+								ok: async () => {
+									const refreshed = await new ConvexHttpClient(convexUrl).action(signInActionRef, { refreshToken });
+									const refreshedTokens = await Fx.run(Fx.match(refreshed, refreshed.kind, {
+										signedIn: (signedInResult) => Fx.succeed(signedInResult.tokens),
+										redirect: () => Fx.fatal(/* @__PURE__ */ new Error("Invalid `auth:signIn` result for sign-out fallback refresh")),
+										started: () => Fx.fatal(/* @__PURE__ */ new Error("Invalid `auth:signIn` result for sign-out fallback refresh")),
+										passkeyOptions: () => Fx.fatal(/* @__PURE__ */ new Error("Invalid `auth:signIn` result for sign-out fallback refresh")),
+										totpRequired: () => Fx.fatal(/* @__PURE__ */ new Error("Invalid `auth:signIn` result for sign-out fallback refresh")),
+										totpSetup: () => Fx.fatal(/* @__PURE__ */ new Error("Invalid `auth:signIn` result for sign-out fallback refresh")),
+										deviceCode: () => Fx.fatal(/* @__PURE__ */ new Error("Invalid `auth:signIn` result for sign-out fallback refresh"))
+									}));
+									const fallbackSignOutDispatch = refreshedTokens !== null ? {
+										kind: "signOutWithRefreshed",
+										token: refreshedTokens.token
+									} : { kind: "skipRefreshedSignOut" };
+									await Fx.run(Fx.match(fallbackSignOutDispatch, fallbackSignOutDispatch.kind, {
+										signOutWithRefreshed: ({ token }) => Fx.promise(async () => {
+											const client = new ConvexHttpClient(convexUrl);
+											client.setAuth(token);
+											await client.action(signOutActionRef);
+										}),
+										skipRefreshedSignOut: () => Fx.succeed(void 0)
+									}));
+								},
+								err: (error$1) => error$1
+							}).pipe(Fx.recover((fallbackError) => {
+								console.error("[convex-auth/server] proxy sign-out fallback failed", fallbackError);
+								return Fx.succeed(void 0);
+							})),
+							skipFallback: () => Fx.succeed(void 0)
 						});
-						for (const value of serializeAuthCookies({
-							token: null,
-							refreshToken: null,
-							verifier: null
-						}, host, cookieConfig, cookieNamespace)) response.headers.append("Set-Cookie", value);
-						return response;
-					},
-					err: (e) => e
+					}), Fx.map(() => void 0)));
+					const response = new Response(JSON.stringify(null), {
+						status: 200,
+						headers: { "Content-Type": "application/json" }
+					});
+					for (const value of serializeAuthCookies({
+						token: null,
+						refreshToken: null,
+						verifier: null
+					}, host, cookieConfig, cookieNamespace)) response.headers.append("Set-Cookie", value);
+					return response;
 				})
 			}));
 		},