fix : sns 통합회원가입시 유저 토큰 중복 생성되는 오류 수정

THT-Team · Aug 3, 2024 · 3503395 · 3503395
1 parent 3ba755e
commit 3503395
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/tht-apis/src/main/java/com/tht/thtapis/facade/user/UserJoinFacade.java b/tht-apis/src/main/java/com/tht/thtapis/facade/user/UserJoinFacade.java
@@ -69,7 +69,8 @@ public TokenDto signUp(final UserSignUpRequest request) {
 
     private TokenDto getUserSignUpResponse(User user) {
         final TokenDto tokenDto = tokenProvider.generateJWT(user);
-        userTokenService.create(user.getUserUuid(), tokenDto.accessToken());
+
+        userTokenService.generateUserToken(user.getUserUuid(), tokenDto.accessToken());
 
         return tokenDto;
     }

diff --git a/tht-apis/src/main/java/com/tht/thtapis/facade/user/UserLoginFacade.java b/tht-apis/src/main/java/com/tht/thtapis/facade/user/UserLoginFacade.java
@@ -38,7 +38,7 @@ public TokenDto login(final UserLoginRequest request) {
     private TokenDto getGenerateJWT(final User user) {
 
         final TokenDto tokenDto = tokenProvider.generateJWT(user);
-        userTokenService.findByUserUuid(user.getUserUuid()).refresh(tokenDto.accessToken());
+        userTokenService.refresh(user.getUserUuid(), tokenDto.accessToken());
 
         return tokenDto;
     }

diff --git a/tht-core/domain/src/main/java/com/tht/domain/entity/user/service/UserTokenService.java b/tht-core/domain/src/main/java/com/tht/domain/entity/user/service/UserTokenService.java
@@ -7,6 +7,8 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Optional;
+
 @Service
 @Transactional
 @RequiredArgsConstructor
@@ -27,7 +29,23 @@ public UserToken findByUserUuid(final String userUuid) {
     }
 
 
-    public void create(final String userUuid, final String accessToken) {
+
+    public void refresh(final String userUuid, final String accessToken) {
+        UserToken userToken = findByUserUuid(userUuid);
+        userToken.refresh(accessToken);
+    }
+
+    public void generateUserToken(final String userUuid, final String accessToken) {
+        final Optional<UserToken> userToken = userTokenRepository.findByUserUuid(userUuid);
+
+        if(userToken.isPresent()) {
+            userToken.get().refresh(accessToken);
+            return;
+        }
+        create(userUuid, accessToken);
+    }
+
+    private void create(final String userUuid, final String accessToken) {
         userTokenRepository.save(UserToken.create(userUuid, accessToken));
     }
 }