Unverified Commit c3bf7352 authored by Jon Meyers's avatar Jon Meyers Committed by GitHub

Chore: refactor to use server actions in with-supabase example (#57858)

### What?
[1] Use Server Actions for auth
[2] Use Geist font
[3] Address warning about `metadataBase` in console

### Why?
[1] The co-location of Login page and authentication logic is simpler for beginners
[2] Looks nice
[3] Avoid confusing people with the starter template printing warnings

### How?
[1] Refactor Route Handlers to Server Actions
[2] Install font and set to `html`
[3] Explicitly declare the default value for `metadataBaseUrl`
parent 9658cf7a
import { createClient } from '@/utils/supabase/server'
import { NextResponse } from 'next/server'
import { cookies } from 'next/headers'
export async function POST(request: Request) {
const requestUrl = new URL(request.url)
const formData = await request.formData()
const email = String(formData.get('email'))
const password = String(formData.get('password'))
const cookieStore = cookies()
const supabase = createClient(cookieStore)
const { error } = await supabase.auth.signInWithPassword({
email,
password,
})
if (error) {
return NextResponse.redirect(
`${requestUrl.origin}/login?error=Could not authenticate user`,
{
// a 301 status is required to redirect from a POST to a GET route
status: 301,
}
)
}
return NextResponse.redirect(requestUrl.origin, {
// a 301 status is required to redirect from a POST to a GET route
status: 301,
})
}
import { createClient } from '@/utils/supabase/server'
import { NextResponse } from 'next/server'
import { cookies } from 'next/headers'
export async function POST(request: Request) {
const requestUrl = new URL(request.url)
const cookieStore = cookies()
const supabase = createClient(cookieStore)
await supabase.auth.signOut()
return NextResponse.redirect(`${requestUrl.origin}/login`, {
// a 301 status is required to redirect from a POST to a GET route
status: 301,
})
}
import { createClient } from '@/utils/supabase/server'
import { NextResponse } from 'next/server'
import { cookies } from 'next/headers'
export async function POST(request: Request) {
const requestUrl = new URL(request.url)
const formData = await request.formData()
const email = String(formData.get('email'))
const password = String(formData.get('password'))
const cookieStore = cookies()
const supabase = createClient(cookieStore)
const { error } = await supabase.auth.signUp({
email,
password,
options: {
emailRedirectTo: `${requestUrl.origin}/auth/callback`,
},
})
if (error) {
return NextResponse.redirect(
`${requestUrl.origin}/login?error=Could not authenticate user`,
{
// a 301 status is required to redirect from a POST to a GET route
status: 301,
}
)
}
return NextResponse.redirect(
`${requestUrl.origin}/login?message=Check email to continue sign in process`,
{
// a 301 status is required to redirect from a POST to a GET route
status: 301,
}
)
}
import { GeistSans } from 'geist/font'
import './globals.css' import './globals.css'
const defaultUrl = process.env.VERCEL_URL
? `https://${process.env.VERCEL_URL}`
: 'http://localhost:3000'
export const metadata = { export const metadata = {
metadataBase: new URL(defaultUrl),
title: 'Next.js and Supabase Starter Kit', title: 'Next.js and Supabase Starter Kit',
description: 'The fastest way to build apps with Next.js and Supabase', description: 'The fastest way to build apps with Next.js and Supabase',
} }
...@@ -11,7 +17,7 @@ export default function RootLayout({ ...@@ -11,7 +17,7 @@ export default function RootLayout({
children: React.ReactNode children: React.ReactNode
}) { }) {
return ( return (
<html lang="en"> <html lang="en" className={GeistSans.className}>
<body className="bg-background text-foreground"> <body className="bg-background text-foreground">
<main className="min-h-screen flex flex-col items-center"> <main className="min-h-screen flex flex-col items-center">
{children} {children}
......
'use client'
import { useSearchParams } from 'next/navigation'
export default function Messages() {
const searchParams = useSearchParams()
const error = searchParams.get('error')
const message = searchParams.get('message')
return (
<>
{error && (
<p className="mt-4 p-4 bg-foreground/10 text-foreground text-center">
{error}
</p>
)}
{message && (
<p className="mt-4 p-4 bg-foreground/10 text-foreground text-center">
{message}
</p>
)}
</>
)
}
import Link from 'next/link' import Link from 'next/link'
import Messages from './messages' import { headers, cookies } from 'next/headers'
import { createClient } from '@/utils/supabase/server'
import { redirect } from 'next/navigation'
export default function Login({
searchParams,
}: {
searchParams: { message: string }
}) {
const signIn = async (formData: FormData) => {
'use server'
const email = formData.get('email') as string
const password = formData.get('password') as string
const cookieStore = cookies()
const supabase = createClient(cookieStore)
const { error } = await supabase.auth.signInWithPassword({
email,
password,
})
if (error) {
return redirect('/login?message=Could not authenticate user')
}
return redirect('/')
}
const signUp = async (formData: FormData) => {
'use server'
const origin = headers().get('origin')
const email = formData.get('email') as string
const password = formData.get('password') as string
const cookieStore = cookies()
const supabase = createClient(cookieStore)
const { error } = await supabase.auth.signUp({
email,
password,
options: {
emailRedirectTo: `${origin}/auth/callback`,
},
})
if (error) {
return redirect('/login?message=Could not authenticate user')
}
return redirect('/login?message=Check email to continue sign in process')
}
export default function Login() {
return ( return (
<div className="flex-1 flex flex-col w-full px-8 sm:max-w-md justify-center gap-2"> <div className="flex-1 flex flex-col w-full px-8 sm:max-w-md justify-center gap-2">
<Link <Link
...@@ -26,9 +76,8 @@ export default function Login() { ...@@ -26,9 +76,8 @@ export default function Login() {
</Link> </Link>
<form <form
className="flex-1 flex flex-col w-full justify-center gap-2 text-foreground" className="animate-in flex-1 flex flex-col w-full justify-center gap-2 text-foreground"
action="/auth/sign-in" action={signIn}
method="post"
> >
<label className="text-md" htmlFor="email"> <label className="text-md" htmlFor="email">
Email Email
...@@ -53,12 +102,16 @@ export default function Login() { ...@@ -53,12 +102,16 @@ export default function Login() {
Sign In Sign In
</button> </button>
<button <button
formAction="/auth/sign-up" formAction={signUp}
className="border border-foreground/20 rounded-md px-4 py-2 text-foreground mb-2" className="border border-foreground/20 rounded-md px-4 py-2 text-foreground mb-2"
> >
Sign Up Sign Up
</button> </button>
<Messages /> {searchParams?.message && (
<p className="mt-4 p-4 bg-foreground/10 text-foreground text-center">
{searchParams.message}
</p>
)}
</form> </form>
</div> </div>
) )
......
import { createClient } from '@/utils/supabase/server' import { createClient } from '@/utils/supabase/server'
import Link from 'next/link' import Link from 'next/link'
import { cookies } from 'next/headers' import { cookies } from 'next/headers'
import { redirect } from 'next/navigation'
export default async function AuthButton() { export default async function AuthButton() {
const cookieStore = cookies() const cookieStore = cookies()
...@@ -10,10 +11,19 @@ export default async function AuthButton() { ...@@ -10,10 +11,19 @@ export default async function AuthButton() {
data: { user }, data: { user },
} = await supabase.auth.getUser() } = await supabase.auth.getUser()
const signOut = async () => {
'use server'
const cookieStore = cookies()
const supabase = createClient(cookieStore)
await supabase.auth.signOut()
return redirect('/login')
}
return user ? ( return user ? (
<div className="flex items-center gap-4"> <div className="flex items-center gap-4">
Hey, {user.email}! Hey, {user.email}!
<form action="/auth/sign-out" method="post"> <form action={signOut}>
<button className="py-2 px-4 rounded-md no-underline bg-btn-background hover:bg-btn-background-hover"> <button className="py-2 px-4 rounded-md no-underline bg-btn-background hover:bg-btn-background-hover">
Logout Logout
</button> </button>
......
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
"@supabase/ssr": "latest", "@supabase/ssr": "latest",
"@supabase/supabase-js": "latest", "@supabase/supabase-js": "latest",
"autoprefixer": "10.4.15", "autoprefixer": "10.4.15",
"geist": "^1.0.0",
"next": "latest", "next": "latest",
"postcss": "8.4.29", "postcss": "8.4.29",
"react": "18.2.0", "react": "18.2.0",
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment