From 7bf12cc552faa7a0000329625fc08c892abe0622 Mon Sep 17 00:00:00 2001 From: Brian Cao Date: Wed, 9 Nov 2022 13:54:09 -0800 Subject: [PATCH] Assign user to userStore --- components/forms/LoginForm.js | 6 ++++-- hooks/useRequireLogin.js | 7 +++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/components/forms/LoginForm.js b/components/forms/LoginForm.js index 8c8aa09e..6a6560f1 100644 --- a/components/forms/LoginForm.js +++ b/components/forms/LoginForm.js @@ -42,9 +42,11 @@ export default function LoginForm() { }); if (ok) { - setItem(AUTH_TOKEN, data.token); + const { user, token } = data; - setUser(data.user); + setItem(AUTH_TOKEN, token); + + setUser(user); await router.push('/'); diff --git a/hooks/useRequireLogin.js b/hooks/useRequireLogin.js index b00f633b..b2edc347 100644 --- a/hooks/useRequireLogin.js +++ b/hooks/useRequireLogin.js @@ -12,14 +12,17 @@ export default function useRequireLogin() { async function loadUser() { setLoading(true); - const { ok, data } = await get('/auth/verify'); + const { + ok, + data: { user }, + } = await get('/auth/verify'); if (!ok) { await router.push('/login'); return null; } - setUser(data); + setUser(user); setLoading(false); }