add :: user null 검사 로직 추가

Team-MindWay · Apr 8, 2024 · 6bb5da8 · 6bb5da8
1 parent 07e14c2
commit 6bb5da8
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/src/main/java/com/mindway/server/v2/domain/auth/service/impl/SignInServiceImpl.java b/src/main/java/com/mindway/server/v2/domain/auth/service/impl/SignInServiceImpl.java
@@ -1,6 +1,7 @@
 package com.mindway.server.v2.domain.auth.service.impl;
 
 import com.mindway.server.v2.domain.auth.RefreshToken;
+import com.mindway.server.v2.domain.auth.exception.UserNotFoundException;
 import com.mindway.server.v2.domain.auth.presentation.dto.request.SignInRequest;
 import com.mindway.server.v2.domain.auth.presentation.dto.response.TokenResponse;
 import com.mindway.server.v2.domain.auth.repository.RefreshRepository;
@@ -20,6 +21,7 @@
 import org.springframework.beans.factory.annotation.Value;
 
 import java.io.IOException;
+import java.util.Objects;
 import java.util.UUID;
 
 @RequiredArgsConstructor
@@ -52,6 +54,9 @@ public TokenResponse execute(SignInRequest signInRequest) throws GAuthException{
             User user = userRepository.findByEmail(userInfo.getEmail())
                     .orElseGet(() -> saveUser(userInfo));
 
+            if (user == null)
+                throw new UserNotFoundException();
+
             TokenResponse tokenResponse = jwtProvider.generateTokenDto(user.getId());
 
             saveRefreshToken(tokenResponse, user);
@@ -82,7 +87,6 @@ private User saveStudent(GAuthUserInfo gAuthUserInfo) {
                 .email(gAuthUserInfo.getEmail())
                 .name(gAuthUserInfo.getName())
                 .studentNum(new StudentNum(gAuthUserInfo.getGrade(), gAuthUserInfo.getClassNum(), gAuthUserInfo.getNum()))
-                .gauth_role(gAuthUserInfo.getRole())
                 .authority(Authority.ROLE_STUDENT)
                 .build();