🔧 chore: null 반환 수정 및 코드 정리

Team-Motivoo · Feb 29, 2024 · f365283 · f365283
1 parent 3f3fea8
commit f365283
Showing 1 changed file with 14 additions and 16 deletions.
diff --git a/motivoo-domain/src/main/java/sopt/org/motivoo/domain/auth/service/OauthService.java b/motivoo-domain/src/main/java/sopt/org/motivoo/domain/auth/service/OauthService.java
@@ -28,6 +28,8 @@
 import java.util.Map;
 
 import static sopt.org.motivoo.domain.auth.config.jwt.JwtTokenProvider.getAuthenticatedUser;
+import static sopt.org.motivoo.domain.user.entity.SocialPlatform.*;
+import static sopt.org.motivoo.domain.user.exception.UserExceptionType.*;
 
 @Slf4j
 @Service
@@ -47,7 +49,7 @@ public LoginResult login(OauthTokenCommand tokenRequest) {
         SocialPlatform socialPlatform = SocialPlatform.of(providerName);
         String refreshToken = jwtTokenProvider.createRefreshToken();
 
-        if(socialPlatform.equals(SocialPlatform.KAKAO)){
+        if (socialPlatform.equals(KAKAO)) {
             ClientRegistration provider = inMemoryRepository.findByRegistrationId(providerName);
 
             User user = getUserProfile(providerName, tokenRequest, provider, refreshToken);
@@ -58,12 +60,12 @@ public LoginResult login(OauthTokenCommand tokenRequest) {
             return LoginResult.of(user, accessToken, refreshToken);
         }
 
-        else if(socialPlatform.equals(SocialPlatform.APPLE)){
+        if (socialPlatform.equals(APPLE)) {
             OAuthPlatformMemberResult applePlatformMember = appleLoginService.getApplePlatformMember(tokenRequest.accessToken());
 
             List<User> userEntity = userRetriever.getUsersBySocialId(applePlatformMember.platformId());
             //처음 로그인 하거나 탈퇴한 경우 -> 회원가입
-            if(userEntity==null || isWithdrawn(userEntity)){
+            if (userEntity == null || isWithdrawn(userEntity)) {
                 saveUser(null, applePlatformMember.platformId(), socialPlatform, tokenRequest, refreshToken);
             }
 
@@ -72,7 +74,7 @@ else if(socialPlatform.equals(SocialPlatform.APPLE)){
             String accessToken = jwtTokenProvider.createAccessToken(new UserAuthentication(userEntity.get(0).getId(),null,null));
             return LoginResult.of(userEntity.get(0), accessToken, refreshToken);
         }
-        return null;
+        throw new UserException(INVALID_SOCIAL_PLATFORM);
     }
 
 
@@ -107,22 +109,18 @@ private OAuth2UserInfo getOAuth2UserInfo(String providerName, Map<String, Object
         if (providerName.equals("kakao")) {
             return new KakaoUserProfile(userAttributes);
         }
-        throw new UserException(UserExceptionType.INVALID_SOCIAL_PLATFORM);
+        throw new UserException(INVALID_SOCIAL_PLATFORM);
     }
 
     private SocialPlatform getSocialPlatform(String providerName) {
         try {
-            switch (providerName){
-                case "kakao":
-                    return SocialPlatform.KAKAO;
-                case "apple":
-                    return SocialPlatform.APPLE;
-                default:
-                    throw new UserException(UserExceptionType.INVALID_SOCIAL_PLATFORM);
-
-            }
-        }catch (FeignException e){
-            throw new UserException(UserExceptionType.INVALID_SOCIAL_PLATFORM);
+            return switch (providerName) {
+                case "kakao" -> KAKAO;
+                case "apple" -> APPLE;
+                default -> throw new UserException(INVALID_SOCIAL_PLATFORM);
+            };
+        } catch (FeignException e){
+            throw new UserException(INVALID_SOCIAL_PLATFORM);
         }
 
     }