Merge branch 'develop' into feat/mypage

Author: bk-git-hub

auth.ts

@@ -1,6 +1,45 @@
 import NextAuth from 'next-auth';
 import Credentials from 'next-auth/providers/credentials';
 import { z } from 'zod';
+import { JWT } from 'next-auth/jwt';
+import { TokenRefreshReqDto, TokenRefreshResDto } from '@/types/domain/auth';
+import { ApiResponse } from '@/types/common';
+
+const TOKEN_REFRESH_BUFFER = 60 * 1000;
+
+async function refreshAccessToken(token: JWT): Promise<JWT> {
+  try {
+    const response = await fetch(
+      `${process.env.BACKEND_API_URL}/auth/token/refresh`,
+      {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json' },
+        body: JSON.stringify({
+          refreshToken: token.refreshToken,
+        } satisfies TokenRefreshReqDto),
+      },
+    );
+
+    if (!response.ok) {
+      throw new Error('Failed to refresh access token');
+    }
+
+    const { data }: ApiResponse<TokenRefreshResDto> = await response.json();
+
+    return {
+      ...token,
+      accessToken: data.accessToken,
+      refreshToken: data.refreshToken,
+      accessTokenExpires: Date.now() + 60 * 60 * 1000,
+    };
+  } catch (error) {
+    console.error('Refresh token error:', error);
+    return {
+      ...token,
+      error: 'RefreshAccessTokenError',
+    };
+  }
+}
 
 export const { handlers, signIn, signOut, auth } = NextAuth({
   providers: [
@@ -41,6 +80,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
             accessToken: data.accessToken,
             refreshToken: data.refreshToken,
             profileUrl: data.profileUrl || null,
+            expiresIn: data.expires_in,
           };
         } catch (error) {
           console.error('Social Auth Error:', error);
@@ -83,6 +123,7 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
             accessToken: data.accessToken,
             refreshToken: data.refreshToken,
             profileUrl: data.profileUrl,
+            expiresIn: data.expires_in,
           };
         } catch (error) {
           console.error('Login Error:', error);
@@ -95,21 +136,31 @@ export const { handlers, signIn, signOut, auth } = NextAuth({
   callbacks: {
     async jwt({ token, user }) {
       if (user) {
-        const u = user;
-        token.accessToken = u.accessToken;
-        token.refreshToken = u.refreshToken;
-        token.userId = u.userId;
-        token.nickName = u.nickName;
-        token.profileImageUrl = u.profileUrl;
+        const expiresIn = user.expiresIn ?? 60 * 60;
+        return {
+          ...token,
+          accessToken: user.accessToken,
+          refreshToken: user.refreshToken,
+          userId: user.userId,
+          nickName: user.nickName,
+          profileUrl: user.profileUrl,
+          accessTokenExpires: Date.now() + expiresIn * 1000,
+        };
+      }
+
+      if (Date.now() < (token.accessTokenExpires ?? 0) - TOKEN_REFRESH_BUFFER) {
+        return token;
       }
-      return token;
+
+      return refreshAccessToken(token);
     },
     async session({ session, token }) {
       session.user.userId = token.userId as string;
       session.user.nickName = token.nickName as string;
-      session.user.profileUrl = token.profileImageUrl;
-      session.accessToken = token.accessToken;
-      session.refreshToken = token.refreshToken;
+      session.user.profileUrl = token.profileUrl;
+      session.accessToken = token.accessToken as string;
+      session.refreshToken = token.refreshToken as string;
+      session.error = token.error;
       return session;
     },
   },

next-auth.d.ts

@@ -10,25 +10,29 @@ declare module 'next-auth' {
     profileUrl: string | null;
     accessToken: string;
     refreshToken: string;
+    expiresIn?: number;
   }
 
   interface Session extends DefaultSession {
     user: {
       userId: string;
       nickName: string;
-      profileImageUrl: string | null;
+      profileUrl: string | null;
     } & DefaultSession['user'];
     accessToken: string;
     refreshToken: string;
+    error?: 'RefreshAccessTokenError';
   }
 }
 
 declare module 'next-auth/jwt' {
   interface JWT extends DefaultJWT {
     userId: string;
-    nickname: string;
-    profileImageUrl: string | null;
+    nickName: string;
+    profileUrl: string | null;
     accessToken: string;
     refreshToken: string;
+    accessTokenExpires: number;
+    error?: 'RefreshAccessTokenError';
   }
 }

public/icons/heart-filled.svg

@@ -25,11 +25,12 @@ export async function addToCart(data: CartCreateRequest) {
     await api.post<CartResponse, CartCreateRequest>('/carts', data);
     revalidatePath('/cart');
     return { success: true, message: '장바구니에 상품을 담았습니다.' };
-  } catch (error: any) {
+  } catch (error) {
     console.error('장바구니 담기 실패:', error);
     return {
       success: false,
-      message: error.message || '장바구니 담기에 실패했습니다.',
+      message:
+        error instanceof Error ? error.message : '장바구니 담기에 실패했습니다.',
     };
   }
 }
@@ -40,9 +41,12 @@ export async function updateCartItem(cartId: number, data: CartUpdateRequest) {
     await api.patch(`/carts/${cartId}`, data);
     revalidatePath('/cart');
     return { success: true, message: '장바구니가 수정되었습니다.' };
-  } catch (error: any) {
+  } catch (error) {
     console.error('장바구니 수정 실패:', error);
-    return { success: false, message: error.message || '수정에 실패했습니다.' };
+    return {
+      success: false,
+      message: error instanceof Error ? error.message : '수정에 실패했습니다.',
+    };
   }
 }
 
