Removed unused login page

pkorrakuti-mvrk · pkorrakuti-mvrk · commit fa1d2df41b4c · 2026-05-28T23:59:07.000+05:30
diff --git a/src/app/(app)/admin/bank-accounts/page.tsx b/src/app/(app)/admin/bank-accounts/page.tsx
@@ -9,7 +9,7 @@ import { BankAccountManager } from './bank-account-manager'
 export default async function AdminBankAccountsPage() {
   const supabase = await createClient()
   const { data: { user } } = await supabase.auth.getUser()
-  if (!user) redirect('/auth/login')
+  if (!user) redirect('/')
 
   const { data: profile } = await supabase
     .from('profiles')
diff --git a/src/app/(app)/admin/donations/page.tsx b/src/app/(app)/admin/donations/page.tsx
@@ -29,7 +29,7 @@ type DonationRow = {
 export default async function AdminDonationsPage() {
   const supabase = await createClient()
   const { data: { user } } = await supabase.auth.getUser()
-  if (!user) redirect('/auth/login')
+  if (!user) redirect('/')
 
   const { data: profile } = await supabase
     .from('profiles')
diff --git a/src/app/(app)/admin/loans/[loan_number]/page.tsx b/src/app/(app)/admin/loans/[loan_number]/page.tsx
@@ -41,7 +41,7 @@ export default async function AdminLoanManagePage({
 }) {
   const supabase = await createClient()
   const { data: { user } } = await supabase.auth.getUser()
-  if (!user) redirect('/auth/login')
+  if (!user) redirect('/')
 
   const { data: profile } = await supabase
     .from('profiles')
diff --git a/src/app/(app)/admin/loans/new/page.tsx b/src/app/(app)/admin/loans/new/page.tsx
@@ -6,7 +6,7 @@ import { NewLoanForm } from './new-loan-form'
 export default async function NewLoanPage() {
   const supabase = await createClient()
   const { data: { user } } = await supabase.auth.getUser()
-  if (!user) redirect('/auth/login')
+  if (!user) redirect('/')
 
   const { data: profile } = await supabase
     .from('profiles')
diff --git a/src/app/(app)/admin/loans/page.tsx b/src/app/(app)/admin/loans/page.tsx
@@ -19,7 +19,7 @@ export default async function AdminLoansListPage({
   const initialTab: LoansTabKey = params.tab === 'past' ? 'past' : 'active'
   const supabase = await createClient()
   const { data: { user } } = await supabase.auth.getUser()
-  if (!user) redirect('/auth/login')
+  if (!user) redirect('/')
 
   const { data: profile } = await supabase
     .from('profiles')
diff --git a/src/app/(app)/admin/page.tsx b/src/app/(app)/admin/page.tsx
@@ -7,7 +7,7 @@ import Link from 'next/link'
 export default async function AdminPage() {
   const supabase = await createClient()
   const { data: { user } } = await supabase.auth.getUser()
-  if (!user) redirect('/auth/login')
+  if (!user) redirect('/')
 
   const { data: profile } = await supabase
     .from('profiles')
diff --git a/src/app/(app)/admin/pending/page.tsx b/src/app/(app)/admin/pending/page.tsx
@@ -6,7 +6,7 @@ import { PendingPaymentRow } from './pending-payment-row'
 export default async function PendingPaymentsPage() {
   const supabase = await createClient()
   const { data: { user } } = await supabase.auth.getUser()
-  if (!user) redirect('/auth/login')
+  if (!user) redirect('/')
 
   const { data: profile } = await supabase
     .from('profiles')
diff --git a/src/app/(app)/admin/polls/[id]/edit/page.tsx b/src/app/(app)/admin/polls/[id]/edit/page.tsx
@@ -9,7 +9,7 @@ export default async function EditPollPage({
   const { id } = await params
   const supabase = await createClient()
   const { data: { user } } = await supabase.auth.getUser()
-  if (!user) redirect('/auth/login')
+  if (!user) redirect('/')
   const { data: profile } = await supabase
     .from('profiles').select('role').eq('id', user.id).maybeSingle()
   if (profile?.role !== 'admin') redirect(`/polls/${id}`)
diff --git a/src/app/(app)/admin/polls/[id]/page.tsx b/src/app/(app)/admin/polls/[id]/page.tsx
@@ -20,7 +20,7 @@ export default async function AdminPollDetailPage({
   const { id } = await params
   const supabase = await createClient()
   const { data: { user } } = await supabase.auth.getUser()
-  if (!user) redirect('/auth/login')
+  if (!user) redirect('/')
   const { data: profile } = await supabase
     .from('profiles')
     .select('role')
diff --git a/src/app/(app)/admin/polls/new/page.tsx b/src/app/(app)/admin/polls/new/page.tsx
@@ -6,7 +6,7 @@ import { NewPollForm } from './new-poll-form'
 export default async function NewPollPage() {
   const supabase = await createClient()
   const { data: { user } } = await supabase.auth.getUser()
-  if (!user) redirect('/auth/login')
+  if (!user) redirect('/')
   const { data: profile } = await supabase
     .from('profiles')
     .select('role')
diff --git a/src/app/(app)/admin/transactions/[transaction_id]/page.tsx b/src/app/(app)/admin/transactions/[transaction_id]/page.tsx
@@ -15,7 +15,7 @@ export default async function AdminTransactionManagePage({
 }) {
   const supabase = await createClient()
   const { data: { user } } = await supabase.auth.getUser()
-  if (!user) redirect('/auth/login')
+  if (!user) redirect('/')
 
   const { data: profile } = await supabase
     .from('profiles')
diff --git a/src/app/(app)/admin/transactions/new/page.tsx b/src/app/(app)/admin/transactions/new/page.tsx
@@ -11,7 +11,7 @@ export default async function NewTransactionPage({
 }) {
   const supabase = await createClient()
   const { data: { user } } = await supabase.auth.getUser()
-  if (!user) redirect('/auth/login')
+  if (!user) redirect('/')
 
   const { data: profile } = await supabase
     .from('profiles')
diff --git a/src/app/(app)/admin/transactions/page.tsx b/src/app/(app)/admin/transactions/page.tsx
@@ -7,7 +7,7 @@ import { TransactionsTable, type TxnRow } from '@/components/transactions-table'
 export default async function AdminTransactionsListPage() {
   const supabase = await createClient()
   const { data: { user } } = await supabase.auth.getUser()
-  if (!user) redirect('/auth/login')
+  if (!user) redirect('/')
 
   const { data: profile } = await supabase
     .from('profiles')
diff --git a/src/app/(app)/layout.tsx b/src/app/(app)/layout.tsx
@@ -9,7 +9,7 @@ import { getMyOpenUncapturedMeetingCount } from '@/lib/actions/meetings-reads'
 export default async function AppLayout({ children }: { children: React.ReactNode }) {
   const supabase = await createClient()
   const { data: { user } } = await supabase.auth.getUser()
-  if (!user) redirect('/auth/login')
+  if (!user) redirect('/')
 
   const { data: profile } = await supabase
     .from('profiles')
diff --git a/src/app/(app)/meetings/[id]/page.tsx b/src/app/(app)/meetings/[id]/page.tsx
@@ -23,7 +23,7 @@ export default async function MeetingDetailPage(
 ) {
   const { id } = await params
   const user = await getCurrentUser()
-  if (!user) redirect('/auth/login')
+  if (!user) redirect('/')
 
   const meeting = await getMeeting(id)
   if (!meeting) notFound()
diff --git a/src/app/(app)/meetings/page.tsx b/src/app/(app)/meetings/page.tsx
@@ -5,7 +5,7 @@ import { getMeetings } from '@/lib/actions/meetings-reads'
 
 export default async function MeetingsListPage() {
   const user = await getCurrentUser()
-  if (!user) redirect('/auth/login')
+  if (!user) redirect('/')
 
   const meetings = await getMeetings()
 
diff --git a/src/app/auth/callback/route.ts b/src/app/auth/callback/route.ts
@@ -20,11 +20,11 @@ export async function GET(request: Request) {
       return NextResponse.redirect(`${origin}${next}`)
     }
     return NextResponse.redirect(
-      `${origin}/auth/login?error=${encodeURIComponent(error.message)}`,
+      `${origin}/?error=${encodeURIComponent(error.message)}`,
     )
   }
 
   return NextResponse.redirect(
-    `${origin}/auth/login?error=${encodeURIComponent(providerError ?? 'Auth failed')}`,
+    `${origin}/?error=${encodeURIComponent(providerError ?? 'Auth failed')}`,
   )
 }
diff --git a/src/app/auth/login/page.tsx b/src/app/auth/login/page.tsx
diff --git a/src/app/p/[id]/page.tsx b/src/app/p/[id]/page.tsx
@@ -98,7 +98,7 @@ export default async function PublicPollPreviewPage(
   const poll = await loadPreviewPoll(id)
   if (!poll) notFound()
 
-  const signInHref = `/auth/login?next=${encodeURIComponent(`/polls/${id}`)}`
+  const signInHref = `/?next=${encodeURIComponent(`/polls/${id}`)}`
 
   return (
     <main className="mx-auto flex min-h-dvh max-w-xl flex-col items-stretch justify-center gap-6 px-6 py-12">
diff --git a/src/app/page.tsx b/src/app/page.tsx
@@ -1,8 +1,26 @@
 import Image from 'next/image'
 import Link from 'next/link'
+import { redirect } from 'next/navigation'
+import { createClient } from '@/lib/supabase/server'
 import { signInWithGoogle } from '@/lib/actions/auth'
+import { isSafeNextPath } from '@/lib/auth-redirect'
+
+export default async function HomePage({
+  searchParams,
+}: {
+  searchParams: Promise<{ next?: string; error?: string }>
+}) {
+  const params = await searchParams
+  const next = isSafeNextPath(params.next) ? params.next : null
+
+  const supabase = await createClient()
+  const { data: { user } } = await supabase.auth.getUser()
+  if (user) {
+    redirect(next ?? '/dashboard')
+  }
+
+  const hasError = typeof params.error === 'string' && params.error.length > 0
 
-export default function HomePage() {
   return (
     <div className="flex min-h-screen flex-col">
       <header className="border-b bg-white">
@@ -18,10 +36,11 @@ export default function HomePage() {
             />
             <span className="text-base font-semibold text-gray-900">FCF Tracker</span>
           </Link>
-          {/* Single sign-in entry point — form action triggers the Supabase
-              OAuth server action, which 302s straight to Google's account
-              chooser. No intermediate /auth/login screen in the happy path. */}
+          {/* Single sign-in entry point for the whole app. Form action triggers
+              the Supabase OAuth server action, which 302s straight to Google's
+              account chooser. There is NO separate /auth/login route. */}
           <form action={signInWithGoogle}>
+            {next ? <input type="hidden" name="next" value={next} /> : null}
             <button
               type="submit"
               className="rounded-md bg-blue-600 px-4 py-2 text-sm font-medium text-white hover:bg-blue-700"
@@ -32,6 +51,15 @@ export default function HomePage() {
         </div>
       </header>
 
+      {hasError ? (
+        <div className="border-b border-red-200 bg-red-50">
+          <div className="mx-auto max-w-5xl px-6 py-3 text-sm text-red-700">
+            Your Google account is not authorized to access FCF Tracker.
+            Contact an admin if you believe this is a mistake.
+          </div>
+        </div>
+      ) : null}
+
       <main className="flex flex-1 flex-col items-center px-6 pt-10 pb-16 sm:pt-16">
         {/* Wide hero banner — natural dimensions 1935×813. Span the hero
             container's full width so the artwork reads end-to-end. */}
diff --git a/src/lib/actions/auth.ts b/src/lib/actions/auth.ts
@@ -28,7 +28,7 @@ export async function signInWithGoogle(formData?: FormData) {
   })
 
   if (error || !data.url) {
-    redirect('/auth/login?error=' + encodeURIComponent(error?.message ?? 'Google sign-in failed'))
+    redirect('/?error=' + encodeURIComponent(error?.message ?? 'Google sign-in failed'))
   }
 
   redirect(data.url)
diff --git a/src/lib/supabase/proxy.ts b/src/lib/supabase/proxy.ts
@@ -3,7 +3,6 @@ import { type NextRequest, NextResponse } from 'next/server'
 
 const PUBLIC_PATHS = new Set<string>([
   '/',
-  '/auth/login',
   '/auth/callback',
   '/api/ping',
 ])
@@ -48,7 +47,7 @@ export async function updateSession(request: NextRequest) {
   const { pathname, search } = request.nextUrl
   if (!user && !isPublicPath(pathname)) {
     const loginUrl = request.nextUrl.clone()
-    loginUrl.pathname = '/auth/login'
+    loginUrl.pathname = '/'
     loginUrl.search = `?next=${encodeURIComponent(pathname + search)}`
     return NextResponse.redirect(loginUrl)
   }
