fix(api.js): when get user is called using api and there is no email,…

… sign user out #19
LikeLionHGU · Aug 5, 2024 · 275a1c1 · 275a1c1
1 parent b411fa3
commit 275a1c1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src/pages/NewUser.jsx b/src/pages/NewUser.jsx
@@ -37,17 +37,15 @@ function NewUser() {
   // User Already have profile
   useEffect(() => {
     if (!jwtValue) return;
-    fetchBe(jwtValue, "/userDetail/get")
-      .then((json) => {
-        // 기존 사용자
-        setUserData(json);
-        setUserInputState((prev) => ({
-          ...prev,
-          height: json.height || null,
-          weight: json.weight || null,
-        }));
-      })
-      .catch((e) => setUserDataError(e.message));
+    fetchBe(jwtValue, "/userDetail/get").then((json) => {
+      // 기존 사용자
+      setUserData(json);
+      setUserInputState((prev) => ({
+        ...prev,
+        height: json.height || null,
+        weight: json.weight || null,
+      }));
+    });
     fetchBe(jwtValue, "/user/get").then(({ nickName }) => {
       if (nickName) {
         setNicknameState({

diff --git a/src/tools/api.js b/src/tools/api.js
@@ -18,7 +18,7 @@ export const fetchBe = (jwtValue, path, method = "GET", body) =>
       .then((doc) =>
         doc.json().then((json) => {
           // If User not exist (due to db reset, etc)
-          if (json?.message?.includes('"user" is null')) {
+          if (path === "/user/get" && !json?.email) {
             alert("유저가 존재하지 않습니다. 로그인을 다시해주세요.");
             localStorage.clear();
             window.location.reload();