rzmk/learnhouse
1
0
Fork 0
mirror of https://github.com/rzmk/learnhouse.git synced 2025-12-19 04:19:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #300 from learnhouse/feat/auth-pages-issues

Browse source 
Fix login without cookies auth issues fix
This commit is contained in:
Badr B. 2024-08-13 18:45:54 +02:00 • committed by GitHub
commit 7faccfd7e6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

26
apps/web/middleware.ts
View file

@ -42,14 +42,25 @@ export default async function middleware(req: NextRequest) {
// Redirect to the same pathname with the original search params
return NextResponse.rewrite(new URL(`${pathname}${search}`, req.url))
}
if (auth_paths.includes(pathname)) {
// Redirect to the same pathname with the original search params
return NextResponse.rewrite(new URL(`/auth${pathname}${search}`, req.url))
}
// Login
if (orgslug == 'auth' || pathname.startsWith('/login')) {
return NextResponse.rewrite(new URL(`/login${search}`, req.url))
if (auth_paths.includes(pathname)) {
const response = NextResponse.rewrite(
new URL(`/auth${pathname}${search}`, req.url)
)
// Parse the search params
const searchParams = new URLSearchParams(search)
const orgslug = searchParams.get('orgslug')
if (orgslug) {
response.cookies.set({
name: 'learnhouse_current_orgslug',
value: orgslug,
domain:
LEARNHOUSE_TOP_DOMAIN == 'localhost' ? '' : LEARNHOUSE_TOP_DOMAIN,
})
}
return response
}
// Install Page (depreceated)
@ -84,6 +95,7 @@ export default async function middleware(req: NextRequest) {
}
return NextResponse.redirect(redirectUrl)
} else {
return 'Did not find the orgslug in the cookie'
}
}