[FIX] createUser함수 호출위치 수정

TeamHARA · Oct 22, 2023 · 517904a · 517904a
1 parent d347a50
commit 517904a
Show file tree

Hide file tree

Showing 4 changed files with 40 additions and 6 deletions.
diff --git a/src/controller/authController.ts b/src/controller/authController.ts
@@ -98,12 +98,12 @@ const kakaoLogin_getAuthorizedCode = async (req: Request, res: Response, next: N
       return res.status(sc.OK).send(success(sc.OK, rm.LOGIN_SUCCESS, data.result));
 
     }catch(error:any){
-
+      console.log(error)
+
       //토큰이 유효하지 않은 경우
       if(error.response.data.msg == "this access token does not exist"){
         return res.status(sc.UNAUTHORIZED).send(fail(sc.UNAUTHORIZED, rm.INVALID_TOKEN));
       }
-      console.log(error)
       return res.status(error.response.status).send(fail(error.response.status, error.response.data.msg));
 
     }

diff --git a/src/repository/userRepository.ts b/src/repository/userRepository.ts
@@ -18,6 +18,14 @@ const findUserByKakaoId = async (KakaoId: number) => {
     });
 };
 
+const findUserByAppleId = async (AppleId: number) => {
+    return await prisma.user.findUnique({
+        where: {
+            apple_id: AppleId
+        }
+    });
+};
+
 const createUser = async(userCreateDTO:userCreateDTO) => {
     return await prisma.user.create({
         data:{
@@ -66,5 +74,6 @@ export default {
     findUserById,
     createUser,
     findUserByKakaoId,
+    findUserByAppleId,
     deleteUser
  };
diff --git a/src/service/authService.ts b/src/service/authService.ts
@@ -14,6 +14,7 @@ const serviceLogin = async (provider:string, user:any) => {
     // kakao login으로 유저 정보 갖고온 경우
     if(provider == "kakao"){
       const { id, kakao_account } = user;
+      console.log(user)
 
       foundUser = await userService.getUserByKakaoId(id);
 
@@ -34,9 +35,15 @@ const serviceLogin = async (provider:string, user:any) => {
         if(kakao_account.gender)
             userCreateDTO.gender = kakao_account.gender
 
+
+        //회원가입
+        const createdUser = await userService.createUser(userCreateDTO);
+        foundUser = createdUser
+        isNew = true
       }
     }
 
+
     // apple login
     if(provider == "apple"){
       const jwt = require("jsonwebtoken");
@@ -68,15 +75,27 @@ const serviceLogin = async (provider:string, user:any) => {
       if(payload.sub === id && payload.aud === process.env.APPLE_CLIENT_ID){
 
       }
-
+      foundUser = await userService.getUserByAppleId(id);
+      if(!foundUser){
+
+        //필수 동의만 했을 경우
+        userCreateDTO.AppleId = id;
+        // userCreateDTO.name = 
+
 
 
+         //회원가입
+         const createdUser = await userService.createUser(userCreateDTO);
+         foundUser = createdUser
+         isNew = true
+      }
 
     }
+
+    if(!foundUser){
+      throw new ClientException("로그인 및 회원가입 실패");
+    }
 
-    const createdUser = await userService.createUser(userCreateDTO);
-    foundUser = createdUser
-    isNew = true
 
 
 

diff --git a/src/service/userService.ts b/src/service/userService.ts
@@ -19,6 +19,11 @@ const getUserByKakaoId =async (KakaoId: number) => {
 
 }
 
+const getUserByAppleId =async (AppleId: number) => {
+    return await userRepository.findUserByAppleId(AppleId);
+
+}
+
 const createUser =async (userCreateDTO:userCreateDTO) => {
     const createdUser = await userRepository.createUser(userCreateDTO);
     if(!createUser)
@@ -41,6 +46,7 @@ const deleteUser = async (userId: number) => {
 export default{
     getUserById,
     getUserByKakaoId,
+    getUserByAppleId,
     createUser,
     deleteUser
 }