From 2de09a0183875af6434555b4c1d0b8b910047874 Mon Sep 17 00:00:00 2001
From: clarayin129 <clarayin129@gmail.com>
Date: Sun, 7 Sep 2025 18:10:35 -0700
Subject: [PATCH 1/3] Add signIn on client and callback

---
 .../_components/AuthForms/LoginForm.tsx       | 21 +++++++++++++
 auth.ts                                       | 31 +++++++++++++++++++
 2 files changed, 52 insertions(+)

diff --git a/app/(pages)/(hackers)/_components/AuthForms/LoginForm.tsx b/app/(pages)/(hackers)/_components/AuthForms/LoginForm.tsx
index 75b0ee72..c3ebe258 100644
--- a/app/(pages)/(hackers)/_components/AuthForms/LoginForm.tsx
+++ b/app/(pages)/(hackers)/_components/AuthForms/LoginForm.tsx
@@ -4,6 +4,7 @@ import { useRouter } from 'next/navigation';
 
 import LoginAction from '@actions/auth/login';
 import AuthForm from '@components/AuthForm/AuthForm';
+import { signIn } from 'next-auth/react';
 
 export default function LoginForm() {
   const router = useRouter();
@@ -33,7 +34,12 @@ export default function LoginForm() {
     },
   ];
 
+  const handleGoogleLogin = async () => {
+    await signIn('google', { callbackUrl: '/' });
+  };
+
   return (
+    <div>
     <AuthForm
       role="hacker"
       fields={formFields}
@@ -47,5 +53,20 @@ export default function LoginForm() {
       onSubmit={onSubmit}
       onSuccess={onSuccess}
     />
+    <button
+        onClick={handleGoogleLogin}
+        style={{
+          marginTop: '1rem',
+          padding: '0.75rem 1.5rem',
+          backgroundColor: '#4285F4',
+          color: '#fff',
+          borderRadius: '6px',
+          fontWeight: 'bold',
+          cursor: 'pointer',
+        }}
+      >
+        Sign in with Google
+      </button>
+    </div>
   );
 }
diff --git a/auth.ts b/auth.ts
index 6839c29b..44c85a85 100644
--- a/auth.ts
+++ b/auth.ts
@@ -1,4 +1,5 @@
 import NextAuth, { DefaultSession } from 'next-auth';
+import GoogleProvider from 'next-auth/providers/google';
 import 'next-auth/jwt';
 import Credentials from 'next-auth/providers/credentials';
 import { compare } from 'bcryptjs';
@@ -79,6 +80,18 @@ export const { auth, handlers, signIn, signOut } = NextAuth({
         }
       },
     }),
+    GoogleProvider({
+      clientId: process.env.GOOGLE_CLIENT_ID,
+      clientSecret: process.env.GOOGLE_CLIENT_SECRET,
+      authorization: {
+        params: {
+          prompt: 'consent',
+          access_type: 'offline',
+          response_type: 'code',
+          scope: 'openid email profile',
+        },
+      },
+    }),
   ],
   callbacks: {
     async jwt({ token, user }) {
@@ -95,6 +108,24 @@ export const { auth, handlers, signIn, signOut } = NextAuth({
       session.user.role = token.role;
       return session;
     },
+    async signIn({ account, profile }) {
+      if (!account || !profile?.email) {
+        console.log('[NextAuth] Missing account or profile', { account, profile });
+        return false;
+      }
+      if (account?.provider === 'google' && profile?.email) {
+        const response = await GetManyUsers({ email: profile.email });
+        if (!response.ok || response.body.length === 0) {
+          console.log(`[NextAuth] Google login denied, user not found: ${profile.email}`);
+          return false; // Deny sign-in if user not in DB
+        }
+
+        console.log(`[NextAuth] Google login allowed for: ${profile.email}`);
+        return true;
+      }
+
+    return true; // allow sign-in
+  },
   },
   secret: process.env.AUTH_SECRET,
 });

From cf246739baff8add190367a7867e47b0a5614a58 Mon Sep 17 00:00:00 2001
From: clarayin129 <clarayin129@gmail.com>
Date: Sun, 7 Sep 2025 18:21:57 -0700
Subject: [PATCH 2/3] Fix prettier problems