@@ -52,9 +56,12 @@ export async function deleteCartItem(cartId: number) {
     await api.delete(`/carts/${cartId}`);
     revalidatePath('/cart');
     return { success: true, message: '상품이 삭제되었습니다.' };
-  } catch (error: any) {
+  } catch (error) {
     console.error('장바구니 삭제 실패:', error);
-    return { success: false, message: error.message || '삭제에 실패했습니다.' };
+    return {
+      success: false,
+      message: error instanceof Error ? error.message : '삭제에 실패했습니다.',
+    };
   }
 }
 
@@ -70,9 +77,12 @@ export async function deleteCartItems(cartIds: number[]) {
 
     revalidatePath('/cart');
     return { success: true, message: '선택한 상품이 삭제되었습니다.' };
-  } catch (error: any) {
+  } catch (error) {
     console.error('장바구니 일괄 삭제 실패:', error);
-    return { success: false, message: error.message || '삭제에 실패했습니다.' };
+    return {
+      success: false,
+      message: error instanceof Error ? error.message : '삭제에 실패했습니다.',
+    };
   }
 }
 

src/app/actions/cart.ts

@@ -0,0 +1,56 @@
+'use server';
+
+import { api } from '@/lib/api-client';
+import { revalidatePath } from 'next/cache';
+import {
+  OrderFromCartRequest,
+  OrderFromProductRequest,
+  OrderDetail,
+} from '@/types/domain/order';
+
+export async function createOrderFromCart(
+  data: OrderFromCartRequest,
+): Promise<number> {
+  try {
+    const orderId = await api.post<number, OrderFromCartRequest>(
+      '/orders/cart',
+      data,
+    );
+    revalidatePath('/cart');
+    return orderId;
+  } catch (error) {
+    console.error('장바구니 상품 주문 실패:', error);
+    throw new Error(
+      error instanceof Error ? error.message : '장바구니 상품 주문에 실패했습니다.',
+    );
+  }
+}
+
+export async function createOrderFromProduct(
+  data: OrderFromProductRequest,
+): Promise<number> {
+  try {
+    const orderId = await api.post<number, OrderFromProductRequest>(
+      '/orders',
+      data,
+    );
+    return orderId;
+  } catch (error) {
+    console.error('상품 직접 주문 실패:', error);
+    throw new Error(
+      error instanceof Error ? error.message : '상품 직접 주문에 실패했습니다.',
+    );
+  }
+}
+
+export async function getOrderDetail(orderId: number): Promise<OrderDetail> {
+  try {
+    const orderDetail = await api.get<OrderDetail>(`/orders/${orderId}`);
+    return orderDetail;
+  } catch (error) {
+    console.error('주문 상세 조회 실패:', error);
+    throw new Error(
+      error instanceof Error ? error.message : '주문 상세 조회에 실패했습니다.',
+    );
+  }
+}

src/app/actions/order.ts

@@ -0,0 +1,56 @@
+'use server';
+
+import { revalidatePath } from 'next/cache';
+import { api } from '@/lib/api-client';
+import { WishlistItem } from '@/types/domain/wishlist';
+
+/**
+ * 찜하기 (POST)
+ */
+export async function addToWishlist(productId: number) {
+  try {
+    const data = await api.post<WishlistItem>(
+      `/wishlists/products/${productId}`,
+      {},
+    );
+
+    revalidatePath('/me');
+    revalidatePath(`/product/${productId}`);
+
+    return { success: true, data };
+  } catch (error) {
+    console.error('Add to wishlist error:', error);
+    return { success: false, error: '찜하기에 실패했습니다.' };
+  }
+}
+
+/**
+ * 찜 취소하기 (DELETE)
+ */
+export async function deleteFromWishlist(wishlistId: number) {
+  try {
+    await api.delete<string>(`/wishlists/${wishlistId}`);
+
+    revalidatePath('/me');
+
+    return { success: true, wishlistId };
+  } catch (error) {
+    console.error('Delete from wishlist error:', error);
+    return { success: false, error: '찜 취소에 실패했습니다.' };
+  }
+}
+
+/**
+ * 내 찜 목록 조회 (GET)
+ */
+export async function getMyWishlist(categoryId?: number) {
+  try {
+    const params = categoryId ? { categoryId } : undefined;
+    const data = await api.get<WishlistItem[]>('/wishlists', { params });
+
+    return data;
+  } catch (error) {
+    console.error('Get wishlist error:', error);
+    return [];
+  }
+}

src/app/actions/wishlist.ts

@@ -0,0 +1,26 @@
+import { getMyWishlist } from '@/app/actions/wishlist';
+import WishlistGrid from '@/components/wishlist/wishlist-grid';
+import MainHeader from '@/components/layout/main-header';
+import MainNavBar from '@/components/layout/main-nav-bar';
+
+export default async function WishlistPage() {
+  const wishlistItems = await getMyWishlist();
+
+  return (
+    <div className="flex min-h-screen flex-col bg-white">
+      <MainHeader />
+      <main className="mx-auto w-full max-w-screen-lg flex-grow px-4 pb-20">
+        <h1 className="mt-4 mb-6 text-2xl font-bold">
+          찜 목록
+          {wishlistItems.length > 0 && (
+            <span className="ml-2 text-lg font-normal text-gray-500">
+              {wishlistItems.length}개
+            </span>
+          )}
+        </h1>
+        <WishlistGrid items={wishlistItems} />
+      </main>
+      <MainNavBar />
+    </div>
+  );
+}