Merge pull request #93 from codeit-moving/release

Release -> main 20241230 11:10 SNS Callback 수정

Author: WooHyunTak

src/controllers/oauthController.ts

@@ -1,14 +1,15 @@
 import { RequestHandler, Router } from "express";
 import passport from "passport";
 import cookieConfig from "../config/cookie.config";
-import createToken from "../utils/token.utils";
+import createToken, { Payload } from "../utils/token.utils";
 import {
   FRONTEND_URL,
   KAKAO_CALLBACK_URL,
   KAKAO_CLIENT_ID,
   NAVER_CLIENT_ID,
   NAVER_REDIRECT_URI,
 } from "../env";
+import CustomError from "../utils/interfaces/customError";
 
 const router = Router();
 
@@ -90,7 +91,7 @@ const handleOAuthCallback: RequestHandler = (req, res) => {
   if (!req.user) {
     return res.redirect("/login");
   }
-  const user = req.user as any;
+  const user = req.user as Payload;
   const userType = req.query.state as string;
 
   const accessToken = createToken(user, "access");
@@ -99,21 +100,28 @@ const handleOAuthCallback: RequestHandler = (req, res) => {
   res.cookie("accessToken", accessToken, cookieConfig.accessTokenOption);
   res.cookie("refreshToken", refreshToken, cookieConfig.refreshTokenOption);
 
-  const messages: Record<string, string> = {
-    customer: "고객 프로필을 등록해주세요.",
-    mover: "기사 프로필을 등록해주세요.",
-  };
-
-  const redirectUrls: Record<string, string> = {
-    customer: "/me/profile",
-    mover: "/mover/profile",
-  };
-
-  res.status(204).send({
-    message: messages[userType] || "프로필을 등록해주세요.",
-    redirectUrl: FRONTEND_URL + redirectUrls[userType],
-    redirect: true,
-  });
+  if (user.customer?.id || user.mover?.id) {
+    res.redirect(FRONTEND_URL);
+  } else {
+    const messages: Record<string, string> = {
+      customer: "고객 프로필을 등록해주세요.",
+      mover: "기사 프로필을 등록해주세요.",
+    };
+
+    const redirectUrls: Record<string, string> = {
+      customer: "/me/profile",
+      mover: "/mover/profile",
+    };
+
+    const error: CustomError = new Error("Forbidden");
+    error.status = 403;
+    error.data = {
+      message: messages[userType] || "프로필을 등록해주세요.",
+      redirectUrl: FRONTEND_URL + redirectUrls[userType],
+      redirect: true,
+    };
+    throw error;
+  }
 };
 
 router.get(