fix oauth

Author: husamql3

TODO.md

@@ -1,12 +1,12 @@
 - [ ] profile page
-- [ ] update metadata
 - [ ] unified sonner styles (success - loading - error)
 - [ ] Add resources page
   - [ ] How to use LeetCode
   - [ ] Advices for problem solving
 - [ ] change checkbox color
 - [ ] Nav bar in mobile screens, add text
 - [ ] update problems scrollbar
+- [x] update metadata
 - [x] add banner & stars count & techs
 - [x] Add gh stars count
 - [x] use google analytics

src/app/(auth)/_components/user-menu.tsx

@@ -1,6 +1,6 @@
 'use client'
 
-import { IoPersonOutline } from 'react-icons/io5'
+// import { IoPersonOutline } from 'react-icons/io5'
 import type { User } from '@supabase/supabase-js'
 
 import { Avatar, AvatarFallback, AvatarImage } from '@/ui/avatar'
@@ -9,7 +9,7 @@ import {
   DropdownMenu,
   DropdownMenuContent,
   DropdownMenuGroup,
-  DropdownMenuItem,
+  // DropdownMenuItem,
   DropdownMenuLabel,
   DropdownMenuSeparator,
   DropdownMenuTrigger,
@@ -37,16 +37,16 @@ export const UserMenu = ({ user }: { user: User }) => {
         <DropdownMenuLabel className="flex min-w-0 flex-col">
           <span className="text-muted-foreground truncate text-xs font-normal">{user?.email}</span>
         </DropdownMenuLabel>
-        <DropdownMenuSeparator />
+        {/* <DropdownMenuSeparator /> */}
         <DropdownMenuGroup>
-          <DropdownMenuItem>
+          {/* <DropdownMenuItem>
             <IoPersonOutline
               size={16}
               className="opacity-60"
               aria-hidden="true"
             />
             <span>Profile</span>
-          </DropdownMenuItem>
+          </DropdownMenuItem> */}
         </DropdownMenuGroup>
         <DropdownMenuSeparator />
         <LogoutBtn />

src/app/(auth)/auth/callback/route.ts

@@ -1,24 +1,44 @@
 import { NextResponse } from 'next/server'
 
 import { createClient } from '@/supabase/server'
+import { sendAdminNotification } from '@/utils/email/sendAdminNotification'
 
 export async function GET(request: Request) {
   const { searchParams, origin } = new URL(request.url)
   const code = searchParams.get('code')
-  const next = searchParams.get('next') ?? '/'
-
-  if (code) {
-    const supabase = await createClient()
-    const { error } = await supabase.auth.exchangeCodeForSession(code)
-    if (!error) {
-      const forwardedHost = request.headers.get('x-forwarded-host')
-      const isLocalEnv = process.env.NODE_ENV === 'development'
-
-      if (isLocalEnv) return NextResponse.redirect(`${origin}${next}`)
-      if (forwardedHost) return NextResponse.redirect(`https://${forwardedHost}${next}`)
-      return NextResponse.redirect(`${origin}${next}`)
-    }
+
+  if (!code) {
+    console.error('No code provided')
+    return NextResponse.redirect(`${origin}/auth/auth-code-error`)
+  }
+
+  const supabase = await createClient()
+  const { error } = await supabase.auth.exchangeCodeForSession(code)
+  if (error) {
+    console.error('Error exchanging code for session:', error)
+    return NextResponse.redirect(`${origin}/auth/error`)
+  }
+
+  // Check if this is a new user (first sign-in)
+  const { data: userData } = await supabase.auth.getUser()
+  const { data: sessionData } = await supabase.auth.getSession()
+  const createdAt = new Date(userData?.user?.created_at || '')
+  const currentTime = new Date()
+
+  // If user was created less than 5 minutes ago, consider them a new user
+  const isNewUser = currentTime.getTime() - createdAt.getTime() < 5 * 60 * 1000
+
+  // Send notification to admin about new user registration
+  if (isNewUser && userData?.user) {
+    await sendAdminNotification({
+      event: 'NEW_USER_REGISTRATION',
+      userId: userData.user.id,
+      email: userData.user.email || 'No email provided',
+      provider: sessionData?.session?.provider_token ? 'OAuth' : 'Email',
+      userMetadata: JSON.stringify(userData.user.user_metadata),
+      timestamp: new Date().toISOString(),
+    })
   }
 
-  return NextResponse.redirect(`${origin}/auth/auth-code-error`)
+  return NextResponse.redirect(`${origin}/`)
 }

src/app/(public)/groups/group-card.tsx

@@ -28,7 +28,7 @@ export const GroupCard = ({ group, problemsCount }: GroupCardProps) => {
   const isFull = leetcodersCount >= maxLeetcoders
 
   return (
-    <Card className="relative z-50 overflow-hidden border border-zinc-700/10 bg-gradient-to-tr from-[#141416] to-[#1C1C1C] shadow-[0_8px_24px_rgba(0,0,0,0.3)] backdrop-blur-md before:absolute before:inset-0 before:-z-10 before:rounded-lg before:bg-gradient-to-tr before:from-zinc-900/20 before:to-zinc-800/5 before:opacity-20 after:absolute after:inset-0 after:-z-20 after:bg-[url('/noise.png')] after:[background-size:200px] after:opacity-[0.15] after:mix-blend-overlay">
+    <Card className="relative z-50 overflow-hidden border border-zinc-700/10 bg-gradient-to-tr from-[#141416] to-[#1C1C1C] shadow-[0_8px_24px_rgba(0,0,0,0.3)] backdrop-blur-md before:absolute before:inset-0 before:-z-10 before:rounded-lg before:bg-gradient-to-tr before:from-zinc-900/20 before:to-zinc-800/5 before:opacity-20 after:absolute after:inset-0 after:-z-20 after:[background-size:200px] after:opacity-[0.15] after:mix-blend-overlay">
       <CardHeader>
         <div className="flex flex-wrap items-center justify-between gap-3">
           <div className="flex items-center gap-3">

src/supabase/middleware.ts

@@ -5,10 +5,9 @@ import { env } from '@/config/env.mjs'
 import { ADMINS_EMAILS, PROTECTED_ROUTES } from '@/data/constants'
 
 export async function updateSession(request: NextRequest) {
-  const { searchParams, pathname } = new URL(request.url)
-  const code = searchParams.get('code')
+  const { pathname } = new URL(request.url)
 
-  let response = NextResponse.next({
+  const response = NextResponse.next({
     request: {
       headers: request.headers,
     },
@@ -23,12 +22,6 @@ export async function updateSession(request: NextRequest) {
           return request.cookies.getAll()
         },
         setAll(cookiesToSet) {
-          for (const { name, value } of cookiesToSet) {
-            request.cookies.set(name, value)
-          }
-          response = NextResponse.next({
-            request,
-          })
           for (const { name, value, options } of cookiesToSet) {
             response.cookies.set(name, value, options)
           }
@@ -37,33 +30,13 @@ export async function updateSession(request: NextRequest) {
     }
   )
 
-  if (code) {
-    try {
-      const { error } = await supabase.auth.exchangeCodeForSession(code)
-      if (error) {
-        console.error('Error exchanging auth code:', error.message)
-      } else {
-        const redirectUrl = new URL(request.url)
-        redirectUrl.searchParams.delete('code')
-
-        const redirectResponse = NextResponse.redirect(redirectUrl)
-        for (const cookie of response.cookies.getAll()) {
-          redirectResponse.cookies.set(cookie.name, cookie.value)
-        }
-
-        return redirectResponse
-      }
-    } catch (err) {
-      console.error('Exception during auth code exchange:', err)
-    }
-  }
-
-  // IMPORTANT: DO NOT REMOVE auth.getUser()
+  // Get the current user session
   const {
     data: { user },
   } = await supabase.auth.getUser()
-  console.log('middleware user', user?.email)
+  console.log('Middleware user:', user?.email)
 
+  // Protect specific routes
   if (PROTECTED_ROUTES.some((route) => pathname.startsWith(route))) {
     if (!user || !user.email || !ADMINS_EMAILS.includes(user.email)) {
       return NextResponse.redirect(new URL('/not-found', request.url))
@@ -72,3 +45,7 @@ export async function updateSession(request: NextRequest) {
 
   return response
 }
+
+export const config = {
+  matcher: ['/dashboard/:path*', '/profile/:path*'],
+}