#67 로그인 관련 에러처리 로직 추가

Author: taesikk

springboot-backend/src/main/java/webChat/service/login/LoginService.java

@@ -7,7 +7,7 @@
 
 public interface LoginService {
     void logout(String authorization, String email) throws Exception;
-    GoogleOAuth checkSocialUser(String accessToken, String refreshToken, String name, String email, boolean emailVerified, String photo);
+    GoogleOAuth checkSocialUser(String accessToken, String refreshToken, String name, String email, boolean emailVerified, String photo) throws BadRequestException;
     QRLoginResponse createQRSession();
     GoogleOAuth authenticateQRSession(String sessionId, @NonNull String accessToken, @NonNull String refreshToken, @NonNull String name, @NonNull String email, boolean emailVerified, String photo) throws BadRequestException;
     QRLoginResponse getSessionStatus(String sessionId) throws BadRequestException;

springboot-backend/src/main/java/webChat/service/login/impl/LoginServiceImpl.java

@@ -43,9 +43,9 @@ public class LoginServiceImpl implements LoginService {
 
     @Transactional
     @Override
-    public GoogleOAuth checkSocialUser(@NonNull String accessToken, @NonNull String refreshToken, @NonNull String name, @NonNull String email, boolean emailVerified, String photo) {
+    public GoogleOAuth checkSocialUser(@NonNull String accessToken, @NonNull String refreshToken, @NonNull String name, @NonNull String email, boolean emailVerified, String photo) throws BadRequestException {
         if (!emailVerified) {
-            // TODO 예외처리?? :: googleOAuth.isEmailVerified() 값이 정확히 뭔지 모르겠어요ㅠㅠ
+            throw new BadRequestException("This email is not verified !!!");
         }
 
         SocialUser socialUser = socialUserRepository.findByEmail(email);
@@ -58,9 +58,7 @@ public GoogleOAuth checkSocialUser(@NonNull String accessToken, @NonNull String
         }
 
         if(decodeToken == null || !decodeToken.isEmailVerified()){
-            // TODO 예외처리??
-            log.error("google decodeToken 토큰 검증 처리 실패 !!!");
-            return null;
+            throw new BadRequestException("This account is not verified.");
         }
 
         // 계정이 없는 경우

springboot-backend/src/main/java/webChat/service/user/UserService.java

@@ -4,5 +4,5 @@
 import webChat.model.user.UserDto;
 
 public interface UserService {
-    UserDto getUserInfo(OauthRedis oauthRedis);
+    UserDto getUserInfo(OauthRedis oauthRedis) throws Exception;
 }

springboot-backend/src/main/java/webChat/service/user/impl/UserServiceImpl.java

@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.coyote.BadRequestException;
 import org.springframework.stereotype.Service;
 import webChat.entity.SocialUser;
 import webChat.model.login.OauthRedis;
@@ -18,11 +19,11 @@ public class UserServiceImpl implements UserService {
     private final SocialUserRepository socialUserRepository;
 
     @Override
-    public UserDto getUserInfo(OauthRedis oauthRedis) {
+    public UserDto getUserInfo(OauthRedis oauthRedis) throws Exception {
         Optional<SocialUser> socialUser = Optional.ofNullable(socialUserRepository.findByEmail(oauthRedis.getEmail()));
 
-        if(socialUser.isEmpty()){
-            // TODO 예외처리
+        if(socialUser == null || socialUser.isEmpty()){
+            throw new BadRequestException("Not exist user !!!");
         }
 
         return UserDto.of(socialUser.get(), oauthRedis);