diff --git a/src/hooks/useUser.tsx b/src/hooks/useUser.tsx index 7a64c02b..e9699ee3 100644 --- a/src/hooks/useUser.tsx +++ b/src/hooks/useUser.tsx @@ -10,6 +10,7 @@ export default function useUser({redirectTo = "", redirectIfFound = false} = {}) const {data: user, mutate: mutateUser, isLoading} = useSWR("/api/user", fetcher); useEffect(() => { + console.log("HERE!!!"); // if no redirect needed, just return (example: already on /dashboard) // if user data not yet there (fetch in progress, logged in or not) then don't do anything yet if (!redirectTo || !user) return; diff --git a/src/pages/api/logout.ts b/src/pages/api/logout.ts index ce9314af..a7832a88 100644 --- a/src/pages/api/logout.ts +++ b/src/pages/api/logout.ts @@ -9,13 +9,7 @@ const auth = getAuth(app); export default withIronSessionApiRoute(logout, sessionOptions); async function logout(req: NextApiRequest, res: NextApiResponse) { - signOut(auth) - .then(() => { - req.session.destroy(); - res.status(200).json({ok: true}); - }) - .catch(() => { - req.session.destroy(); - res.status(500).json({ok: false}); - }); + await auth.signOut(); + req.session.destroy(); + res.status(200).json(undefined); } diff --git a/src/pages/api/user.ts b/src/pages/api/user.ts index b644b92b..6d759c43 100644 --- a/src/pages/api/user.ts +++ b/src/pages/api/user.ts @@ -10,17 +10,17 @@ export default withIronSessionApiRoute(user, sessionOptions); async function user(req: NextApiRequest, res: NextApiResponse) { if (req.session.user) { if (!auth.currentUser) { - res.status(401).json({ok: false}); + res.status(401).json(undefined); return; } if (req.session.user.id === auth.currentUser.uid) { - res.status(401).json({ok: false}); + res.status(401).json(undefined); return; } res.json(req.session.user); } else { - res.status(401).json({ok: false}); + res.status(401).json(undefined); } }