From 8c8f5c611bacd52c2b79871913a3749c321ecd7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=84=9C=EC=A0=9C=EA=B2=BD?= <seojk0315@naver.com>
Date: Thu, 26 Feb 2026 20:03:18 +0900
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=EB=82=B4=20=EC=A0=95=EB=B3=B4?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20api=20=EC=97=B0=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/auth/auth.ts                          | 21 ++++++------
 src/components/Sidebar/Sidebar.tsx            |  2 +-
 src/components/auth/common/InputActions.tsx   |  4 +--
 .../auth/flows/signup/PasswordSetupStep.tsx   | 13 ++-----
 .../auth/flows/signup/ProfileSetupStep.tsx    |  8 +++--
 src/components/common/input/Input.tsx         | 18 ++++++----
 src/hooks/auth/useTokenRefresh.ts             | 11 ++++--
 src/layout/main/MainLayout.tsx                |  7 +++-
 src/pages/auth/Signup.tsx                     | 14 ++++++--
 src/routes/Router.tsx                         | 13 ++++---
 src/store/useAuthStore.ts                     | 19 +++++------
 src/types/auth/auth.ts                        | 34 ++++++++-----------
 12 files changed, 87 insertions(+), 77 deletions(-)

diff --git a/src/api/auth/auth.ts b/src/api/auth/auth.ts
index 982bd35..ec7e7ca 100644
--- a/src/api/auth/auth.ts
+++ b/src/api/auth/auth.ts
@@ -4,6 +4,7 @@ import type {
   IEmailVerifyRequest,
   ILoginRequest,
   ILoginResponse,
+  IMyPageInfoResponse,
   IPasswordResetRequest,
   ISignUpRequest,
   ISignUpResponse,
@@ -15,9 +16,8 @@ import type {
 } from "@/types/auth/auth";
 import type { ICommonResponse } from "@/types/common/common";
 
-import { axiosInstance } from "@/lib/axiosInstance";
+import { authInstance, axiosInstance } from "@/lib/axiosInstance";
 
-// 이메일 인증 코드 전송
 export const sendEmail = async ({
   email,
 }: IEmailSendRequest): Promise<ICommonResponse<IEmailSendResponse>> => {
@@ -25,7 +25,6 @@ export const sendEmail = async ({
   return data;
 };
 
-// 이메일 인증 코드 검증
 export const verifyEmail = async ({
   email,
   authCode,
@@ -37,7 +36,6 @@ export const verifyEmail = async ({
   return data;
 };
 
-// 단순 회원가입
 export const signUp = async ({
   email,
   password,
@@ -53,7 +51,6 @@ export const signUp = async ({
   return data;
 };
 
-// 토큰 재발급
 export const reissueToken = async (): Promise<
   ICommonResponse<ITokenRefreshResponse>
 > => {
@@ -61,19 +58,17 @@ export const reissueToken = async (): Promise<
   return data;
 };
 
-// 로그인
 export const login = async ({
   email,
   password,
 }: ILoginRequest): Promise<ICommonResponse<ILoginResponse>> => {
-  const { data } = await axiosInstance.post("/api/auth/login", {
+  const { data } = await authInstance.post("/api/auth/login", {
     email,
     password,
   });
   return data;
 };
 
-// SMS 인증 코드 전송
 export const sendSMS = async ({
   phoneNumber,
 }: ISmsSendRequest): Promise<ICommonResponse<ISmsSendResponse>> => {
@@ -83,7 +78,6 @@ export const sendSMS = async ({
   return data;
 };
 
-// SMS 인증 코드 검증
 export const verifySMS = async ({
   phoneNumber,
   verificationCode,
@@ -95,7 +89,6 @@ export const verifySMS = async ({
   return data;
 };
 
-// 비밀번호 재설정 요청
 export const requestPasswordReset = async ({
   email,
 }: IEmailSendRequest): Promise<ICommonResponse<IEmailSendResponse>> => {
@@ -108,7 +101,6 @@ export const requestPasswordReset = async ({
   return data;
 };
 
-// 비밀번호 재설정
 export const resetPassword = async ({
   email,
   password,
@@ -122,3 +114,10 @@ export const resetPassword = async ({
   );
   return data;
 };
+
+export const getMyInfo = async (): Promise<
+  ICommonResponse<IMyPageInfoResponse>
+> => {
+  const { data } = await axiosInstance.get("/api/users/my");
+  return data;
+};
diff --git a/src/components/Sidebar/Sidebar.tsx b/src/components/Sidebar/Sidebar.tsx
index f43788a..bfe7b92 100644
--- a/src/components/Sidebar/Sidebar.tsx
+++ b/src/components/Sidebar/Sidebar.tsx
@@ -47,7 +47,7 @@ export default function Sidebar() {
         isCollapsed ? "w-25" : "w-64",
       ].join(" ")}
     >
-      <div className="mx-auto flex w-full max-w-[232px] flex-1 flex-col">
+      <div className="mx-auto flex w-full max-w-58 flex-1 flex-col">
         <NavLink
           to="/"
           aria-label="홈으로 이동"
diff --git a/src/components/auth/common/InputActions.tsx b/src/components/auth/common/InputActions.tsx
index dd13781..577526c 100644
--- a/src/components/auth/common/InputActions.tsx
+++ b/src/components/auth/common/InputActions.tsx
@@ -29,9 +29,7 @@ export default function InputActions({
 
   return (
     <div className="flex items-center gap-2">
-      {timer && (
-        <span className="text-status-red font-body2 mr-3">{timer}</span>
-      )}
+      {timer && <span className="text-status-red font-body2">{timer}</span>}
       {button && (
         <Button
           size="small"
diff --git a/src/components/auth/flows/signup/PasswordSetupStep.tsx b/src/components/auth/flows/signup/PasswordSetupStep.tsx
index 1693f2e..d7b1b29 100644
--- a/src/components/auth/flows/signup/PasswordSetupStep.tsx
+++ b/src/components/auth/flows/signup/PasswordSetupStep.tsx
@@ -1,19 +1,10 @@
 import PasswordForm from "@/components/auth/common/PasswordForm";
 
-import useAuthStore from "@/store/useAuthStore";
-
 interface IPasswordSetupStepProps {
-  onNext: () => void;
+  onNext: (password: string) => void;
 }
 
 export default function PasswordSetupStep({ onNext }: IPasswordSetupStepProps) {
-  const { setPassword } = useAuthStore();
-
-  const handleSubmit = (password: string) => {
-    setPassword(password);
-    onNext();
-  };
-
   return (
     <PasswordForm
       title={
@@ -24,7 +15,7 @@ export default function PasswordSetupStep({ onNext }: IPasswordSetupStepProps) {
         </>
       }
       buttonText="다음으로"
-      onSubmit={handleSubmit}
+      onSubmit={onNext}
     />
   );
 }
diff --git a/src/components/auth/flows/signup/ProfileSetupStep.tsx b/src/components/auth/flows/signup/ProfileSetupStep.tsx
index 91d4d43..2974342 100644
--- a/src/components/auth/flows/signup/ProfileSetupStep.tsx
+++ b/src/components/auth/flows/signup/ProfileSetupStep.tsx
@@ -18,9 +18,13 @@ import useModalStore, { MODAL_TYPES } from "@/store/useModalStore";
 
 type TSignupProfileFormValues = z.infer<typeof signupProfileSchema>;
 
-export default function ProfileSetupStep() {
+interface IProfileSetupStepProps {
+  password: string;
+}
+
+export default function ProfileSetupStep({ password }: IProfileSetupStepProps) {
   const navigate = useNavigate();
-  const { email, password, resetAuth } = useAuthStore();
+  const { email, resetAuth } = useAuthStore();
   const { openModal } = useModalStore();
   const { useSignUp } = useAuth();
 
diff --git a/src/components/common/input/Input.tsx b/src/components/common/input/Input.tsx
index 577c44f..998e940 100644
--- a/src/components/common/input/Input.tsx
+++ b/src/components/common/input/Input.tsx
@@ -29,6 +29,7 @@ const Input = forwardRef<HTMLInputElement, IInputProps>(
       containerClassName,
       inputClassName,
       id,
+      disabled,
       ...props
     },
     ref,
@@ -52,11 +53,13 @@ const Input = forwardRef<HTMLInputElement, IInputProps>(
         <div
           className={twMerge(
             "flex items-center w-full h-input bg-white ring-1 ring-logo-1/30 rounded-component-md transition-colors duration-200 ease-out overflow-hidden",
-            error
-              ? "ring-2 ring-status-red bg-status-red/5"
-              : success
-                ? "rubg-2 ring-status-green bg-status-green/5"
-                : "hover:bg-gray-100 hover:ring-logo-1/40 focus-within:bg-white focus-within:ring-2 focus-within:ring-logo-1/50",
+            disabled
+              ? "bg-gray-100 cursor-not-allowed"
+              : error
+                ? "ring-2 ring-status-red bg-status-red/5"
+                : success
+                  ? "rubg-2 ring-status-green bg-status-green/5"
+                  : "hover:bg-gray-100 hover:ring-logo-1/40 focus-within:bg-white focus-within:ring-2 focus-within:ring-logo-1/50",
             containerClassName,
           )}
         >
@@ -64,13 +67,14 @@ const Input = forwardRef<HTMLInputElement, IInputProps>(
             ref={ref}
             className={twMerge(
               "flex-1 h-full w-full bg-transparent border-none outline-none text-body1 text-text-main placeholder:text-text-placeholder px-5",
-              "disabled:bg-gray-100 disabled:cursor-not-allowed disabled:text-text-disabled",
+              "disabled:cursor-not-allowed disabled:text-text-disabled",
               rightElement ? "pr-2" : "",
               inputClassName,
             )}
             id={inputId}
             aria-invalid={error ? "true" : "false"}
             aria-describedby={helperTextId}
+            disabled={disabled}
             {...props}
           />
           {rightElement && (
@@ -84,7 +88,7 @@ const Input = forwardRef<HTMLInputElement, IInputProps>(
             id={helperTextId}
             aria-live="polite"
             className={twMerge(
-              "font-caption pl-1",
+              "font-caption pl-1 mt-1.5",
               error ? "text-status-red" : "text-text-sub",
             )}
           >
diff --git a/src/hooks/auth/useTokenRefresh.ts b/src/hooks/auth/useTokenRefresh.ts
index cf380da..5bc4723 100644
--- a/src/hooks/auth/useTokenRefresh.ts
+++ b/src/hooks/auth/useTokenRefresh.ts
@@ -4,14 +4,17 @@ import { reissueToken } from "@/api/auth/auth";
 import useAuthStore from "@/store/useAuthStore";
 
 export const useTokenRefresh = () => {
-  const { setAccessToken, logout } = useAuthStore();
+  const { setAccessToken, logout, setTokenInitialized } = useAuthStore();
   const initialized = useRef(false);
 
   useEffect(() => {
     if (initialized.current) return;
     initialized.current = true;
 
-    if (!localStorage.getItem("hasSession")) return;
+    if (!localStorage.getItem("hasSession")) {
+      setTokenInitialized();
+      return;
+    }
 
     const initAuth = async () => {
       try {
@@ -21,9 +24,11 @@ export const useTokenRefresh = () => {
         }
       } catch {
         logout();
+      } finally {
+        setTokenInitialized();
       }
     };
 
     initAuth();
-  }, [setAccessToken, logout]);
+  }, [setAccessToken, logout, setTokenInitialized]);
 };
diff --git a/src/layout/main/MainLayout.tsx b/src/layout/main/MainLayout.tsx
index da89024..e16f1df 100644
--- a/src/layout/main/MainLayout.tsx
+++ b/src/layout/main/MainLayout.tsx
@@ -1,13 +1,18 @@
 import { Outlet } from "react-router-dom";
 
+import { useCoreQuery } from "@/hooks/customQuery";
+
 import Sidebar from "@/components/Sidebar/Sidebar";
 
+import { getMyInfo } from "@/api/auth/auth";
+
 export default function MainLayout() {
+  useCoreQuery(["myInfo"], getMyInfo);
   return (
     <div className="flex h-screen p-3 bg-gray-50 sm:p-5">
       <Sidebar />
       <main className="flex-1 overflow-auto">
-        <div className="mx-auto w-full max-w-[1600px] py-6 px-4 sm:px-6 lg:px-20">
+        <div className="mx-auto w-full max-w-400 py-6 px-4 sm:px-6 lg:px-20">
           <Outlet />
         </div>
       </main>
diff --git a/src/pages/auth/Signup.tsx b/src/pages/auth/Signup.tsx
index e1af688..72d5327 100644
--- a/src/pages/auth/Signup.tsx
+++ b/src/pages/auth/Signup.tsx
@@ -1,4 +1,4 @@
-import { useEffect } from "react";
+import { useEffect, useState } from "react";
 import { Link, useLocation } from "react-router-dom";
 
 import { useSocialLogin } from "@/hooks/auth/useSocialLogin";
@@ -21,6 +21,7 @@ export default function Signup() {
   const { step, setStep, handleNext } = useStepNavigation(
     location.state?.step || 0,
   );
+  const [password, setPassword] = useState("");
 
   useEffect(() => {
     return () => {
@@ -34,10 +35,17 @@ export default function Signup() {
     return <Step01Email onNext={handleNext} />;
   }
   if (step === 2) {
-    return <Step02Password onNext={handleNext} />;
+    return (
+      <Step02Password
+        onNext={(pw) => {
+          setPassword(pw);
+          handleNext();
+        }}
+      />
+    );
   }
   if (step === 3) {
-    return <Step03Profile />;
+    return <Step03Profile password={password} />;
   }
 
   return (
diff --git a/src/routes/Router.tsx b/src/routes/Router.tsx
index 8f9c76e..1dee224 100644
--- a/src/routes/Router.tsx
+++ b/src/routes/Router.tsx
@@ -8,13 +8,18 @@ import AuthLayout from "@/layout/auth/AuthLayout";
 import GlobalLayout from "@/layout/GlobalLayout";
 import MainLayout from "@/layout/main/MainLayout";
 import Error from "@/pages/common/Error";
+import useAuthStore from "@/store/useAuthStore";
 
 function AuthGuard({ children }: { children: React.ReactNode }) {
-  // 실제 인증 상태 확인 로직으로 대체 예정
-  const isAuthenticated = true;
+  const isLoggedIn = useAuthStore((state) => state.isLoggedIn);
+  const isTokenInitialized = useAuthStore((state) => state.isTokenInitialized);
 
-  if (!isAuthenticated) {
-    return <Navigate to="/signup" replace />;
+  if (!isTokenInitialized) {
+    return null;
+  }
+
+  if (!isLoggedIn) {
+    return <Navigate to="/login" replace />;
   }
 
   return <>{children}</>;
diff --git a/src/store/useAuthStore.ts b/src/store/useAuthStore.ts
index 1b159bf..4012c65 100644
--- a/src/store/useAuthStore.ts
+++ b/src/store/useAuthStore.ts
@@ -2,41 +2,38 @@ import { create } from "zustand";
 
 interface IAuthState {
   isLoggedIn: boolean;
+  isTokenInitialized: boolean;
   accessToken: string | null;
   email: string;
-  password: string;
-  socialId: number;
+  socialId: number | null;
 
   login: (email: string, accessToken: string) => void;
   logout: () => void;
   setAccessToken: (token: string) => void;
+  setTokenInitialized: () => void;
   setEmail: (email: string) => void;
-  setPassword: (password: string) => void;
   setSocialId: (socialId: number) => void;
   resetAuth: () => void;
 }
 
 const useAuthStore = create<IAuthState>((set) => ({
   isLoggedIn: false,
+  isTokenInitialized: false,
   accessToken: null,
   email: "",
-  password: "",
-  socialId: -1,
+  socialId: null,
 
   login: (email, accessToken) => {
     localStorage.setItem("hasSession", "true");
     set({ isLoggedIn: true, email, accessToken });
   },
   logout: () => {
-    localStorage.removeItem("accessToken");
-    localStorage.removeItem("refreshToken");
     localStorage.removeItem("hasSession");
     set({
       isLoggedIn: false,
       accessToken: null,
       email: "",
-      password: "",
-      socialId: -1,
+      socialId: null,
     });
   },
 
@@ -44,10 +41,10 @@ const useAuthStore = create<IAuthState>((set) => ({
     localStorage.setItem("hasSession", "true");
     set({ accessToken: token, isLoggedIn: true });
   },
+  setTokenInitialized: () => set({ isTokenInitialized: true }),
   setEmail: (email) => set({ email }),
-  setPassword: (password) => set({ password }),
   setSocialId: (socialId) => set({ socialId }),
-  resetAuth: () => set({ email: "", password: "", accessToken: null }),
+  resetAuth: () => set({ email: "" }),
 }));
 
 export default useAuthStore;
diff --git a/src/types/auth/auth.ts b/src/types/auth/auth.ts
index a1e467e..902524b 100644
--- a/src/types/auth/auth.ts
+++ b/src/types/auth/auth.ts
@@ -1,22 +1,18 @@
-// 이메일 인증 전송 요청
 export interface IEmailSendRequest {
   email: string;
 }
 
-// 이메일 인증 전송 응답
 export interface IEmailSendResponse {
   message: string;
   email: string;
   expireIn: number;
 }
 
-// 이메일 인증 확인 요청
 export interface IEmailVerifyRequest {
   email: string;
   authCode: string;
 }
 
-// 회원가입 요청
 export interface ISignUpRequest {
   email: string;
   password: string;
@@ -24,68 +20,66 @@ export interface ISignUpRequest {
   phone_number: string;
 }
 
-// 회원가입 응답
 export interface ISignUpResponse {
   userId: number;
   createdAt: string;
 }
 
-// 로그인 요청
 export interface ILoginRequest {
   email: string;
   password: string;
 }
-export type TLoginFormValues = ILoginRequest;
 
-// 로그인 응답
 export interface ILoginResponse {
   grantType: string;
   accessToken: string;
   accessTokenExpiresIn: number;
 }
 
-// 토큰 재발급 요청
-export interface ITokenRefreshRequest {
-  refreshToken: string;
-}
-
-// 토큰 재발급 응답
 export interface ITokenRefreshResponse {
   grantType: string;
   accessToken: string;
   accessTokenExpiresIn: number;
 }
 
-// 소셜 로그인 플랫폼
+// 소셜 로그인 OAuth2 경로용
 export type TSocialLoginPlatform = "kakao" | "naver" | "google";
 
-// SMS 인증 요청
+// 서버 응답의 로그인 provider
+export type TLoginProvider = "EMAIL" | "KAKAO" | "NAVER" | "GOOGLE";
+
 export interface ISmsSendRequest {
   phoneNumber: string;
 }
 
-// SMS 인증 요청 응답
 export interface ISmsSendResponse {
   message: string;
   phoneNumber: string;
   expireIn: number;
 }
 
-// SMS 인증 확인 요청
 export interface ISmsVerifyRequest {
   phoneNumber: string;
   verificationCode: string;
 }
 
-// SMS 인증 확인 응답
 export interface ISmsVerifyResponse {
   isVerified: boolean;
   verificationMessage: string;
   email: string;
 }
 
-// 비밀번호 재설정 요청
 export interface IPasswordResetRequest {
   email: string;
   password: string;
 }
+
+export interface IMyPageInfoResponse {
+  userId: number;
+  email: string;
+  name: string;
+  profileImageUrl: string;
+  phoneNumber: string;
+  isEmailVerified: boolean;
+  providerType: TLoginProvider;
+}

From c8331064ae27d5a10beeb7cbcaccc9da6ce8d311 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EC=84=9C=EC=A0=9C=EA=B2=BD?= <seojk0315@naver.com>
Date: Thu, 26 Feb 2026 20:24:36 +0900
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=EB=A6=AC=EB=B7=B0=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/common/input/Input.tsx | 2 +-
 src/store/useAuthStore.ts             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/common/input/Input.tsx b/src/components/common/input/Input.tsx
index 998e940..ee09d6e 100644
--- a/src/components/common/input/Input.tsx
+++ b/src/components/common/input/Input.tsx
@@ -58,7 +58,7 @@ const Input = forwardRef<HTMLInputElement, IInputProps>(
               : error
                 ? "ring-2 ring-status-red bg-status-red/5"
                 : success
-                  ? "rubg-2 ring-status-green bg-status-green/5"
+                  ? "ring-2 ring-status-green bg-status-green/5"
                   : "hover:bg-gray-100 hover:ring-logo-1/40 focus-within:bg-white focus-within:ring-2 focus-within:ring-logo-1/50",
             containerClassName,
           )}
diff --git a/src/store/useAuthStore.ts b/src/store/useAuthStore.ts
index 4012c65..cb53d9f 100644
--- a/src/store/useAuthStore.ts
+++ b/src/store/useAuthStore.ts
@@ -12,7 +12,7 @@ interface IAuthState {
   setAccessToken: (token: string) => void;
   setTokenInitialized: () => void;
   setEmail: (email: string) => void;
-  setSocialId: (socialId: number) => void;
+  setSocialId: (socialId: number | null) => void;
   resetAuth: () => void;
 }
 
@@ -44,7 +44,7 @@ const useAuthStore = create<IAuthState>((set) => ({
   setTokenInitialized: () => set({ isTokenInitialized: true }),
   setEmail: (email) => set({ email }),
   setSocialId: (socialId) => set({ socialId }),
-  resetAuth: () => set({ email: "" }),
+  resetAuth: () => set({ email: "", socialId: null }),
 }));
 
 export default useAuthStore;