Skip to content

Commit df94341

Browse files
committed
Fix auth gate
1 parent f04555a commit df94341

File tree

2 files changed

+7
-3
lines changed

2 files changed

+7
-3
lines changed

app/models/session.server.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -158,9 +158,8 @@ export async function getUser(request: Request) {
158158
if (userId === undefined) return null;
159159

160160
const user = await getUserById(userId);
161-
if (user) return user;
162-
163-
throw await logout(request);
161+
if (!user) throw await logout(request);
162+
return user;
164163
}
165164

166165
export async function requireUserId(

app/routes/__auth.tsx

+5
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
import { Outlet, useLocation } from "@remix-run/react";
22

33
import { Login } from "~/components/login";
4+
import { getUser } from "~/models/session.server";
45
import { useOptionalUser } from "~/utils";
56

7+
export function loader({ request }: { request: Request }) {
8+
return getUser(request);
9+
}
10+
611
export default function Auth() {
712
const user = useOptionalUser();
813
const location = useLocation();

0 commit comments

Comments
 (0)