---
 .../_components/AuthForms/LoginForm.tsx       | 28 +++++++++----------
 auth.ts                                       | 13 ++++++---
 2 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/app/(pages)/(hackers)/_components/AuthForms/LoginForm.tsx b/app/(pages)/(hackers)/_components/AuthForms/LoginForm.tsx
index c3ebe258..c3b676e3 100644
--- a/app/(pages)/(hackers)/_components/AuthForms/LoginForm.tsx
+++ b/app/(pages)/(hackers)/_components/AuthForms/LoginForm.tsx
@@ -40,20 +40,20 @@ export default function LoginForm() {
 
   return (
     <div>
-    <AuthForm
-      role="hacker"
-      fields={formFields}
-      buttonText="Log in →"
-      linkText="Forgot Password?"
-      linkHref="/login/forgot-password"
-      initialValues={{
-        email: '',
-        password: '',
-      }}
-      onSubmit={onSubmit}
-      onSuccess={onSuccess}
-    />
-    <button
+      <AuthForm
+        role="hacker"
+        fields={formFields}
+        buttonText="Log in →"
+        linkText="Forgot Password?"
+        linkHref="/login/forgot-password"
+        initialValues={{
+          email: '',
+          password: '',
+        }}
+        onSubmit={onSubmit}
+        onSuccess={onSuccess}
+      />
+      <button
         onClick={handleGoogleLogin}
         style={{
           marginTop: '1rem',
diff --git a/auth.ts b/auth.ts
index 44c85a85..f0c4507d 100644
--- a/auth.ts
+++ b/auth.ts
@@ -110,13 +110,18 @@ export const { auth, handlers, signIn, signOut } = NextAuth({
     },
     async signIn({ account, profile }) {
       if (!account || !profile?.email) {
-        console.log('[NextAuth] Missing account or profile', { account, profile });
+        console.log('[NextAuth] Missing account or profile', {
+          account,
+          profile,
+        });
         return false;
       }
       if (account?.provider === 'google' && profile?.email) {
         const response = await GetManyUsers({ email: profile.email });
         if (!response.ok || response.body.length === 0) {
-          console.log(`[NextAuth] Google login denied, user not found: ${profile.email}`);
+          console.log(
+            `[NextAuth] Google login denied, user not found: ${profile.email}`
+          );
           return false; // Deny sign-in if user not in DB
         }
 
@@ -124,8 +129,8 @@ export const { auth, handlers, signIn, signOut } = NextAuth({
         return true;
       }
 
-    return true; // allow sign-in
-  },
+      return true; // allow sign-in
+    },
   },
   secret: process.env.AUTH_SECRET,
 });

From 67ed73ad74c1aeeeb05804c37aad6c5f9f45f414 Mon Sep 17 00:00:00 2001
From: Jack Zheng <jackzheng274@gmail.com>
Date: Tue, 4 Nov 2025 13:43:18 -0800
Subject: [PATCH 3/3] Add logs and additional check under jwt for users from
 MongoDB

---
 auth.ts | 78 +++++++++++++++++++++++++++++++++++----------------------
 1 file changed, 48 insertions(+), 30 deletions(-)

diff --git a/auth.ts b/auth.ts
index f0c4507d..b65b3132 100644
--- a/auth.ts
+++ b/auth.ts
@@ -1,13 +1,13 @@
-import NextAuth, { DefaultSession } from 'next-auth';
-import GoogleProvider from 'next-auth/providers/google';
-import 'next-auth/jwt';
-import Credentials from 'next-auth/providers/credentials';
-import { compare } from 'bcryptjs';
-import { z } from 'zod';
+import NextAuth, { DefaultSession } from "next-auth";
+import GoogleProvider from "next-auth/providers/google";
+import "next-auth/jwt";
+import Credentials from "next-auth/providers/credentials";
+import { compare } from "bcryptjs";
+import { z } from "zod";
 
-import { GetManyUsers } from '@datalib/users/getUser';
+import { GetManyUsers } from "@datalib/users/getUser";
 
-declare module 'next-auth' {
+declare module "next-auth" {
   interface User {
     id?: string;
     email?: string | null;
@@ -19,11 +19,11 @@ declare module 'next-auth' {
       id: string;
       email: string;
       role: string;
-    } & DefaultSession['user'];
+    } & DefaultSession["user"];
   }
 }
 
-declare module 'next-auth/jwt' {
+declare module "next-auth/jwt" {
   interface JWT {
     id: string;
     email: string;
@@ -31,20 +31,20 @@ declare module 'next-auth/jwt' {
   }
 }
 
-const emailSchema = z.string().email('Invalid email address.');
+const emailSchema = z.string().email("Invalid email address.");
 
 const passwordSchema = z
   .string()
-  .min(6, { message: 'Password must be at least 6 characters long.' })
-  .max(20, { message: 'Password cannot be longer than 20 characters.' });
+  .min(6, { message: "Password must be at least 6 characters long." })
+  .max(20, { message: "Password cannot be longer than 20 characters." });
 
 export const { auth, handlers, signIn, signOut } = NextAuth({
-  session: { strategy: 'jwt' },
+  session: { strategy: "jwt" },
   providers: [
     Credentials({
       credentials: {
-        email: { label: 'email', type: 'text' },
-        password: { label: 'password', type: 'password' },
+        email: { label: "email", type: "text" },
+        password: { label: "password", type: "password" },
       },
       async authorize(credentials) {
         try {
@@ -56,14 +56,14 @@ export const { auth, handlers, signIn, signOut } = NextAuth({
           const response = await GetManyUsers({ email });
 
           if (!response.ok || response.body.length === 0) {
-            throw new Error(response.error ?? 'User not found.');
+            throw new Error(response.error ?? "User not found.");
           }
 
           const user = response.body[0];
 
           const passwordCorrect = await compare(password, user.password);
           if (!passwordCorrect) {
-            throw new Error('Invalid email address or password.');
+            throw new Error("Invalid email address or password.");
           }
 
           return {
@@ -73,7 +73,7 @@ export const { auth, handlers, signIn, signOut } = NextAuth({
           };
         } catch (error) {
           if (error instanceof z.ZodError) {
-            const errorMessage = error.errors.map((e) => e.message).join(' ');
+            const errorMessage = error.errors.map((e) => e.message).join(" ");
             throw new Error(errorMessage);
           }
           throw error;
@@ -85,51 +85,69 @@ export const { auth, handlers, signIn, signOut } = NextAuth({
       clientSecret: process.env.GOOGLE_CLIENT_SECRET,
       authorization: {
         params: {
-          prompt: 'consent',
-          access_type: 'offline',
-          response_type: 'code',
-          scope: 'openid email profile',
+          prompt: "consent",
+          access_type: "offline",
+          response_type: "code",
+          scope: "openid email profile",
         },
       },
     }),
   ],
   callbacks: {
     async jwt({ token, user }) {
+      // When user first logs in (Google or Credentials)
       if (user) {
-        token.id = user.id ?? 'User ID not found';
-        token.email = user.email ?? 'User email not found';
-        token.role = user.role;
+        console.log("Jwt() got user:", user);
+        // Try to get user data from your MongoDB
+        const dbUser = await GetManyUsers({ email: user.email });
+        if (dbUser.ok && dbUser.body.length > 0) {
+          token.role = dbUser.body[0].role;
+          token.id = dbUser.body[0]._id.toString();
+        } else {
+          token.role = "unknown";
+        }
       }
+
+      console.log("Final JWT token:", token);
       return token;
     },
     async session({ session, token }) {
+      console.log("Session() token:", token);
       session.user.id = token.id;
       session.user.email = token.email;
       session.user.role = token.role;
+      console.log("Final session object:", session);
       return session;
     },
     async signIn({ account, profile }) {
+      console.log("Account info:", account);
+      console.log("Profile info:", profile);
+
       if (!account || !profile?.email) {
-        console.log('[NextAuth] Missing account or profile', {
+        console.log("[NextAuth] Missing account or profile", {
           account,
           profile,
         });
         return false;
       }
-      if (account?.provider === 'google' && profile?.email) {
+
+      if (account?.provider === "google" && profile?.email) {
+        console.log("Checking MongoDB for:", profile.email);
         const response = await GetManyUsers({ email: profile.email });
+        console.log("MongoDB lookup result:", response);
+
         if (!response.ok || response.body.length === 0) {
           console.log(
             `[NextAuth] Google login denied, user not found: ${profile.email}`
           );
-          return false; // Deny sign-in if user not in DB
+          return false;
         }
 
         console.log(`[NextAuth] Google login allowed for: ${profile.email}`);
         return true;
       }
 
-      return true; // allow sign-in
+      return true;
     },
   },
   secret: process.env.AUTH_SECRET,