From 43c51b3133eedd420526608bb6ff3461f68c613a Mon Sep 17 00:00:00 2001
From: Shanidhya01 <luckykumar0011s@gmail.com>
Date: Wed, 27 May 2026 23:31:21 +0530
Subject: [PATCH] fix: resolve GitHub OAuth redirect failure

---
 .env.example    |  5 +++-
 src/lib/auth.ts | 67 +++++++++++++++++++++++++++++++++----------------
 2 files changed, 50 insertions(+), 22 deletions(-)

diff --git a/.env.example b/.env.example
index 4b262154a..e2c6f404b 100644
--- a/.env.example
+++ b/.env.example
@@ -11,7 +11,10 @@ SUPABASE_SERVICE_ROLE_KEY=your_supabase_service_role_key
 
 # -------------------------------------------------------
 # NextAuth
-# The URL your app is running on
+# MUST match the deployed origin exactly (no trailing slash).
+# Local:      http://localhost:3000
+# Production: https://devtrack-delta.vercel.app  (set this in Vercel env vars)
+# Wrong value causes OAuth callback URL mismatch → error=github on sign-in.
 NEXTAUTH_URL=http://localhost:3000
 
 # Generate with: openssl rand -base64 32
diff --git a/src/lib/auth.ts b/src/lib/auth.ts
index 264ef9b9f..e5d82e418 100644
--- a/src/lib/auth.ts
+++ b/src/lib/auth.ts
@@ -5,7 +5,7 @@ import { supabaseAdmin } from "./supabase";
 
 const SESSION_MAX_AGE = 30 * 24 * 60 * 60;
 const SESSION_UPDATE_AGE = 24 * 60 * 60;
-const useSecureCookies = process.env.NODE_ENV === "production";
+const useSecureCookies = process.env.NEXTAUTH_URL?.startsWith("https://") ?? process.env.NODE_ENV === "production";
 
 const GITHUB_API = "https://api.github.com";
 // Re-validate the stored GitHub token at most once every 24 hours per session.
@@ -24,8 +24,19 @@ export const authOptions: NextAuthOptions = {
     }),
   ],
   pages: {
-  signIn: "/auth/signin",
-},
+    signIn: "/auth/signin",
+  },
+  cookies: {
+    sessionToken: {
+      name: `${useSecureCookies ? "__Secure-" : ""}next-auth.session-token`,
+      options: {
+        httpOnly: true,
+        sameSite: "lax",
+        path: "/",
+        secure: useSecureCookies,
+      },
+    },
+  },
   session: {
     strategy: "jwt",
     maxAge: SESSION_MAX_AGE,
@@ -38,26 +49,40 @@ export const authOptions: NextAuthOptions = {
     async signIn({ account, profile }) {
       if (account?.provider === "github" && profile) {
         const p = profile as { id: number; login: string };
-        const { data: user } = await supabaseAdmin.from("users").upsert(
-          {
-            github_id: String(p.id),
-            github_login: p.login,
-            updated_at: new Date().toISOString(),
-          },
-          { onConflict: "github_id" }
-        ).select("id").single();
+        try {
+          const { data: user, error: upsertError } = await supabaseAdmin
+            .from("users")
+            .upsert(
+              {
+                github_id: String(p.id),
+                github_login: p.login,
+                updated_at: new Date().toISOString(),
+              },
+              { onConflict: "github_id" }
+            )
+            .select("id")
+            .single();
+
+          if (upsertError) {
+            console.error("[auth] Supabase upsert error:", upsertError);
+          }
 
-        if (user?.id && account.access_token) {
-          try {
-            await syncGitHubAchievementsForUser({
-              userId: user.id,
-              githubLogin: p.login,
-              token: account.access_token,
-              force: true,
-            });
-          } catch (error) {
-            console.error("GitHub achievements sync failed:", error);
+          if (user?.id && account.access_token) {
+            try {
+              await syncGitHubAchievementsForUser({
+                userId: user.id,
+                githubLogin: p.login,
+                token: account.access_token,
+                force: true,
+              });
+            } catch (error) {
+              console.error("[auth] GitHub achievements sync failed:", error);
+            }
           }
+        } catch (error) {
+          // Database failures must not block sign-in — the user is authenticated
+          // by GitHub; local sync is best-effort.
+          console.error("[auth] signIn callback error (non-fatal):", error);
         }
       }
       return true;