@@ -80,6 +81,7 @@ export function Navigation({
+
{/* Auth state conditional rendering */}
{authLoading ? (
@@ -153,6 +155,7 @@ export function Navigation({
+
{/* Auth state conditional rendering for mobile */}
{authLoading ? (
diff --git a/e2e/oauth-test.spec.ts b/e2e/oauth-test.spec.ts
new file mode 100644
index 0000000..326791f
--- /dev/null
+++ b/e2e/oauth-test.spec.ts
@@ -0,0 +1,74 @@
+import { test, expect } from '@playwright/test'
+
+test.describe('OAuth Flow Tests', () => {
+ test('should handle OAuth callback without PKCE errors', async ({ page }) => {
+ // Navigate to the callback page with a mock OAuth code
+ // Note: This tests the callback processing logic without going through actual OAuth
+ await page.goto('/auth/callback?code=mock-oauth-code-for-testing')
+
+ // Check that we don't get the PKCE error
+ await page.waitForTimeout(2000) // Wait for processing
+
+ // Should not contain the PKCE error message
+ const pageContent = await page.textContent('body')
+ expect(pageContent).not.toContain('both auth code and code verifier should be non-empty')
+
+ // Should show authentication processing or error handling
+ const statusMessage = await page.locator('h2').first()
+ const statusText = await statusMessage.textContent()
+
+ // Should show either processing or a more specific error (not PKCE)
+ expect(statusText).toMatch(/(Processing|Authentication|Error)/)
+
+ console.log('OAuth callback page status:', statusText)
+ })
+
+ test('should handle OAuth errors gracefully', async ({ page }) => {
+ // Test error handling
+ await page.goto('/auth/callback?error=access_denied&error_description=User+denied+access')
+
+ await page.waitForTimeout(1000)
+
+ // Should show error state
+ const errorMessage = await page.locator('h2').first()
+ const errorText = await errorMessage.textContent()
+
+ expect(errorText).toContain('Error')
+
+ console.log('OAuth error handling:', errorText)
+ })
+
+ test('should handle missing code parameter', async ({ page }) => {
+ // Test missing code parameter
+ await page.goto('/auth/callback')
+
+ await page.waitForTimeout(1000)
+
+ // Should show error for missing code
+ const statusMessage = await page.locator('h2').first()
+ const statusText = await statusMessage.textContent()
+
+ expect(statusText).toMatch(/(Error|Authentication failed)/)
+
+ console.log('Missing code handling:', statusText)
+ })
+
+ test('should have correct session storage key', async ({ page }) => {
+ // Test that the session storage key is consistent
+ await page.goto('/auth/login')
+
+ // Set the return URL in session storage with the correct key
+ await page.evaluate(() => {
+ sessionStorage.setItem('auth_return_url', '/test-redirect')
+ })
+
+ // Check the key is correctly set
+ const returnUrl = await page.evaluate(() => {
+ return sessionStorage.getItem('auth_return_url')
+ })
+
+ expect(returnUrl).toBe('/test-redirect')
+
+ console.log('Session storage key test passed')
+ })
+})
\ No newline at end of file
diff --git a/lib/auth-context.tsx b/lib/auth-context.tsx
index 30bb718..87e6ee5 100644
--- a/lib/auth-context.tsx
+++ b/lib/auth-context.tsx
@@ -2,190 +2,176 @@
import { createContext, useContext, useEffect, useState } from 'react'
import { User, Session } from '@supabase/supabase-js'
-import { supabase } from './supabase'
+import { createClient } from '@/utils/supabase/client'
// Feature toggles for authentication providers
const ENABLE_GOOGLE_AUTH = process.env.NEXT_PUBLIC_ENABLE_GOOGLE_AUTH !== 'false'
const ENABLE_APPLE_AUTH = process.env.NEXT_PUBLIC_ENABLE_APPLE_AUTH === 'true'
interface AuthContextType {
- user: User | null
- session: Session | null
- loading: boolean
- signIn: (email: string, password: string) => Promise
- signUp: (email: string, password: string) => Promise
- signOut: () => Promise
- signInWithGoogle: () => Promise
- signInWithApple: () => Promise
- resetPassword: (email: string) => Promise
- updatePassword: (password: string) => Promise
- // Feature flags
- isGoogleAuthEnabled: boolean
- isAppleAuthEnabled: boolean
+ user: User | null
+ session: Session | null
+ loading: boolean
+ signIn: (email: string, password: string) => Promise
+ signUp: (email: string, password: string) => Promise
+ signOut: () => Promise
+ signInWithGoogle: () => Promise
+ signInWithApple: () => Promise
+ resetPassword: (email: string) => Promise
+ updatePassword: (password: string) => Promise
+ // Feature flags
+ isGoogleAuthEnabled: boolean
+ isAppleAuthEnabled: boolean
}
const AuthContext = createContext(undefined)
export function AuthProvider({ children }: { children: React.ReactNode }) {
- const [user, setUser] = useState(null)
- const [session, setSession] = useState(null)
- const [loading, setLoading] = useState(true)
-
- useEffect(() => {
- console.log('🔥 AuthProvider useEffect started')
-
- // Fallback timeout to ensure loading state is resolved
- const timeoutId = setTimeout(() => {
- if (loading) {
- console.warn('⏰ Auth initialization timeout - resolving loading state')
- setLoading(false)
- }
- }, 10000) // 10 second timeout
-
- // Get initial session
- const getInitialSession = async () => {
- console.log('🔍 Getting initial session...')
- try {
- const { data: { session }, error } = await supabase.auth.getSession()
-
- console.log('📊 Initial session result:', {
- hasSession: !!session,
- hasError: !!error,
- error: error?.message,
- user: session?.user?.email
- })
-
- if (error) {
- console.error('❌ Error getting initial session:', error)
- // Still set loading to false even if there's an error
- setSession(null)
- setUser(null)
- setLoading(false)
- return
- }
-
- setSession(session)
- setUser(session?.user ?? null)
- setLoading(false)
- console.log('✅ Initial session loaded successfully')
- } catch (error) {
- console.error('💥 Unexpected error getting initial session:', error)
- // Ensure loading state is always resolved
- setSession(null)
- setUser(null)
- setLoading(false)
- }
- }
-
- getInitialSession()
-
- // Listen for auth changes
- const { data: { subscription } } = supabase.auth.onAuthStateChange(
- async (event, session) => {
- console.log('🔄 Auth state change:', { event, hasSession: !!session })
- try {
- setSession(session)
- setUser(session?.user ?? null)
- setLoading(false)
- } catch (error) {
- console.error('❌ Error in auth state change:', error)
- setLoading(false)
- }
- }
- )
-
- return () => {
- console.log('🧹 AuthProvider cleanup')
- clearTimeout(timeoutId)
- subscription.unsubscribe()
- }
- }, [])
-
- const signIn = async (email: string, password: string) => {
- const { error } = await supabase.auth.signInWithPassword({
- email,
- password,
- })
- if (error) throw error
- }
-
- const signUp = async (email: string, password: string) => {
- const { error } = await supabase.auth.signUp({
- email,
- password,
+ const [user, setUser] = useState(null)
+ const [session, setSession] = useState(null)
+ const [loading, setLoading] = useState(true)
+ const supabase = createClient()
+
+ useEffect(() => {
+ console.log('🔥 AuthProvider useEffect started')
+
+ // Reduced timeout to ensure loading state is resolved quickly for optimistic UI
+ const timeoutId = setTimeout(() => {
+ if (loading) {
+ console.warn('⏰ Auth initialization timeout - resolving loading state')
+ setLoading(false)
+ }
+ }, 1000) // Reduced timeout for faster optimistic UI response
+
+ // Get initial session immediately
+ const getInitialSession = async () => {
+ console.log('🔍 Getting initial session...')
+ try {
+ const { data: { session }, error } = await supabase.auth.getSession()
+
+ console.log('📊 Initial session result:', {
+ hasSession: !!session,
+ hasError: !!error,
+ error: error?.message,
+ user: session?.user?.email
})
- if (error) throw error
- }
-
- const signOut = async () => {
- const { error } = await supabase.auth.signOut()
- if (error) throw error
- }
- const signInWithGoogle = async () => {
- if (!ENABLE_GOOGLE_AUTH) {
- throw new Error('Google authentication is currently disabled')
+ if (error) {
+ console.error('❌ Error getting initial session:', error)
}
- const { error } = await supabase.auth.signInWithOAuth({
- provider: 'google',
- options: {
- redirectTo: `${process.env.NEXT_PUBLIC_APP_URL || window.location.origin}/auth/callback`,
- },
- })
- if (error) throw error
+ setSession(session)
+ setUser(session?.user ?? null)
+ setLoading(false)
+ console.log('✅ Initial session loaded successfully')
+ } catch (error) {
+ console.error('💥 Unexpected error getting initial session:', error)
+ setSession(null)
+ setUser(null)
+ setLoading(false)
+ }
}
- const signInWithApple = async () => {
- if (!ENABLE_APPLE_AUTH) {
- throw new Error('Apple authentication is coming soon! An Apple Developer account is required.')
+ // Start session loading immediately
+ getInitialSession()
+
+ // Listen for auth changes
+ const { data: { subscription } } = supabase.auth.onAuthStateChange(
+ async (event, session) => {
+ console.log('🔄 Auth state change:', { event, hasSession: !!session })
+ try {
+ setSession(session)
+ setUser(session?.user ?? null)
+ setLoading(false)
+ } catch (error) {
+ console.error('❌ Error in auth state change:', error)
+ setLoading(false)
}
+ }
+ )
- const { error } = await supabase.auth.signInWithOAuth({
- provider: 'apple',
- options: {
- redirectTo: `${process.env.NEXT_PUBLIC_APP_URL || window.location.origin}/auth/callback`,
- },
- })
- if (error) throw error
- }
-
- const resetPassword = async (email: string) => {
- const { error } = await supabase.auth.resetPasswordForEmail(email, {
- redirectTo: `${process.env.NEXT_PUBLIC_APP_URL || window.location.origin}/auth/update-password`,
- })
- if (error) throw error
- }
-
- const updatePassword = async (password: string) => {
- const { error } = await supabase.auth.updateUser({
- password,
- })
- if (error) throw error
+ return () => {
+ console.log('🧹 AuthProvider cleanup')
+ clearTimeout(timeoutId)
+ subscription.unsubscribe()
}
-
- const value = {
- user,
- session,
- loading,
- signIn,
- signUp,
- signOut,
- signInWithGoogle,
- signInWithApple,
- resetPassword,
- updatePassword,
- isGoogleAuthEnabled: ENABLE_GOOGLE_AUTH,
- isAppleAuthEnabled: ENABLE_APPLE_AUTH,
+ }, [supabase.auth])
+
+ const signIn = async (email: string, password: string) => {
+ const { error } = await supabase.auth.signInWithPassword({
+ email,
+ password,
+ })
+ if (error) throw error
+ }
+
+ const signUp = async (email: string, password: string) => {
+ const { error } = await supabase.auth.signUp({
+ email,
+ password,
+ })
+ if (error) throw error
+ }
+
+ const signOut = async () => {
+ const { error } = await supabase.auth.signOut()
+ if (error) throw error
+ }
+
+ const signInWithGoogle = async () => {
+ if (!ENABLE_GOOGLE_AUTH) {
+ throw new Error('Google authentication is currently disabled')
}
- return {children}
+ const { error } = await supabase.auth.signInWithOAuth({
+ provider: 'google',
+ options: {
+ redirectTo: `${window.location.origin}/auth/callback`,
+ },
+ })
+ if (error) throw error
+ }
+
+ const signInWithApple = async () => {
+ throw new Error('Apple authentication is coming soon! An Apple Developer account is required.')
+ }
+
+ const resetPassword = async (email: string) => {
+ const { error } = await supabase.auth.resetPasswordForEmail(email, {
+ redirectTo: `${window.location.origin}/auth/update-password`,
+ })
+ if (error) throw error
+ }
+
+ const updatePassword = async (password: string) => {
+ const { error } = await supabase.auth.updateUser({
+ password,
+ })
+ if (error) throw error
+ }
+
+ const value = {
+ user,
+ session,
+ loading,
+ signIn,
+ signUp,
+ signOut,
+ signInWithGoogle,
+ signInWithApple,
+ resetPassword,
+ updatePassword,
+ isGoogleAuthEnabled: ENABLE_GOOGLE_AUTH,
+ isAppleAuthEnabled: ENABLE_APPLE_AUTH,
+ }
+
+ return {children}
}
export function useAuth() {
- const context = useContext(AuthContext)
- if (context === undefined) {
- throw new Error('useAuth must be used within an AuthProvider')
- }
- return context
-}
\ No newline at end of file
+ const context = useContext(AuthContext)
+ if (context === undefined) {
+ throw new Error('useAuth must be used within an AuthProvider')
+ }
+ return context
+}
\ No newline at end of file
diff --git a/lib/hooks/useAuth.ts b/lib/hooks/useAuth.ts
index fe92d28..78968f2 100644
--- a/lib/hooks/useAuth.ts
+++ b/lib/hooks/useAuth.ts
@@ -2,7 +2,7 @@
'use client'
import { useState, useEffect, useCallback } from 'react'
-import { supabase } from '@/lib/supabase'
+import { createClient } from '@/utils/supabase/client'
import type { User } from '@supabase/supabase-js'
export type UserRole = 'user' | 'organizer' | 'admin'
@@ -31,6 +31,7 @@ export function useAuth(): UseAuthReturn {
const [user, setUser] = useState(null)
const [loading, setLoading] = useState(true)
const [error, setError] = useState(null)
+ const supabase = createClient()
const fetchUserProfile = useCallback(async (authUser: User) => {
try {
@@ -42,6 +43,17 @@ export function useAuth(): UseAuthReturn {
if (error) {
console.error('Error fetching user profile:', error)
+ // Don't treat missing user as a hard error - they might not be in the users table yet
+ if (error.code === 'PGRST116') {
+ // No rows returned - user doesn't exist in users table yet
+ return {
+ id: authUser.id,
+ email: authUser.email || '',
+ display_name: authUser.user_metadata?.display_name || authUser.user_metadata?.full_name,
+ role: 'user' as UserRole, // Default role
+ google_calendar_connected: false
+ }
+ }
setError('Failed to load user profile')
return null
}
@@ -58,7 +70,7 @@ export function useAuth(): UseAuthReturn {
setError('Failed to load user profile')
return null
}
- }, [])
+ }, [supabase])
const refresh = useCallback(async () => {
try {
diff --git a/lib/supabase-server.ts b/lib/supabase-server.ts
index 9f66d84..35e8594 100644
--- a/lib/supabase-server.ts
+++ b/lib/supabase-server.ts
@@ -1,37 +1,2 @@
-import { createServerClient } from '@supabase/ssr'
-import { cookies } from 'next/headers'
-import type { CookieOptions } from '@supabase/ssr'
-
-// Fallback values for build time when environment variables might not be available
-const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || 'http://localhost:54321'
-const supabaseAnonKey = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY || 'fallback-key'
-
-export async function createServerSupabaseClient() {
- const cookieStore = await cookies()
-
- return createServerClient(supabaseUrl, supabaseAnonKey, {
- cookies: {
- get(name: string) {
- return cookieStore.get(name)?.value
- },
- set(name: string, value: string, options: CookieOptions) {
- try {
- cookieStore.set({ name, value, ...options })
- } catch {
- // The `set` method was called from a Server Component.
- // This can be ignored if you have middleware refreshing
- // user sessions.
- }
- },
- remove(name: string, options: CookieOptions) {
- try {
- cookieStore.set({ name, value: '', ...options })
- } catch {
- // The `delete` method was called from a Server Component.
- // This can be ignored if you have middleware refreshing
- // user sessions.
- }
- },
- },
- })
-}
\ No newline at end of file
+// This file is deprecated - use @/utils/supabase/server instead
+export { createClient as createServerSupabaseClient } from '@/utils/supabase/server'
\ No newline at end of file
diff --git a/lib/supabase.ts b/lib/supabase.ts
index b9e52fd..386cfb0 100644
--- a/lib/supabase.ts
+++ b/lib/supabase.ts
@@ -1,70 +1,4 @@
-import { createBrowserClient } from '@supabase/ssr'
+import { createClient } from '@/utils/supabase/client'
-// Fallback values for build time when environment variables might not be available
-const supabaseUrl = process.env.NEXT_PUBLIC_SUPABASE_URL || 'http://localhost:54321'
-const supabaseAnonKey = process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY || 'fallback-key'
-
-// Debug logging for production issues
-if (typeof window !== 'undefined') {
- console.log('🔍 Supabase client configuration:', {
- url: supabaseUrl,
- hasValidUrl: supabaseUrl !== 'http://localhost:54321',
- hasValidKey: supabaseAnonKey !== 'fallback-key',
- keyLength: supabaseAnonKey.length,
- urlPrefix: supabaseUrl.substring(0, 30) + '...',
- isProduction: process.env.NODE_ENV === 'production'
- })
-
- // Test if we can reach the Supabase URL
- if (supabaseUrl !== 'http://localhost:54321') {
- fetch(`${supabaseUrl}/rest/v1/`, {
- method: 'HEAD',
- headers: {
- 'apikey': supabaseAnonKey,
- 'Authorization': `Bearer ${supabaseAnonKey}`
- }
- })
- .then(response => {
- console.log('✅ Supabase connection test:', {
- status: response.status,
- ok: response.ok,
- headers: Object.fromEntries(response.headers.entries())
- })
- })
- .catch(error => {
- console.error('❌ Supabase connection test failed:', error)
- })
- } else {
- console.warn('⚠️ Using fallback Supabase URL - environment variables not loaded!')
- }
-}
-
-export function createClient() {
- const client = createBrowserClient(supabaseUrl, supabaseAnonKey)
-
- // Additional client validation
- if (typeof window !== 'undefined') {
- console.log('🚀 Supabase client created successfully')
-
- // Test basic auth functionality
- client.auth.getSession()
- .then(({ data, error }) => {
- if (error) {
- console.error('❌ Initial session check failed:', error)
- } else {
- console.log('✅ Initial session check successful:', {
- hasSession: !!data.session,
- user: data.session?.user?.email || 'no user'
- })
- }
- })
- .catch(error => {
- console.error('❌ Session check threw error:', error)
- })
- }
-
- return client
-}
-
-// Default client for client-side usage
-export const supabase = createClient()
\ No newline at end of file
+// Default client for client-side usage - using new structure
+export const supabase = createClient()
\ No newline at end of file
diff --git a/middleware.ts b/middleware.ts
index 5f29564..3075a53 100644
--- a/middleware.ts
+++ b/middleware.ts
@@ -1,104 +1,8 @@
-import { createServerClient } from '@supabase/ssr'
-import { NextResponse } from 'next/server'
-import type { NextRequest } from 'next/server'
+import { type NextRequest } from 'next/server'
+import { updateSession } from './utils/supabase/middleware'
-export async function middleware(req: NextRequest) {
- // Skip middleware if environment variables are not available (build time)
- if (!process.env.NEXT_PUBLIC_SUPABASE_URL || !process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY) {
- return NextResponse.next()
- }
-
- // Create a response object to pass to the supabase client
- let response = NextResponse.next({
- request: {
- headers: req.headers,
- },
- })
-
- const supabase = createServerClient(
- process.env.NEXT_PUBLIC_SUPABASE_URL,
- process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY,
- {
- cookies: {
- get(name: string) {
- return req.cookies.get(name)?.value
- },
- set(name: string, value: string, options: any) {
- req.cookies.set({
- name,
- value,
- ...options,
- })
- response = NextResponse.next({
- request: {
- headers: req.headers,
- },
- })
- response.cookies.set({
- name,
- value,
- ...options,
- })
- },
- remove(name: string, options: any) {
- req.cookies.set({
- name,
- value: '',
- ...options,
- })
- response = NextResponse.next({
- request: {
- headers: req.headers,
- },
- })
- response.cookies.set({
- name,
- value: '',
- ...options,
- })
- },
- },
- }
- )
-
- // Try to refresh session if expired - handle gracefully if it fails
- let session = null
- try {
- const {
- data: { session: sessionData },
- } = await supabase.auth.getSession()
- session = sessionData
- } catch (error) {
- // Log error but don't break the middleware
- console.warn('Failed to get session in middleware:', error)
- }
-
- // Protected routes that require authentication
- const protectedRoutes = ['/dashboard', '/profile', '/admin']
- const isProtectedRoute = protectedRoutes.some(route =>
- req.nextUrl.pathname.startsWith(route)
- )
-
- // Auth routes that should redirect if already authenticated
- const authRoutes = ['/auth/login', '/auth/signup']
- const isAuthRoute = authRoutes.includes(req.nextUrl.pathname)
-
- // Redirect to login if accessing protected route without session
- if (isProtectedRoute && !session) {
- const redirectUrl = req.nextUrl.clone()
- redirectUrl.pathname = '/auth/login'
- redirectUrl.searchParams.set('redirectTo', req.nextUrl.pathname)
- return NextResponse.redirect(redirectUrl)
- }
-
- // Redirect to home if accessing auth routes with valid session
- if (isAuthRoute && session) {
- const redirectUrl = req.nextUrl.clone()
- redirectUrl.pathname = '/'
- return NextResponse.redirect(redirectUrl)
- }
-
- return response
+export async function middleware(request: NextRequest) {
+ return await updateSession(request)
}
export const config = {
diff --git a/package.json b/package.json
index b8215cc..532d25a 100644
--- a/package.json
+++ b/package.json
@@ -10,8 +10,6 @@
"start": "next start",
"lint": "next lint",
"type-check": "tsc --noEmit",
- "prepare": "husky install",
- "test": "jest",
"test:unit": "jest --testPathPattern='tests/unit|lib.*__tests__|components.*__tests__'",
"test:unit:coverage": "jest --testPathPattern='tests/unit|lib.*__tests__|components.*__tests__' --coverage",
"test:integration": "jest --testPathPattern='tests/integration'",
diff --git a/public/favicon-16x16.svg b/public/favicon-16x16.svg
new file mode 100644
index 0000000..46ce6f7
--- /dev/null
+++ b/public/favicon-16x16.svg
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/public/favicon-32x32.svg b/public/favicon-32x32.svg
new file mode 100644
index 0000000..b9d4e1d
--- /dev/null
+++ b/public/favicon-32x32.svg
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000..b9d4e1d
--- /dev/null
+++ b/public/favicon.ico
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/public/icon.svg b/public/icon.svg
new file mode 100644
index 0000000..b9d4e1d
--- /dev/null
+++ b/public/icon.svg
@@ -0,0 +1,5 @@
+
\ No newline at end of file
diff --git a/public/manifest.json b/public/manifest.json
index ec6c948..bae0ec3 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -13,5 +13,22 @@
"social",
"lifestyle",
"productivity"
+ ],
+ "icons": [
+ {
+ "src": "/favicon-16x16.svg",
+ "sizes": "16x16",
+ "type": "image/svg+xml"
+ },
+ {
+ "src": "/favicon-32x32.svg",
+ "sizes": "32x32",
+ "type": "image/svg+xml"
+ },
+ {
+ "src": "/icon.svg",
+ "sizes": "any",
+ "type": "image/svg+xml"
+ }
]
}
\ No newline at end of file
diff --git a/utils/supabase/client.ts b/utils/supabase/client.ts
new file mode 100644
index 0000000..78ff395
--- /dev/null
+++ b/utils/supabase/client.ts
@@ -0,0 +1,8 @@
+import { createBrowserClient } from '@supabase/ssr'
+
+export function createClient() {
+ return createBrowserClient(
+ process.env.NEXT_PUBLIC_SUPABASE_URL!,
+ process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!
+ )
+}
\ No newline at end of file
diff --git a/utils/supabase/middleware.ts b/utils/supabase/middleware.ts
new file mode 100644
index 0000000..ff207ff
--- /dev/null
+++ b/utils/supabase/middleware.ts
@@ -0,0 +1,67 @@
+import { createServerClient } from '@supabase/ssr'
+import { NextResponse, type NextRequest } from 'next/server'
+
+export async function updateSession(request: NextRequest) {
+ let supabaseResponse = NextResponse.next({
+ request,
+ })
+
+ const supabase = createServerClient(
+ process.env.NEXT_PUBLIC_SUPABASE_URL!,
+ process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
+ {
+ cookies: {
+ getAll() {
+ return request.cookies.getAll()
+ },
+ setAll(cookiesToSet) {
+ cookiesToSet.forEach(({ name, value }) => request.cookies.set(name, value))
+ supabaseResponse = NextResponse.next({
+ request,
+ })
+ cookiesToSet.forEach(({ name, value, options }) =>
+ supabaseResponse.cookies.set(name, value, options)
+ )
+ },
+ },
+ }
+ )
+
+ // IMPORTANT: Avoid writing any logic between createServerClient and
+ // supabase.auth.getUser(). A simple mistake could make it very hard to debug
+ // issues with users being randomly logged out.
+
+ const {
+ data: { user },
+ } = await supabase.auth.getUser()
+
+ // Protected routes
+ const protectedRoutes = ['/dashboard', '/profile', '/admin']
+ const isProtectedRoute = protectedRoutes.some(route =>
+ request.nextUrl.pathname.startsWith(route)
+ )
+
+ if (isProtectedRoute && !user) {
+ const url = request.nextUrl.clone()
+ url.pathname = '/auth/login'
+ url.searchParams.set('redirectTo', request.nextUrl.pathname)
+ return NextResponse.redirect(url)
+ }
+
+ // Auth routes (redirect if already logged in)
+ const authRoutes = ['/auth/login', '/auth/signup']
+ const isAuthRoute = authRoutes.includes(request.nextUrl.pathname)
+
+ if (isAuthRoute && user) {
+ const url = request.nextUrl.clone()
+ url.pathname = '/'
+ return NextResponse.redirect(url)
+ }
+
+ // IMPORTANT: You *must* return the supabaseResponse object as it is. If you're
+ // creating a new response object with NextResponse.next() make sure to:
+ // 1. Pass the request in it, like so: NextResponse.next({ request })
+ // 2. Copy over the cookies, like so: response.cookies.setAll(supabaseResponse.cookies.getAll())
+
+ return supabaseResponse
+}
\ No newline at end of file
diff --git a/utils/supabase/server.ts b/utils/supabase/server.ts
new file mode 100644
index 0000000..881f173
--- /dev/null
+++ b/utils/supabase/server.ts
@@ -0,0 +1,27 @@
+import { createServerClient } from '@supabase/ssr'
+import { cookies } from 'next/headers'
+
+export async function createClient() {
+ const cookieStore = await cookies()
+
+ return createServerClient(
+ process.env.NEXT_PUBLIC_SUPABASE_URL!,
+ process.env.NEXT_PUBLIC_SUPABASE_ANON_KEY!,
+ {
+ cookies: {
+ getAll() {
+ return cookieStore.getAll()
+ },
+ setAll(cookiesToSet) {
+ try {
+ cookiesToSet.forEach(({ name, value, options }) => {
+ cookieStore.set(name, value, options)
+ })
+ } catch (error) {
+ // Ignore if running in middleware context
+ }
+ },
+ },
+ }
+ )
+}
\ No newline at end of file