markus/next-ory
1
0
Fork 0
mirror of https://codeberg.org/MarkusThielker/next-ory.git synced 2025-04-19 00:51:18 +00:00
Code Releases Packages Activity

NORY-9: fix return to handling (#23)

Browse source
This commit is contained in:
Markus Thielker 2024-12-03 14:07:54 +01:00 • committed by GitHub
commit 90d11ae558
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 23 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
authentication/src/app/flow/login/page.tsx
View file

@ -144,9 +144,11 @@ export default function Login() {
<div className="flex flex-col"> <div className="flex flex-col">
{ {
flow ? flow ?
<Button variant="link" asChild> <Button variant="link" asChild><Link
<Link href="/flow/recovery" className="text-orange-600" passHref> href={{ pathname: '/flow/recovery', query: { return_to: flow.return_to } }}
<span>Forgot your password?</span> className="text-orange-600"
passHref>
Forgot your password?
</Link> </Link>
</Button> </Button>
: :
@ -155,8 +157,11 @@ export default function Login() {
{ {
flow ? flow ?
<Button variant="link" asChild disabled={!flow}> <Button variant="link" asChild disabled={!flow}>
<Link href="/flow/registration" className="inline-flex space-x-2" passHref> <Link
<span>Create an account</span> href={{ pathname: '/flow/registration', query: { return_to: flow.return_to } }}
className="inline-flex space-x-2"
passHref>
Create an account
</Link> </Link>
</Button> </Button>
: :

5
authentication/src/app/flow/recovery/page.tsx
View file

@ -114,7 +114,10 @@ export default function Recovery() {
{ {
flow ? flow ?
<Button variant="link" asChild disabled={!flow}> <Button variant="link" asChild disabled={!flow}>
<Link href="/flow/login" className="inline-flex space-x-2" passHref> <Link
href={{ pathname: '/flow/login', query: { return_to: flow.return_to } }}
className="inline-flex space-x-2"
passHref>
Back to login Back to login
</Link> </Link>
</Button> </Button>

5
authentication/src/app/flow/registration/page.tsx
View file

@ -121,7 +121,10 @@ export default function Registration() {
{ {
flow ? flow ?
<Button variant="link" asChild disabled={!flow}> <Button variant="link" asChild disabled={!flow}>
<Link href="/flow/login" className="inline-flex space-x-2" passHref> <Link
href={{ pathname: '/flow/login', query: { return_to: flow.return_to } }}
className="inline-flex space-x-2"
passHref>
Log into your account Log into your account
</Link> </Link>
</Button> </Button>

5
authentication/src/app/flow/verification/page.tsx
View file

@ -113,7 +113,10 @@ export default function Verification() {
{ {
flow ? flow ?
<Button variant="link" asChild disabled={!flow}> <Button variant="link" asChild disabled={!flow}>
<Link href="/flow/login" className="inline-flex space-x-2" passHref> <Link
href={{ pathname: '/flow/login', query: { return_to: flow.return_to } }}
className="inline-flex space-x-2"
passHref>
Back to login Back to login
</Link> </Link>
</Button> </Button>

2
authentication/src/middleware.ts
View file

@ -41,5 +41,5 @@ export async function middleware(request: NextRequest) {
} }
export const config = { export const config = {
matcher: '/((?!api|_next/static|_next/image|favicon.png|sitemap.xml|robots.txt).*)', matcher: '/((?!api|_next/static|_next/image|favicon.png|sitemap.xml|robots.txt|sw.js).*)',
}; };