File tree 2 files changed +7
-3
lines changed
2 files changed +7
-3
lines changed Original file line number Diff line number Diff line change @@ -158,9 +158,8 @@ export async function getUser(request: Request) {
158
158
if ( userId === undefined ) return null ;
159
159
160
160
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 ;
164
163
}
165
164
166
165
export async function requireUserId (
Original file line number Diff line number Diff line change 1
1
import { Outlet , useLocation } from "@remix-run/react" ;
2
2
3
3
import { Login } from "~/components/login" ;
4
+ import { getUser } from "~/models/session.server" ;
4
5
import { useOptionalUser } from "~/utils" ;
5
6
7
+ export function loader ( { request } : { request : Request } ) {
8
+ return getUser ( request ) ;
9
+ }
10
+
6
11
export default function Auth ( ) {
7
12
const user = useOptionalUser ( ) ;
8
13
const location = useLocation ( ) ;
You can’t perform that action at this time.
0 commit comments