cleanup

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 });
 }