feat(frontend): don't break signup pages on reload

Foxnouns.Frontend/src/lib/actions/callback.ts

@@ -4,10 +4,12 @@ import type { AddAccountResponse, CallbackResponse } from "$api/models";
 import { setToken } from "$lib";
 import log from "$lib/log";
 import { isRedirect, redirect, type ServerLoadEvent } from "@sveltejs/kit";
+import type { TicketData } from "../../routes/auth/callback/register/[ticket]/+page.server";
 
 export default function createCallbackLoader(
 	callbackType: string,
 	bodyFn?: (event: ServerLoadEvent) => Promise<unknown>,
+	returnData?: boolean,
 ) {
 	return async (event: ServerLoadEvent) => {
 		const { parent, fetch, cookies } = event;
@@ -53,12 +55,23 @@ export default function createCallbackLoader(
 				redirect(303, `/@${resp.user!.username}`);
 			}
 
-			return {
-				hasAccount: false,
-				isLinkRequest: false,
-				ticket: resp.ticket!,
-				remoteUser: resp.remote_username!,
-			};
+			if (returnData)
+				return {
+					ticket: resp.ticket!,
+					remoteUser: resp.remote_username!,
+				};
+
+			const ticket = btoa(
+				JSON.stringify({
+					type: callbackType,
+					ticket: resp.ticket!,
+					remoteUsername: resp.remote_username!,
+				} satisfies TicketData),
+			)
+				.replaceAll("+", "-")
+				.replaceAll("/", "_");
+
+			redirect(303, "/auth/callback/register/" + ticket);
 		} catch (e) {
 			if (isRedirect(e)) throw e;
 			if (e instanceof ApiError) return { isLinkRequest: false, error: e.obj };

Foxnouns.Frontend/src/lib/actions/register.ts

@@ -1,35 +0,0 @@
-import { apiRequest } from "$api";
-import ApiError, { ErrorCode, type RawApiError } from "$api/error";
-import type { AuthResponse } from "$api/models/auth";
-import { setToken } from "$lib";
-import log from "$lib/log";
-import { isRedirect, redirect, type RequestEvent } from "@sveltejs/kit";
-
-export default function createRegisterAction(callbackUrl: string) {
-	return async function ({ request, fetch, cookies }: RequestEvent) {
-		const data = await request.formData();
-		const username = data.get("username") as string | null;
-		const ticket = data.get("ticket") as string | null;
-
-		if (!username || !ticket)
-			return {
-				error: { message: "Bad request", code: ErrorCode.BadRequest, status: 403 } as RawApiError,
-			};
-
-		try {
-			const resp = await apiRequest<AuthResponse>("POST", callbackUrl, {
-				body: { username, ticket },
-				isInternal: true,
-				fetch,
-			});
-
-			setToken(cookies, resp.token);
-			redirect(303, "/auth/welcome");
-		} catch (e) {
-			if (isRedirect(e)) throw e;
-			log.error("Could not sign up user with username %s:", username, e);
-			if (e instanceof ApiError) return { error: e.obj };
-			throw e;
-		}
-	};
-}

Foxnouns.Frontend/src/lib/i18n/locales/en.json

@@ -46,7 +46,7 @@
 		"remote-fediverse-account-label": "Your Fediverse account",
 		"register-username-label": "Username",
 		"register-button": "Register account",
-		"register-with-mastodon": "Register with a Fediverse account",
+		"register-with-fediverse": "Register with a Fediverse account",
 		"log-in-with-fediverse-error-blurb": "Is your instance returning an error?",
 		"log-in-with-fediverse-force-refresh-button": "Force a refresh on our end",
 		"register-with-discord": "Register with a Discord account",