feat/#49/login과 autologin에서 받아오는 userInfo 형식이 다른 것 수정

team-pofo · Jan 15, 2025 · cd0ce6e · cd0ce6e
1 parent 7513c77
commit cd0ce6e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/src/components/LoginModal/LoginModel.tsx b/src/components/LoginModal/LoginModel.tsx
@@ -172,7 +172,6 @@ const Modal: React.FC<ModalProps> = ({
           if (response.success) {
             setLoginState(token, response.data);
           }
-          console.log(response);
         } catch {
           console.log("error");
         }

diff --git a/src/components/Mypage/MypageLayout.tsx b/src/components/Mypage/MypageLayout.tsx
@@ -16,8 +16,8 @@ function MypageMyInfo() {
         height={200}
         style={{ borderRadius: "50%" }}
       />
-      <Styles.MypageNickname>{user?.data?.username}</Styles.MypageNickname>
-      <Styles.MypageEmail>{user?.data?.email}</Styles.MypageEmail>
+      <Styles.MypageNickname>{user?.username}</Styles.MypageNickname>
+      <Styles.MypageEmail>{user?.email}</Styles.MypageEmail>
     </Styles.MypageMyinfo>
   );
 }

diff --git a/src/components/Navigation/Navigation.tsx b/src/components/Navigation/Navigation.tsx
@@ -49,7 +49,7 @@ const Navigation: React.FC = () => {
           setAccessToken(newAccessToken);
           apiClient.defaults.headers.common.Authorization = `Bearer ${newAccessToken}`;
           const userInfo = await getUserInfo();
-          login(newAccessToken, userInfo);
+          login(newAccessToken, userInfo.data);
         }
       } catch (error) {
         console.error("자동 로그인 실패:", error);

diff --git a/src/lib/interface/iUser.ts b/src/lib/interface/iUser.ts
@@ -1,12 +1,7 @@
-export interface IUserData {
+export interface IUser {
   id: number;
-  username: string;
   email: string;
+  username: string;
   role: string;
-  // avatarUrl: string | null;
-}
-
-export interface IUser {
-  success: boolean;
-  data: IUserData | null;
+  avatarUrl: string | null;
 }