mokhtar/shellphone.app
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix redirect on requireLoggedIn()

Browse Source
This commit is contained in:
m5r 2022-05-18 01:49:31 +02:00
parent 18e16c84b2
commit 7dc9c403d8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/utils/auth.server.ts
View File

@ -136,11 +136,11 @@ export async function requireLoggedOut(request: Request) {
export async function requireLoggedIn(request: Request) { export async function requireLoggedIn(request: Request) {
const user = await authenticator.isAuthenticated(request); const user = await authenticator.isAuthenticated(request);
const signInUrl = new URL("/sign-in"); const signInUrl = "/sign-in";
const redirectTo = buildRedirectTo(new URL(request.url)); const redirectTo = buildRedirectTo(new URL(request.url));
signInUrl.searchParams.set("redirectTo", redirectTo); const searchParams = new URLSearchParams({ redirectTo });
if (!user) { if (!user) {
throw redirect(signInUrl.toString(), { throw redirect(`${signInUrl}?${searchParams.toString()}`, {
headers: { "Set-Cookie": await destroySession(await getSession(request)) }, headers: { "Set-Cookie": await destroySession(await getSession(request)) },
}); });
} }
@ -148,7 +148,7 @@ export async function requireLoggedIn(request: Request) {
return user; return user;
} }
function buildRedirectTo(url: URL): string { function buildRedirectTo(url: URL) {
let redirectTo = url.pathname; let redirectTo = url.pathname;
const searchParams = url.searchParams.toString(); const searchParams = url.searchParams.toString();
if (searchParams.length > 0) { if (searchParams.length > 0) {