Merge pull request #46 from codeit-moving/dev

Dev -> main  20241219 17:58

Author: WooHyunTak

package.json

@@ -9,6 +9,7 @@
     "@types/express-session": "^1.18.1",
     "@types/is-uuid": "^1.0.2",
     "@types/multer": "^1.4.12",
+    "@types/node-cron": "^3.0.11",
     "@types/passport": "^1.0.17",
     "@types/passport-jwt": "^4.0.1",
     "@types/passport-naver": "^1.0.4",
@@ -31,7 +32,9 @@
     "node-cron": "^3.0.3",
     "passport": "^0.7.0",
     "passport-custom": "^1.1.1",
+    "passport-google-oauth20": "^2.0.0",
     "passport-jwt": "^4.0.1",
+    "passport-kakao": "^1.0.1",
     "passport-local": "^1.0.0",
     "passport-naver": "^1.0.6",
     "prisma": "^5.4.2",
@@ -46,6 +49,8 @@
     "@types/dompurify": "^3.2.0",
     "@types/jest": "^29.5.14",
     "@types/node-cron": "^3.0.11",
+    "@types/passport-google-oauth20": "^2.0.16",
+    "@types/passport-kakao": "^1.0.3",
     "babel-jest": "^29.7.0",
     "jest": "^29.7.0",
     "nodemon": "^3.1.4",

prisma/schema.prisma

@@ -98,6 +98,7 @@ model MovingRequest {
   id             Int             @id @unique @default(autoincrement()) //자동증가
   service        Int //서비스 테이블의 코드값 예 ) 1
   movingDate     DateTime //이사하는 날
+  region         Int             @default(0) //지역 테이블의 코드값 예 ) 8202 
   pickupAddress  String //출발지 pickupAddress
   dropOffAddress String //도착지 dropoffAddress
   requestCount   Int             @default(0) //견적서 받은 수 예 0~5

src/app.ts

@@ -18,7 +18,8 @@ import userRouter from "./controllers/userController";
 import notificationRouter from "./controllers/notificationController";
 
 import confirmedQuoteRouter from "./controllers/confirmedQuoteController";
-import { initNotification } from "./schedules/notifications";
+import { scheduleNotification } from "./schedules/notifications";
+import { imageCleanup } from "./schedules/images";
 const app = express();
 
 //CORS 설정
@@ -60,7 +61,8 @@ app.use(passport.initialize());
 app.use(passport.session());
 
 //알림 스케줄 등록
-initNotification();
+imageCleanup();
+scheduleNotification();
 
 //라우터 모음 -> 컨트롤러
 app.use("/services", serviceRouter);

src/config/cookie.config.ts

@@ -5,22 +5,23 @@ const accessTokenOption: CookieOptions = {
   secure: true,
   sameSite: "none",
   maxAge: 1000 * 60 * 60, // 1시간
-  // path: "/",
+  path: "/",
 };
 
 const refreshTokenOption: CookieOptions = {
   httpOnly: true,
   secure: true,
   sameSite: "none",
   maxAge: 1000 * 60 * 60 * 24 * 7, // 7일
-  // path: "/auth/refresh",
+  path: "/auth/refresh",
 };
 
 const clearCookieOption: CookieOptions = {
   httpOnly: true,
-  secure: false,
-  sameSite: "lax",
+  secure: true,
+  sameSite: "none",
   maxAge: 0,
+  path: "/",
 };
 
 const sessionOption: CookieOptions = {

src/controllers/authController.ts

@@ -149,4 +149,19 @@ router.post(
   })
 );
 
+router.post(
+  "/password",
+  passport.authenticate("jwt", { session: false }),
+  asyncHandle(async (req, res, next) => {
+    try {
+      const userId = (req.user as Payload).id;
+      const { password } = req.body;
+      await authService.validatePassword(userId, password);
+      res.status(204).send();
+    } catch (error) {
+      next(error);
+    }
+  })
+);
+
 export default router;

src/controllers/customerController.ts

