[Fix] 자동 로그아웃 관련하여 누락된 로직 추가

- 수정된 자동 로그아웃 로직 관련하여 누락된 로직 (일반 로그인에만 적용하였고, Oauth 로그인 부분은 누락) 보완 Issues #122
codestates-seb · Sep 30, 2023 · bd65581 · bd65581
1 parent a0e534b
commit bd65581
Showing 1 changed file with 10 additions and 10 deletions.
diff --git a/client/src/page/MainPage.tsx b/client/src/page/MainPage.tsx
@@ -190,23 +190,23 @@ const MainPage = () => {
       if (autoLogoutSecondAlarm !== null) {
         if (currentTime >= parseInt(autoLogoutSecondAlarm) + secondAlarmTime + lastAlarmTime) {
           localStorage.removeItem("autoLogoutSecondAlarm");
+        } else {
+          const timeGone = currentTime - parseInt(autoLogoutSecondAlarm);
+          const remainTime = secondAlarmTime - timeGone;
+          dispatch(setLoginState()); // 로그인 처리
+          setAutoLogoutAlarm(dispatch, "second", remainTime, lastAlarmTime);
         }
-
-        const timeGone = currentTime - parseInt(autoLogoutSecondAlarm);
-        const remainTime = secondAlarmTime - timeGone;
-        dispatch(setLoginState()); // 로그인 처리
-        setAutoLogoutAlarm(dispatch, "second", remainTime, lastAlarmTime);
       }
 
       if (autoLogoutLastAlarm !== null) {
         if (currentTime >= parseInt(autoLogoutLastAlarm) + lastAlarmTime) {
           localStorage.removeItem("autoLogoutLastAlarm");
+        } else {
+          const timeGone = currentTime - parseInt(autoLogoutLastAlarm);
+          const remainTime = lastAlarmTime - timeGone;
+          dispatch(setLoginState()); // 로그인 처리
+          setAutoLogoutAlarm(dispatch, "last", remainTime);
         }
-
-        const timeGone = currentTime - parseInt(autoLogoutLastAlarm);
-        const remainTime = lastAlarmTime - timeGone;
-        dispatch(setLoginState()); // 로그인 처리
-        setAutoLogoutAlarm(dispatch, "last", remainTime);
       }
     }
   }, []);