Merge pull request #83 from TeamHARA/fix/apple

[FIX] 에러 존재시 에러반환하게
TeamHARA · Nov 23, 2023 · fc627cb · fc627cb
2 parents df4adc8 + 0b9e25f
commit fc627cb
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/src/controller/authController.ts b/src/controller/authController.ts
@@ -130,8 +130,8 @@ 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 (err) {
-      console.log("Err", err)
+    } catch (error) {
+      next(error)
     }
   }
 

diff --git a/src/service/authService.ts b/src/service/authService.ts
@@ -3,6 +3,7 @@ import jwtHandler from "../modules/jwtHandler";
 import { ClientException } from "../common/error/exceptions/customExceptions";
 import { tokenRepository,userRepository } from "../repository";
 import worryRepository from "../repository/worryRepository";
+import tokenType from "../constants/tokenType";
 
 
 // 캐라 서비스의 로그인 함수
@@ -51,25 +52,30 @@ const serviceLogin = async (provider:string, user:any) => {
 
       // 전달받은 identityToken이 변조되지 않은 올바른 토큰인지 확인하는 과정
       const {identityToken, id, fullName} = user;
+      // console.log(identityToken,id,fullName)
       const decoded = jwt.decode(identityToken, { complete: true})
       const kid = decoded.header.kid
 
       const key = await client.getSigningKey(kid);
+
       const signingKey = key.getPublicKey();
+
+
       if(!signingKey){
         throw new ClientException("signinKey missing");
       }
 
-      const payload = jwt.verify(identityToken, signingKey);
-      if(!payload){
-        throw new ClientException("jwt verification fail");
+      try{
+        const payload = jwt.verify(identityToken, signingKey);
+        // 발급한 주체가(aud)가 우리의 서비스 id 와 일치하는지
+        // 사용자 식별 id 가 일치하는지
+        if(payload.sub !== id || payload.aud !== process.env.APPLE_CLIENT_ID){
+          throw new ClientException("invliad signIn request");
+        }
+      }catch (error: any) {
+        throw new ClientException(error.message);
       }
 
-      // 발급한 주체가(aud)가 우리의 서비스 id 와 일치하는지
-      // 사용자 식별 id 가 일치하는지
-      if(payload.sub !== id || payload.aud !== process.env.APPLE_CLIENT_ID){
-        throw new ClientException("invliad signIn request");
-      }
 
       foundUser = await userService.getUserByAppleId(id);