@@ -43,6 +43,7 @@ router.patch(
   asyncHandle(async (req, res, next) => {
     try {
       const userId = (req.user as Payload).id;
+      const customerId = (req.user as { customerId: number }).customerId;
       const profile = {
         ...req.body,
         imageUrl: req.file,
@@ -53,7 +54,7 @@ router.patch(
           ? JSON.parse(req.body.services).map(Number)
           : [],
       };
-      await customerService.updateCustomerProfile(userId, profile);
+      await customerService.updateCustomerProfile(userId, customerId, profile);
       res.status(204).send();
     } catch (error) {
       next(error);

src/controllers/moverController.ts

@@ -4,6 +4,8 @@ import express from "express";
 import checkBoolean from "../utils/checkBoolean";
 import passport from "passport";
 import { optionalJwtAuth } from "../middlewares/authMiddleware";
+import upload from "../utils/multer";
+import { Payload } from "../utils/token.utils";
 
 interface queryString {
   nextCursorId: string;
@@ -142,4 +144,62 @@ router.get(
   })
 );
 
+router.patch(
+  "/",
+  passport.authenticate("jwt", { session: false }),
+  upload.single("imageUrl"),
+  asyncHandle(async (req, res, next) => {
+    try {
+      const userId = (req.user as Payload).id;
+      const moverId = (req.user as { moverId: number }).moverId;
+      const profile = {
+        ...req.body,
+        imageUrl: req.file,
+        career: parseInt(req.body.career),
+        regions: req.body.regions
+          ? JSON.parse(req.body.regions).map(Number)
+          : [],
+        services: req.body.services
+          ? JSON.parse(req.body.services).map(Number)
+          : [],
+      };
+      await moverService.updateMoverProfile(userId, moverId, profile);
+      res.status(204).send();
+    } catch (error) {
+      next(error);
+    }
+  })
+);
+
+router.post(
+  "/",
+  passport.authenticate("jwt", { session: false }),
+  upload.single("imageUrl"),
+  asyncHandle(async (req, res, next) => {
+    try {
+      const userId = (req.user as Payload).id;
+      const profile = {
+        userId: userId,
+        ...req.body,
+        career: parseInt(req.body.career),
+        imageUrl: req.file!,
+        regions: req.body.regions
+          ? Array.isArray(req.body.regions)
+            ? req.body.regions.map(Number)
+            : JSON.parse(req.body.regions).map(Number)
+          : [],
+        services: req.body.services
+          ? Array.isArray(req.body.services)
+            ? req.body.services.map(Number)
+            : JSON.parse(req.body.services).map(Number)
+          : [],
+      };
+      await moverService.createMoverProfile(profile);
+      res.status(204).send();
+    } catch (error) {
+      next(error);
+    }
+  })
+);
+
 export default router;

src/controllers/movingRequestController.ts

@@ -9,7 +9,7 @@ const router = express.Router();
 
 //이사요청 목록 조회
 router.get(
-  "/my-mover",
+  "/by-mover",
   passport.authenticate("jwt", { session: false }),
   asyncHandle(async (req, res, next) => {
     try {

src/controllers/oauthController.ts

@@ -2,20 +2,105 @@ import { Router } from "express";
 import passport from "passport";
 import cookieConfig from "../config/cookie.config";
 import createToken from "../utils/token.utils";
+import {
+  KAKAO_CALLBACK_URL,
+  KAKAO_CLIENT_ID,
+  NAVER_CLIENT_ID,
+  NAVER_REDIRECT_URI,
+} from "../env";
 
 const router = Router();
 
+// router.get(
+//   "/naver",
+//   passport.authenticate("naver", {
+//     scope: ["email"],
+//     prompt: "consent",
+//   })
+// );
+
+router.get("/naver", (req, res) => {
+  const baseURL = "https://nid.naver.com/oauth2.0/authorize";
+  const query = new URLSearchParams({
+    scope: "email",
+    response_type: "code",
+    client_id: NAVER_CLIENT_ID!,
+    redirect_uri: NAVER_REDIRECT_URI!,
+    auth_type: "reprompt",
+  });
+
+  res.redirect(`${baseURL}?${query.toString()}`);
+});
+
+router.get(
+  "/naver/callback",
+  passport.authenticate("naver", { failureRedirect: "/login" }),
+  (req, res) => {
+    if (!req.user) {
+      return res.redirect("/login");
+    }
+    const user = req.user as any;
+
+    const accessToken = createToken(user, "access");
+    const refreshToken = createToken(user, "refresh");
+
+    res.cookie("accessToken", accessToken, cookieConfig.accessTokenOption);
+    res.cookie("refreshToken", refreshToken, cookieConfig.refreshTokenOption);
+
+    res.redirect(process.env.FRONTEND_URL || "http://localhost:3000");
+  }
+);
+
+// router.get(
+//   "/kakao",
+//   passport.authenticate("kakao", {
+//     scope: ["account_email"],
+//   })
+// );
+
+router.get("/kakao", (req, res) => {
+  const baseURL = "https://kauth.kakao.com/oauth/authorize";
+
+  const query = new URLSearchParams({
+    client_id: KAKAO_CLIENT_ID!,
+    redirect_uri: KAKAO_CALLBACK_URL!,
+    response_type: "code",
+    scope: "account_email",
+    prompt: "login",
+  });
+
+  res.redirect(`${baseURL}?${query.toString()}`);
+});
+
 router.get(
-  "/naver",
-  passport.authenticate("naver", {
-    scope: ["email"],
-    prompt: "consent",
+  "/kakao/callback",
+  passport.authenticate("kakao", { failureRedirect: "/login" }),
+  (req, res) => {
+    if (!req.user) {
+      return res.redirect("/login");
+    }
+    const user = req.user as any;
+
+    const accessToken = createToken(user, "access");
+    const refreshToken = createToken(user, "refresh");
+
+    res.cookie("accessToken", accessToken, cookieConfig.accessTokenOption);
+    res.cookie("refreshToken", refreshToken, cookieConfig.refreshTokenOption);
+
+    res.redirect(process.env.FRONTEND_URL || "http://localhost:3000");
+  }
+);
+
+router.get(
+  "/google",
+  passport.authenticate("google", {
+    scope: ["profile", "email"],
   })
 );
 
 router.get(
-  "/naver/callback",
-  passport.authenticate("naver", { failureRedirect: "/login" }),
+  "/google/callback",
+  passport.authenticate("google", { failureRedirect: "/login" }),
   (req, res) => {
     if (!req.user) {
       return res.redirect("/login");
@@ -32,4 +117,10 @@ router.get(
   }
 );
 
+router.get("/kakao/signout", (req, res) => {
+  res.clearCookie("accessToken");
+  res.clearCookie("refreshToken");
+  res.redirect(process.env.FRONTEND_URL || "http://localhost:3000");
+});
+
 export default router;

src/env.ts

@@ -15,3 +15,9 @@ export const AWS_S3_BUCKET_NAME = process.env.AWS_S3_BUCKET_NAME;
 export const AWS_S3_REGION = process.env.AWS_S3_REGION;
 export const AWS_S3_ACCESS_KEY = process.env.AWS_S3_ACCESS_KEY;
 export const AWS_S3_SECRET_KEY = process.env.AWS_S3_SECRET_KEY;
+export const KAKAO_CLIENT_ID = process.env.KAKAO_CLIENT_ID;
+export const KAKAO_CLIENT_SECRET = process.env.KAKAO_CLIENT_SECRET;
+export const KAKAO_CALLBACK_URL = process.env.KAKAO_CALLBACK_URL;
+export const GOOGLE_CLIENT_ID = process.env.GOOGLE_CLIENT_ID;
+export const GOOGLE_CLIENT_SECRET = process.env.GOOGLE_CLIENT_SECRET;
+export const GOOGLE_CALLBACK_URL = process.env.GOOGLE_CALLBACK_URL;