cleanup

src/routes/api/Gaze/appcast.xml.ts

@@ -8,7 +8,7 @@ import { env } from "~/env/server";
  *
  * URL: https://freno.me/api/Gaze/appcast.xml
  */
-export async function GET(event: APIEvent) {
+export async function GET(_event: APIEvent) {
   const bucket = env.VITE_DOWNLOAD_BUCKET_STRING;
   const key = "api/Gaze/appcast.xml";
 
@@ -47,7 +47,7 @@ export async function GET(event: APIEvent) {
       headers: {
         "Content-Type": "application/xml; charset=utf-8",
         "Cache-Control": "public, max-age=300", // Cache for 5 minutes
-        "Access-Control-Allow-Origin": "*" // Allow CORS for appcast
+        "Access-Control-Allow-Origin": "*" // Allow CORS for Sparkle appcast
       }
     });
   } catch (error) {

src/routes/api/InputHalo/appcast.xml.ts

@@ -8,7 +8,7 @@ import { env } from "~/env/server";
  *
  * URL: https://freno.me/api/InputHalo/appcast.xml
  */
-export async function GET(event: APIEvent) {
+export async function GET(_event: APIEvent) {
   const bucket = env.VITE_DOWNLOAD_BUCKET_STRING;
   const key = "api/InputHalo/appcast.xml";
 
@@ -47,7 +47,7 @@ export async function GET(event: APIEvent) {
       headers: {
         "Content-Type": "application/xml; charset=utf-8",
         "Cache-Control": "public, max-age=300", // Cache for 5 minutes
-        "Access-Control-Allow-Origin": "*" // Allow CORS for appcast
+        "Access-Control-Allow-Origin": "*" // Allow CORS for Sparkle appcast
       }
     });
   } catch (error) {

src/routes/api/auth/callback/github.ts

@@ -1,86 +1,26 @@
 import type { APIEvent } from "@solidjs/start/server";
-import { createServerCaller } from "~/server/api/root";
+import {
+  createAuthCallbackHandler,
+  redirectError
+} from "~/lib/auth-callback-utils";
 
 export async function GET(event: APIEvent) {
   const url = new URL(event.request.url);
   const code = url.searchParams.get("code");
   const error = url.searchParams.get("error");
 
-  console.log("[GitHub OAuth Callback] Request received:", {
-    hasCode: !!code,
-    codeLength: code?.length,
-    error
-  });
-
   if (error) {
-    console.error("[GitHub OAuth Callback] OAuth error from provider:", error);
-    return new Response(null, {
-      status: 302,
-      headers: { Location: `/login?error=${encodeURIComponent(error)}` }
-    });
+    return redirectError(error);
   }
 
   if (!code) {
-    console.error("[GitHub OAuth Callback] Missing authorization code");
-    return new Response(null, {
-      status: 302,
-      headers: { Location: "/login?error=missing_code" }
-    });
+    return redirectError("missing_code");
   }
 
-  try {
-    console.log("[GitHub OAuth Callback] Creating tRPC caller...");
-    const caller = await createServerCaller(event);
+  const handler = createAuthCallbackHandler<{ code: string }>(
+    "githubCallback",
+    (caller, params) => caller.auth.githubCallback(params)
+  );
 
-    console.log("[GitHub OAuth Callback] Calling githubCallback procedure...");
-    const result = await caller.auth.githubCallback({ code });
-
-    console.log("[GitHub OAuth Callback] Result:", result);
-
-    if (result.success) {
-      console.log(
-        "[GitHub OAuth Callback] Login successful, redirecting to:",
-        result.redirectTo
-      );
-
-      // Auth handler already set cookie headers
-      // Just redirect - the cookies are already in the response
-      const redirectUrl = result.redirectTo || "/account";
-      return new Response(null, {
-        status: 302,
-        headers: { Location: redirectUrl }
-      });
-    } else {
-      console.error(
-        "[GitHub OAuth Callback] Login failed (result.success=false)"
-      );
-      return new Response(null, {
-        status: 302,
-        headers: { Location: "/login?error=auth_failed" }
-      });
-    }
-  } catch (error) {
-    console.error("[GitHub OAuth Callback] Error caught:", error);
-
-    if (error && typeof error === "object" && "code" in error) {
-      const trpcError = error as { code: string; message?: string };
-
-      console.error("[GitHub OAuth Callback] tRPC error:", {
-        code: trpcError.code,
-        message: trpcError.message
-      });
-
-      if (trpcError.code === "CONFLICT") {
-        return new Response(null, {
-          status: 302,
-          headers: { Location: "/login?error=email_in_use" }
-        });
-      }
-    }
-
-    return new Response(null, {
-      status: 302,
-      headers: { Location: "/login?error=server_error" }
-    });
-  }
+  return handler(event, { code });
 }

src/routes/api/auth/callback/google.ts

@@ -1,86 +1,26 @@
 import type { APIEvent } from "@solidjs/start/server";
-import { createServerCaller } from "~/server/api/root";
+import {
+  createAuthCallbackHandler,
+  redirectError
+} from "~/lib/auth-callback-utils";
 
 export async function GET(event: APIEvent) {
   const url = new URL(event.request.url);
   const code = url.searchParams.get("code");
   const error = url.searchParams.get("error");
 
-  console.log("[Google OAuth Callback] Request received:", {
-    hasCode: !!code,
-    codeLength: code?.length,
-    error
-  });
-
   if (error) {
-    console.error("[Google OAuth Callback] OAuth error from provider:", error);
-    return new Response(null, {
-      status: 302,
-      headers: { Location: `/login?error=${encodeURIComponent(error)}` }
-    });
+    return redirectError(error);
   }
 
   if (!code) {
-    console.error("[Google OAuth Callback] Missing authorization code");
-    return new Response(null, {
-      status: 302,
-      headers: { Location: "/login?error=missing_code" }
-    });
+    return redirectError("missing_code");
   }
 
-  try {
-    console.log("[Google OAuth Callback] Creating tRPC caller...");
-    const caller = await createServerCaller(event);
+  const handler = createAuthCallbackHandler<{ code: string }>(
+    "googleCallback",
+    (caller, params) => caller.auth.googleCallback(params)
+  );
 
-    console.log("[Google OAuth Callback] Calling googleCallback procedure...");
-    const result = await caller.auth.googleCallback({ code });
-
-    console.log("[Google OAuth Callback] Result:", result);
-
-    if (result.success) {
-      console.log(
-        "[Google OAuth Callback] Login successful, redirecting to:",
-        result.redirectTo
-      );
-
-      // Auth handler already set cookie headers
-      // Just redirect - the cookies are already in the response
-      const redirectUrl = result.redirectTo || "/account";
-      return new Response(null, {
-        status: 302,
-        headers: { Location: redirectUrl }
-      });
-    } else {
-      console.error(
-        "[Google OAuth Callback] Login failed (result.success=false)"
-      );
-      return new Response(null, {
-        status: 302,
-        headers: { Location: "/login?error=auth_failed" }
-      });
-    }
-  } catch (error) {
-    console.error("[Google OAuth Callback] Error caught:", error);
-
-    if (error && typeof error === "object" && "code" in error) {
-      const trpcError = error as { code: string; message?: string };
-
-      console.error("[Google OAuth Callback] tRPC error:", {
-        code: trpcError.code,
-        message: trpcError.message
-      });
-
-      if (trpcError.code === "CONFLICT") {
-        return new Response(null, {
-          status: 302,
-          headers: { Location: "/login?error=email_in_use" }
-        });
-      }
-    }
-
-    return new Response(null, {
-      status: 302,
-      headers: { Location: "/login?error=server_error" }
-    });
-  }
+  return handler(event, { code });
 }

src/routes/api/auth/email-login-callback.ts

@@ -1,86 +1,32 @@
 import type { APIEvent } from "@solidjs/start/server";
-import { createServerCaller } from "~/server/api/root";
+import {
+  createAuthCallbackHandler,
+  redirectError
+} from "~/lib/auth-callback-utils";
 
 export async function GET(event: APIEvent) {
   const url = new URL(event.request.url);
   const email = url.searchParams.get("email");
   const token = url.searchParams.get("token");
 
-  console.log("[Email Login Callback] Request received:", {
-    email,
-    hasToken: !!token,
-    tokenLength: token?.length
-  });
-
   if (!email || !token) {
-    console.error("[Email Login Callback] Missing required parameters:", {
-      hasEmail: !!email,
-      hasToken: !!token
-    });
-    return new Response(null, {
-      status: 302,
-      headers: { Location: "/login?error=missing_params" }
-    });
+    return redirectError("missing_params");
   }
 
-  try {
-    console.log("[Email Login Callback] Creating tRPC caller...");
-    // Create tRPC caller to invoke the emailLogin procedure
-    const caller = await createServerCaller(event);
-
-    console.log("[Email Login Callback] Calling emailLogin procedure...");
-    // Call the email login handler - rememberMe will be read from JWT payload
-    const result = await caller.auth.emailLogin({
-      email,
-      token
-    });
-
-    console.log("[Email Login Callback] Login result:", result);
-
-    if (result.success) {
-      console.log(
-        "[Email Login Callback] Login successful, redirecting to:",
-        result.redirectTo
-      );
-
-      // Auth handler already set cookie headers
-      // Just redirect - the cookies are already in the response
-      const redirectUrl = result.redirectTo || "/account";
-      return new Response(null, {
-        status: 302,
-        headers: { Location: redirectUrl }
-      });
-    } else {
-      console.error(
-        "[Email Login Callback] Login failed (result.success=false)"
-      );
-      return new Response(null, {
-        status: 302,
-        headers: { Location: "/login?error=auth_failed" }
-      });
+  const handler = createAuthCallbackHandler<{
+    email: string;
+    token: string;
+  }>(
+    "emailLogin",
+    (caller, params) => caller.auth.emailLogin(params),
+    (error) => {
+      // Check for token expiration
+      const message = error instanceof Error ? error.message : "";
+      const isTokenError =
+        message.includes("expired") || message.includes("invalid");
+      return redirectError(isTokenError ? "link_expired" : "server_error");
     }
-  } catch (error) {
-    console.error("[Email Login Callback] Error caught:", error);
+  );
 
-    // Check if it's a token expiration error
-    const errorMessage =
-      error instanceof Error ? error.message : "server_error";
-    const isTokenError =
-      errorMessage.includes("expired") || errorMessage.includes("invalid");
-
-    console.error("[Email Login Callback] Error details:", {
-      errorMessage,
-      isTokenError,
-      errorType: error instanceof Error ? error.constructor.name : typeof error
-    });
-
-    return new Response(null, {
-      status: 302,
-      headers: {
-        Location: isTokenError
-          ? "/login?error=link_expired"
-          : "/login?error=server_error"
-      }
-    });
-  }
+  return handler(event, { email, token });
 }