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

redirect on requireLoggedIn()

Browse Source
This commit is contained in:
m5r 2022-05-15 18:33:19 +02:00
parent 022670543f
commit cdaafec4e6
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
import { type Session, redirect } from "@remix-run/node"; import { redirect, type Session } from "@remix-run/node";
import type { FormStrategyVerifyParams } from "remix-auth-form"; import type { FormStrategyVerifyParams } from "remix-auth-form";
import SecurePassword from "secure-password"; import SecurePassword from "secure-password";
import type { MembershipRole, Organization, User } from "@prisma/client"; import type { MembershipRole, Organization, User } from "@prisma/client";
@ -9,7 +9,9 @@ import authenticator from "./authenticator.server";
import { AuthenticationError } from "./errors"; import { AuthenticationError } from "./errors";
import { commitSession, destroySession, getSession } from "./session.server"; import { commitSession, destroySession, getSession } from "./session.server";
export type SessionOrganization = Pick<Organization, "id" | "twilioSubAccountSid" | "twilioAccountSid"> & { role: MembershipRole }; export type SessionOrganization = Pick<Organization, "id" | "twilioSubAccountSid" | "twilioAccountSid"> & {
role: MembershipRole;
};
export type SessionUser = Omit<User, "hashedPassword"> & { export type SessionUser = Omit<User, "hashedPassword"> & {
organizations: SessionOrganization[]; organizations: SessionOrganization[];
}; };
@ -134,8 +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 redirectTo = buildRedirectTo(new URL(request.url));
signInUrl.searchParams.set("redirectTo", redirectTo);
if (!user) { if (!user) {
throw redirect("/sign-in", { throw redirect(signInUrl.toString(), {
headers: { "Set-Cookie": await destroySession(await getSession(request)) }, headers: { "Set-Cookie": await destroySession(await getSession(request)) },
}); });
} }
@ -143,6 +148,16 @@ export async function requireLoggedIn(request: Request) {
return user; return user;
} }
function buildRedirectTo(url: URL): string {
let redirectTo = url.pathname;
const searchParams = url.searchParams.toString();
if (searchParams.length > 0) {
redirectTo += `?${searchParams}`;
}
return encodeURIComponent(redirectTo);
}
export async function refreshSessionData(request: Request) { export async function refreshSessionData(request: Request) {
const { id } = await requireLoggedIn(request); const { id } = await requireLoggedIn(request);
const user = await db.user.findUnique({ const user = await db.user.findUnique({