release: develop -> main

Author: Yunil-dev

src/components/auth/LoginForm.tsx

@@ -135,8 +135,14 @@ export function LoginForm({
             return;
           }
 
-          const redirectUrl =
-            response.user.InterestSetting === false ? ROUTES.INTEREST : resolvedCallbackUrl;
+          let redirectUrl: string;
+          if (response.user.InterestSetting === false) {
+            redirectUrl = resolvedCallbackUrl
+              ? `${ROUTES.INTEREST}?callbackUrl=${encodeURIComponent(resolvedCallbackUrl)}`
+              : ROUTES.INTEREST;
+          } else {
+            redirectUrl = resolvedCallbackUrl;
+          }
 
           await finalizeLogin(redirectUrl);
         },
@@ -173,7 +179,10 @@ export function LoginForm({
 
   const handleSignupNavigation = async () => {
     onNavigateAway?.();
-    await router.push(ROUTES.SIGNUP);
+    await router.push({
+      pathname: ROUTES.SIGNUP,
+      query: resolvedCallbackUrl ? { callbackUrl: resolvedCallbackUrl } : {},
+    });
   };
 
   return (
@@ -299,7 +308,13 @@ export function LoginForm({
               </Text>
             </button>
           ) : (
-            <I18nLink href={ROUTES.SIGNUP}>
+            <I18nLink
+              href={
+                resolvedCallbackUrl
+                  ? `${ROUTES.SIGNUP}?callbackUrl=${encodeURIComponent(resolvedCallbackUrl)}`
+                  : ROUTES.SIGNUP
+              }
+            >
               <Text typo="body_M" color="primary50" css={underlineText}>
                 {t('signUp')}
               </Text>

src/hooks/auth/use-auth-sync.ts

@@ -2,35 +2,49 @@ import { useEffect } from 'react';
 import { useRouter } from 'next/router';
 import { useAuthStore } from '@/store/auth';
 import { ROUTES } from '@/constants';
+import { resolveSafeAuthRedirect } from '@/utils/auth-session';
+
+/**
+ * 인증 플로우 페이지들은 자체적으로 /interest 리다이렉트를 callbackUrl과 함께 처리한다.
+ * useAuthSync가 이 페이지들에서 동작하면 race condition이 발생하므로 제외한다.
+ */
+const AUTH_FLOW_PATHNAMES = new Set([
+  ROUTES.LOGIN,
+  ROUTES.SIGNUP,
+  ROUTES.INTEREST,
+  '/auth/social/callback',
+]);
 
 /**
  * 사용자 상태를 기준으로 관심사 등록 페이지 리다이렉트를 동기화한다.
+ * 인증 플로우 페이지에서는 동작하지 않으며, 현재 페이지를 callbackUrl로 보존한다.
  */
 export function useAuthSync() {
   const router = useRouter();
   const authState = useAuthStore((state) => state.authState);
   const user = useAuthStore((state) => state.user);
   const isBootstrapped = useAuthStore((state) => state.isBootstrapped);
 
-  // InterestSetting 확인 및 리다이렉트
   useEffect(() => {
     if (!isBootstrapped) return;
     if (authState !== 'authenticated' || !user) return;
 
-    // InterestSetting이 false이고, 현재 페이지가 관심사 등록 페이지가 아니면 리다이렉트
     const skipInterestRedirect =
       typeof window !== 'undefined' && window.sessionStorage.getItem('interest_done') === '1';
 
     if (user.InterestSetting !== false && skipInterestRedirect) {
       window.sessionStorage.removeItem('interest_done');
     }
 
-    if (
-      user.InterestSetting === false &&
-      !skipInterestRedirect &&
-      router.pathname !== ROUTES.INTEREST
-    ) {
-      void router.push(ROUTES.INTEREST);
+    const isAuthFlowPage = AUTH_FLOW_PATHNAMES.has(router.pathname);
+
+    if (user.InterestSetting === false && !skipInterestRedirect && isAuthFlowPage === false) {
+      const currentPath = resolveSafeAuthRedirect(router.asPath);
+      const interestUrl =
+        currentPath !== ROUTES.HOME
+          ? `${ROUTES.INTEREST}?callbackUrl=${encodeURIComponent(currentPath)}`
+          : ROUTES.INTEREST;
+      void router.replace(interestUrl);
     }
   }, [authState, isBootstrapped, router, user]);
 

src/pages/auth/social/callback.tsx

@@ -87,10 +87,16 @@ export default function SocialAuthCallbackPage() {
         }
 
         showToast(getAuthFeedback(t, 'social_login_success'));
-        const redirectUrl =
-          response.user.InterestSetting === false
-            ? ROUTES.INTEREST
-            : resolveSafeAuthRedirect(pending.callbackUrl);
+        const safeCallbackUrl = resolveSafeAuthRedirect(pending.callbackUrl);
+        let redirectUrl: string;
+        if (response.user.InterestSetting === false) {
+          redirectUrl =
+            safeCallbackUrl === ROUTES.HOME
+              ? ROUTES.INTEREST
+              : `${ROUTES.INTEREST}?callbackUrl=${encodeURIComponent(safeCallbackUrl)}`;
+        } else {
+          redirectUrl = safeCallbackUrl;
+        }
 
         await router.replace(redirectUrl);
       } catch (error) {

src/pages/company/[companyId]/index.tsx

@@ -274,7 +274,7 @@ export default function ClinicDetailPage({
 
     if (!isLoggedIn) {
       openLoginModal({
-        callbackUrl: reservationUrl,
+        callbackUrl: router.asPath,
         reason: 'reserve',
       });
       return;

src/pages/company/[companyId]/program/[programId].tsx

@@ -127,7 +127,7 @@ export default function ProgramDetailPage({
 
     if (!isLoggedIn) {
       openLoginModal({
-        callbackUrl: reservationUrl,
+        callbackUrl: router.asPath,
         reason: 'reserve',
       });
       return;

src/pages/interest/index.tsx

@@ -30,6 +30,7 @@ import { useAuthStore } from '@/store/auth';
 import { useTranslations } from 'next-intl';
 import { useLocalizedRouter } from '@/i18n/navigation';
 import { getPrivateI18nServerSideProps } from '@/i18n/page-props';
+import { resolveSafeAuthRedirect } from '@/utils/auth-session';
 import { getLocalizedCountryOptions } from '@/utils/localized-country-options';
 
 const INTEREST_OPTION_ICONS: Record<InterestOptionId, ReactNode> = {
@@ -162,7 +163,8 @@ export default function InterestPage() {
             ...(resolvedCountry ? { country: resolvedCountry } : {}),
           });
           await queryClient.invalidateQueries({ queryKey: QUERY_KEYS.GET_USER_PROFILE });
-          await router.replace(ROUTES.HOME);
+          const afterInterestUrl = resolveSafeAuthRedirect(router.query.callbackUrl, ROUTES.HOME);
+          await router.replace(afterInterestUrl);
         },
         onError: (error: unknown) => {
           showErrorToast(error, { fallbackMessage: t('toast.saveFailed') });

src/pages/login/index.tsx

@@ -35,7 +35,15 @@ export default function Login() {
     if (isAuthLoading || !isAuthenticated || !authUser) return;
 
     const callbackUrl = resolveSafeAuthRedirect(router.query.callbackUrl);
-    const redirectUrl = authUser.InterestSetting === false ? ROUTES.INTEREST : callbackUrl;
+    let redirectUrl: string;
+    if (authUser.InterestSetting === false) {
+      redirectUrl =
+        callbackUrl === ROUTES.HOME
+          ? ROUTES.INTEREST
+          : `${ROUTES.INTEREST}?callbackUrl=${encodeURIComponent(callbackUrl)}`;
+    } else {
+      redirectUrl = callbackUrl;
+    }
 
     hasRedirected.current = true;
     void router.replace(redirectUrl);

src/pages/signup/index.tsx

@@ -260,9 +260,13 @@ export default function Signup() {
       {
         onSuccess: () => {
           // 회원가입 후에는 accessToken이 제공되지 않을 수 있으므로 로그인 페이지로 이동
+          const callbackUrl = router.query.callbackUrl;
           void router.push({
             pathname: ROUTES.LOGIN,
-            query: { notice: 'signup_verification_email_sent' },
+            query: {
+              notice: 'signup_verification_email_sent',
+              ...(callbackUrl ? { callbackUrl } : {}),
+            },
           });
         },
         onError: (error: unknown) => {
@@ -490,7 +494,17 @@ export default function Signup() {
               <Text typo="body_M" color="text_secondary">
                 {t('alreadyHaveAccount')}{' '}
               </Text>
-              <button type="button" css={linkButton} onClick={() => void router.push(ROUTES.LOGIN)}>
+              <button
+                type="button"
+                css={linkButton}
+                onClick={() => {
+                  const callbackUrl = router.query.callbackUrl;
+                  void router.push({
+                    pathname: ROUTES.LOGIN,
+                    query: callbackUrl ? { callbackUrl } : {},
+                  });
+                }}
+              >
                 <Text typo="body_M" color="primary50" css={underlineText}>
                   {t('logIn')}
                 </Text>