Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
703d276e
Unverified
Commit
703d276e
authored
Oct 22, 2024
by
Ivan Vasilov
Committed by
GitHub
Oct 22, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
examples: Update `with-supabase` to be compatible with Nextjs 15 (#71631)
Co-authored-by:
Lee Robinson
<
me@leerob.io
>
parent
fe4e4d2c
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
26 additions
and
22 deletions
+26
-22
page.tsx
...s/with-supabase/app/(auth-pages)/forgot-password/page.tsx
+3
-4
page.tsx
examples/with-supabase/app/(auth-pages)/sign-in/page.tsx
+2
-1
page.tsx
examples/with-supabase/app/(auth-pages)/sign-up/page.tsx
+4
-1
actions.ts
examples/with-supabase/app/actions.ts
+7
-7
route.ts
examples/with-supabase/app/auth/callback/route.ts
+1
-1
page.tsx
examples/with-supabase/app/protected/page.tsx
+1
-1
page.tsx
examples/with-supabase/app/protected/reset-password/page.tsx
+3
-4
header-auth.tsx
examples/with-supabase/components/header-auth.tsx
+3
-1
server.ts
examples/with-supabase/utils/supabase/server.ts
+2
-2
No files found.
examples/with-supabase/app/(auth-pages)/forgot-password/page.tsx
View file @
703d276e
...
@@ -6,11 +6,10 @@ import { Label } from "@/components/ui/label";
...
@@ -6,11 +6,10 @@ import { Label } from "@/components/ui/label";
import
Link
from
"next/link"
;
import
Link
from
"next/link"
;
import
{
SmtpMessage
}
from
"../smtp-message"
;
import
{
SmtpMessage
}
from
"../smtp-message"
;
export
default
function
ForgotPassword
({
export
default
async
function
ForgotPassword
(
props
:
{
searchParams
,
searchParams
:
Promise
<
Message
>
;
}:
{
searchParams
:
Message
;
})
{
})
{
const
searchParams
=
await
props
.
searchParams
;
return
(
return
(
<>
<>
<
form
className=
"flex-1 flex flex-col w-full gap-2 text-foreground [&>input]:mb-6 min-w-64 max-w-64 mx-auto"
>
<
form
className=
"flex-1 flex flex-col w-full gap-2 text-foreground [&>input]:mb-6 min-w-64 max-w-64 mx-auto"
>
...
...
examples/with-supabase/app/(auth-pages)/sign-in/page.tsx
View file @
703d276e
...
@@ -5,7 +5,8 @@ import { Input } from "@/components/ui/input";
...
@@ -5,7 +5,8 @@ import { Input } from "@/components/ui/input";
import
{
Label
}
from
"@/components/ui/label"
;
import
{
Label
}
from
"@/components/ui/label"
;
import
Link
from
"next/link"
;
import
Link
from
"next/link"
;
export
default
function
Login
({
searchParams
}:
{
searchParams
:
Message
})
{
export
default
async
function
Login
(
props
:
{
searchParams
:
Promise
<
Message
>
})
{
const
searchParams
=
await
props
.
searchParams
;
return
(
return
(
<
form
className=
"flex-1 flex flex-col min-w-64"
>
<
form
className=
"flex-1 flex flex-col min-w-64"
>
<
h1
className=
"text-2xl font-medium"
>
Sign in
</
h1
>
<
h1
className=
"text-2xl font-medium"
>
Sign in
</
h1
>
...
...
examples/with-supabase/app/(auth-pages)/sign-up/page.tsx
View file @
703d276e
...
@@ -6,7 +6,10 @@ import { Label } from "@/components/ui/label";
...
@@ -6,7 +6,10 @@ import { Label } from "@/components/ui/label";
import
Link
from
"next/link"
;
import
Link
from
"next/link"
;
import
{
SmtpMessage
}
from
"../smtp-message"
;
import
{
SmtpMessage
}
from
"../smtp-message"
;
export
default
function
Signup
({
searchParams
}:
{
searchParams
:
Message
})
{
export
default
async
function
Signup
(
props
:
{
searchParams
:
Promise
<
Message
>
;
})
{
const
searchParams
=
await
props
.
searchParams
;
if
(
"message"
in
searchParams
)
{
if
(
"message"
in
searchParams
)
{
return
(
return
(
<
div
className=
"w-full flex-1 flex items-center h-screen sm:max-w-md justify-center gap-2 p-4"
>
<
div
className=
"w-full flex-1 flex items-center h-screen sm:max-w-md justify-center gap-2 p-4"
>
...
...
examples/with-supabase/app/actions.ts
View file @
703d276e
...
@@ -8,8 +8,8 @@ import { redirect } from "next/navigation";
...
@@ -8,8 +8,8 @@ import { redirect } from "next/navigation";
export
const
signUpAction
=
async
(
formData
:
FormData
)
=>
{
export
const
signUpAction
=
async
(
formData
:
FormData
)
=>
{
const
email
=
formData
.
get
(
"email"
)?.
toString
();
const
email
=
formData
.
get
(
"email"
)?.
toString
();
const
password
=
formData
.
get
(
"password"
)?.
toString
();
const
password
=
formData
.
get
(
"password"
)?.
toString
();
const
supabase
=
createClient
();
const
supabase
=
await
createClient
();
const
origin
=
headers
(
).
get
(
"origin"
);
const
origin
=
(
await
headers
()
).
get
(
"origin"
);
if
(
!
email
||
!
password
)
{
if
(
!
email
||
!
password
)
{
return
{
error
:
"Email and password are required"
};
return
{
error
:
"Email and password are required"
};
...
@@ -38,7 +38,7 @@ export const signUpAction = async (formData: FormData) => {
...
@@ -38,7 +38,7 @@ export const signUpAction = async (formData: FormData) => {
export
const
signInAction
=
async
(
formData
:
FormData
)
=>
{
export
const
signInAction
=
async
(
formData
:
FormData
)
=>
{
const
email
=
formData
.
get
(
"email"
)
as
string
;
const
email
=
formData
.
get
(
"email"
)
as
string
;
const
password
=
formData
.
get
(
"password"
)
as
string
;
const
password
=
formData
.
get
(
"password"
)
as
string
;
const
supabase
=
createClient
();
const
supabase
=
await
createClient
();
const
{
error
}
=
await
supabase
.
auth
.
signInWithPassword
({
const
{
error
}
=
await
supabase
.
auth
.
signInWithPassword
({
email
,
email
,
...
@@ -54,8 +54,8 @@ export const signInAction = async (formData: FormData) => {
...
@@ -54,8 +54,8 @@ export const signInAction = async (formData: FormData) => {
export
const
forgotPasswordAction
=
async
(
formData
:
FormData
)
=>
{
export
const
forgotPasswordAction
=
async
(
formData
:
FormData
)
=>
{
const
email
=
formData
.
get
(
"email"
)?.
toString
();
const
email
=
formData
.
get
(
"email"
)?.
toString
();
const
supabase
=
createClient
();
const
supabase
=
await
createClient
();
const
origin
=
headers
(
).
get
(
"origin"
);
const
origin
=
(
await
headers
()
).
get
(
"origin"
);
const
callbackUrl
=
formData
.
get
(
"callbackUrl"
)?.
toString
();
const
callbackUrl
=
formData
.
get
(
"callbackUrl"
)?.
toString
();
if
(
!
email
)
{
if
(
!
email
)
{
...
@@ -87,7 +87,7 @@ export const forgotPasswordAction = async (formData: FormData) => {
...
@@ -87,7 +87,7 @@ export const forgotPasswordAction = async (formData: FormData) => {
};
};
export
const
resetPasswordAction
=
async
(
formData
:
FormData
)
=>
{
export
const
resetPasswordAction
=
async
(
formData
:
FormData
)
=>
{
const
supabase
=
createClient
();
const
supabase
=
await
createClient
();
const
password
=
formData
.
get
(
"password"
)
as
string
;
const
password
=
formData
.
get
(
"password"
)
as
string
;
const
confirmPassword
=
formData
.
get
(
"confirmPassword"
)
as
string
;
const
confirmPassword
=
formData
.
get
(
"confirmPassword"
)
as
string
;
...
@@ -124,7 +124,7 @@ export const resetPasswordAction = async (formData: FormData) => {
...
@@ -124,7 +124,7 @@ export const resetPasswordAction = async (formData: FormData) => {
};
};
export
const
signOutAction
=
async
()
=>
{
export
const
signOutAction
=
async
()
=>
{
const
supabase
=
createClient
();
const
supabase
=
await
createClient
();
await
supabase
.
auth
.
signOut
();
await
supabase
.
auth
.
signOut
();
return
redirect
(
"/sign-in"
);
return
redirect
(
"/sign-in"
);
};
};
examples/with-supabase/app/auth/callback/route.ts
View file @
703d276e
...
@@ -11,7 +11,7 @@ export async function GET(request: Request) {
...
@@ -11,7 +11,7 @@ export async function GET(request: Request) {
const
redirectTo
=
requestUrl
.
searchParams
.
get
(
"redirect_to"
)?.
toString
();
const
redirectTo
=
requestUrl
.
searchParams
.
get
(
"redirect_to"
)?.
toString
();
if
(
code
)
{
if
(
code
)
{
const
supabase
=
createClient
();
const
supabase
=
await
createClient
();
await
supabase
.
auth
.
exchangeCodeForSession
(
code
);
await
supabase
.
auth
.
exchangeCodeForSession
(
code
);
}
}
...
...
examples/with-supabase/app/protected/page.tsx
View file @
703d276e
...
@@ -4,7 +4,7 @@ import { InfoIcon } from "lucide-react";
...
@@ -4,7 +4,7 @@ import { InfoIcon } from "lucide-react";
import
{
redirect
}
from
"next/navigation"
;
import
{
redirect
}
from
"next/navigation"
;
export
default
async
function
ProtectedPage
()
{
export
default
async
function
ProtectedPage
()
{
const
supabase
=
createClient
();
const
supabase
=
await
createClient
();
const
{
const
{
data
:
{
user
},
data
:
{
user
},
...
...
examples/with-supabase/app/protected/reset-password/page.tsx
View file @
703d276e
...
@@ -4,11 +4,10 @@ import { SubmitButton } from "@/components/submit-button";
...
@@ -4,11 +4,10 @@ import { SubmitButton } from "@/components/submit-button";
import
{
Input
}
from
"@/components/ui/input"
;
import
{
Input
}
from
"@/components/ui/input"
;
import
{
Label
}
from
"@/components/ui/label"
;
import
{
Label
}
from
"@/components/ui/label"
;
export
default
async
function
ResetPassword
({
export
default
async
function
ResetPassword
(
props
:
{
searchParams
,
searchParams
:
Promise
<
Message
>
;
}:
{
searchParams
:
Message
;
})
{
})
{
const
searchParams
=
await
props
.
searchParams
;
return
(
return
(
<
form
className=
"flex flex-col w-full max-w-md p-4 gap-2 [&>input]:mb-4"
>
<
form
className=
"flex flex-col w-full max-w-md p-4 gap-2 [&>input]:mb-4"
>
<
h1
className=
"text-2xl font-medium"
>
Reset password
</
h1
>
<
h1
className=
"text-2xl font-medium"
>
Reset password
</
h1
>
...
...
examples/with-supabase/components/header-auth.tsx
View file @
703d276e
...
@@ -6,9 +6,11 @@ import { Button } from "./ui/button";
...
@@ -6,9 +6,11 @@ import { Button } from "./ui/button";
import
{
createClient
}
from
"@/utils/supabase/server"
;
import
{
createClient
}
from
"@/utils/supabase/server"
;
export
default
async
function
AuthButton
()
{
export
default
async
function
AuthButton
()
{
const
supabase
=
await
createClient
();
const
{
const
{
data
:
{
user
},
data
:
{
user
},
}
=
await
createClient
()
.
auth
.
getUser
();
}
=
await
supabase
.
auth
.
getUser
();
if
(
!
hasEnvVars
)
{
if
(
!
hasEnvVars
)
{
return
(
return
(
...
...
examples/with-supabase/utils/supabase/server.ts
View file @
703d276e
import
{
createServerClient
}
from
"@supabase/ssr"
;
import
{
createServerClient
}
from
"@supabase/ssr"
;
import
{
cookies
}
from
"next/headers"
;
import
{
cookies
}
from
"next/headers"
;
export
const
createClient
=
()
=>
{
export
const
createClient
=
async
()
=>
{
const
cookieStore
=
cookies
();
const
cookieStore
=
await
cookies
();
return
createServerClient
(
return
createServerClient
(
process
.
env
.
NEXT_PUBLIC_SUPABASE_URL
!
,
process
.
env
.
NEXT_PUBLIC_SUPABASE_URL
!
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment