Merge pull request #28 from 001elijah/auth

add currentUser
001elijah · Jun 26, 2023 · 1ec87cd · 1ec87cd
2 parents 8d970c3 + 437b4db
commit 1ec87cd
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 272 deletions.
diff --git a/src/pages/AuthPage/AuthPage.jsx b/src/pages/AuthPage/AuthPage.jsx
diff --git a/src/pages/AuthPage/AuthPage.module.scss b/src/pages/AuthPage/AuthPage.module.scss
diff --git a/src/pages/LoginPage.jsx b/src/pages/LoginPage.jsx
diff --git a/src/pages/RegisterPage.jsx b/src/pages/RegisterPage.jsx
diff --git a/src/pages/WelcomePage/WelcomePage.jsx b/src/pages/WelcomePage/WelcomePage.jsx
diff --git a/src/pages/WelcomePage/WelcomePage.module.scss b/src/pages/WelcomePage/WelcomePage.module.scss
diff --git a/src/services/backendAPI.js b/src/services/backendAPI.js
@@ -19,8 +19,8 @@ export const registerUserApi = async userData => {
 
 export const loginUserApi = async userData => {
   const { data } = await axios.post('user/login', userData);
-  token.set(data.token);
-  return { ...data.user, token: data.token };
+  const user = await currentUserApi(data.token);
+  return { ...user, token: data.token };
 };
 
 export const currentUserApi = async userToken => {