fix: fix session issue

remix-run · Mar 16, 2022 · f05c98b · f05c98b
1 parent 4bf6da3
commit f05c98b
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/app/session.server.ts b/app/session.server.ts
@@ -34,7 +34,11 @@ export async function getUserId(request: Request): Promise<string | undefined> {
 export async function getUser(request: Request): Promise<null | User> {
   const userId = await getUserId(request);
   if (userId === undefined) return null;
-  return getUserById(userId);
+
+  const user = await getUserById(userId);
+  if (user) return user;
+
+  throw await logout(request);
 }
 
 export async function requireUserId(
@@ -51,7 +55,11 @@ export async function requireUserId(
 
 export async function requireUser(request: Request) {
   const userId = await requireUserId(request);
-  return getUserById(userId);
+
+  const user = await getUserById(userId);
+  if (user) return user;
+
+  throw await logout(request);
 }
 
 export async function createUserSession({