Merge pull request #78 from codeit-moving/dev

Dev -> release 20241227 13:47 리프레쉬 토큰 로직

Author: WooHyunTak

src/controllers/authController.ts

@@ -5,6 +5,7 @@ import cookieConfig from "../config/cookie.config";
 import createToken, { Payload } from "../utils/token.utils";
 import upload from "../utils/multer";
 import passport from "passport";
+import userService from "../services/userService";
 
 const router = Router();
 
@@ -140,7 +141,18 @@ router.post(
   asyncHandle(async (req, res, next) => {
     try {
       const user = req.user as Payload;
-      const accessToken = createToken(user, "access");
+      const userData = await userService.getUserById(user.id);
+      if (!userData) {
+        return res.status(400).send({ message: "유효하지 않은 사용자입니다." });
+      }
+      const accessToken = createToken(
+        {
+          id: userData.id,
+          customer: userData.customer,
+          mover: userData.mover,
+        },
+        "access"
+      );
       res.cookie("accessToken", accessToken, cookieConfig.accessTokenOption);
       res.status(204).send();
     } catch (error) {

src/controllers/moverController.ts

@@ -74,7 +74,6 @@ router.get(
   asyncHandle(async (req, res, next) => {
     try {
       const { moverId } = req.user as { moverId: number };
-      console.log(moverId);
       const mover = await moverService.getMover(moverId);
       return res.status(200).send(mover);
     } catch (error) {

src/repositorys/userRepository.ts

@@ -47,6 +47,21 @@ const findByEmail = (email: string) => {
   });
 };
 
+const findByUserId = (userId: number) => {
+  return prismaClient.user.findUnique({
+    where: { id: userId },
+    select: {
+      id: true,
+      customer: {
+        select: { id: true },
+      },
+      mover: {
+        select: { id: true },
+      },
+    },
+  });
+};
+
 const findById = (userId: number) => {
   return prismaClient.user.findUnique({
     where: { id: userId },
@@ -258,6 +273,7 @@ export default {
   createUser,
   getUserType,
   getCustomer,
+  findByUserId,
   getMover,
   updateUser,
   findById,

src/services/userService.ts

@@ -116,7 +116,12 @@ const getUser = async (userId: number) => {
   }
 }; //imageUrl: object 타입으로 반환하지 않고 string 타입으로 1개 반환
 
+const getUserById = async (userId: number) => {
+  return await userRepository.findByUserId(userId);
+};
+
 export default {
   updateUser,
   getUser,
+  getUserById,
 };