Merge pull request #158 from Kusitms-28th-MeetUp-C/feature/157-user

[fix]:Main 로그인 jwt token null 에러 처리
Kusitms-28th-MeetUp-C · Nov 20, 2023 · 5a51276 · 5a51276
2 parents 7f28e9c + 8254fbf
commit 5a51276
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/MainService/src/main/java/com/kusitms/mainservice/domain/user/service/AuthService.java b/MainService/src/main/java/com/kusitms/mainservice/domain/user/service/AuthService.java
@@ -43,11 +43,10 @@ public class AuthService {
     public UserAuthResponseDto signIn(UserSignInRequestDto userSignInRequestDto, String authToken) {
         Platform platform = getEnumPlatformFromStringPlatform(userSignInRequestDto.getPlatform());
         PlatformUserInfo platformUser = getPlatformUserInfoFromRestTemplate(platform, authToken);
-        User getUser = getUserByPlatformUserInfo(platformUser, platform);
+        User getUser = saveUser(platformUser, platform);
         Boolean isFistLogin = Objects.isNull(getUser.getUserType()) ? Boolean.TRUE : Boolean.FALSE;
         TokenInfo tokenInfo = issueAccessTokenAndRefreshToken(getUser);
         updateRefreshToken(tokenInfo.getRefreshToken(), getUser);
-        saveUser(getUser);
         return UserAuthResponseDto.of(getUser, tokenInfo, isFistLogin);
     }
 
@@ -69,8 +68,9 @@ private void deleteRefreshToken(User user) {
         refreshTokenRepository.deleteById(user.getId());
     }
 
-    private void saveUser(User createdUser) {
-        userRepository.save(createdUser);
+    private User saveUser(PlatformUserInfo platformUserInfo, Platform platform) {
+        User createdUser = getUserByPlatformUserInfo(platformUserInfo, platform);
+        return userRepository.save(createdUser);
     }
 
     private void updateRefreshToken(String refreshToken, User user) {