Merge pull request #181 from SPACE-FOR-SPACE/fix/#179

이메일 인증 토큰 중복 에러 해결
SPACE-FOR-SPACE · Nov 27, 2024 · 0136aef · 0136aef
2 parents 08c5c0f + f67f427
commit 0136aef
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 14 deletions.
diff --git a/src/main/java/com/space/server/common/exception/GlobalExceptionHandler.java b/src/main/java/com/space/server/common/exception/GlobalExceptionHandler.java
@@ -4,6 +4,7 @@
 import com.space.server.common.exception.security.SpaceSecurityException;
 import com.space.server.common.logging.LoggingUtils;
 import com.space.server.domain.mail.exception.value.EmailVerificationStatus;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.RestControllerAdvice;
@@ -13,6 +14,11 @@
 @RestControllerAdvice
 public class GlobalExceptionHandler {
 
+
+    @Value("${server.url}")
+    private String baseUrl;
+
+
     @ExceptionHandler(SpaceException.class)
     public ResponseEntity<ErrorResponse> handleApplicationException(SpaceException exception) {
         LoggingUtils.warn(exception);
@@ -60,6 +66,7 @@ public ModelAndView handleSpaceEmailException(SpaceMailException exception) {
         }
 
         modelAndView.addObject("status", status);
+        modelAndView.addObject("baseUrl", baseUrl);
 
         return modelAndView;
     }

diff --git a/src/main/java/com/space/server/domain/auth/service/implementation/UserJoiner.java b/src/main/java/com/space/server/domain/auth/service/implementation/UserJoiner.java
@@ -55,8 +55,8 @@ public void joinProcess(JoinUserRequest joinUserRequest) {
 
         userRepository.save(user);
 
-        Item head = itemReader.findById(1L);
-        Item theme = itemReader.findById(2L);
+        Item head = itemReader.findByName("기본 머리");
+        Item theme = itemReader.findByName("기본 테마");
 
         Inventory In_head = new Inventory(head, user);
         Inventory In_theme = new Inventory(theme, user);

diff --git a/src/main/java/com/space/server/domain/item/domain/repository/ItemRepository.java b/src/main/java/com/space/server/domain/item/domain/repository/ItemRepository.java
@@ -10,4 +10,6 @@
 @Repository
 public interface ItemRepository extends JpaRepository<Item, Long> {
   List<Item> findByCategory(Category category);
+
+  Item findByName(String name);
 }
diff --git a/src/main/java/com/space/server/domain/item/service/implementation/ItemReader.java b/src/main/java/com/space/server/domain/item/service/implementation/ItemReader.java
@@ -20,6 +20,10 @@ public Item findById(Long itemId) {
         .orElseThrow(ItemNotFoundException::new);
   }
 
+  public Item findByName(String itemName) {
+    return itemRepository.findByName(itemName);
+  }
+
   public List<Item> findAll() {
     return itemRepository.findAll();
   }

diff --git a/src/main/java/com/space/server/domain/mail/domain/repository/EmailTokenRepository.java b/src/main/java/com/space/server/domain/mail/domain/repository/EmailTokenRepository.java
@@ -10,6 +10,7 @@
 public interface EmailTokenRepository extends JpaRepository<EmailToken, Long> {
     EmailToken findByToken(String token);
     EmailToken findByEmailAndIsVerifiedFalse(String email);
+    void deleteByEmail(String email);
     EmailToken findByEmailAndIsVerified(String email, boolean verified);
     void deleteByExpiryDateBefore(LocalDateTime now);
 }
diff --git a/src/main/java/com/space/server/domain/mail/presentation/EmailTokenController.java b/src/main/java/com/space/server/domain/mail/presentation/EmailTokenController.java
@@ -7,15 +7,21 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
+@Slf4j
 @RestController
 @RequiredArgsConstructor
 @Tag(name = "Email", description = "이메일 인증 API")
 public class EmailTokenController {
+
+    @Value("${server.url}")
+    private String baseUrl;
+
     private final EmailTokenService emailTokenService;
 
     @ResponseStatus(HttpStatus.OK)
@@ -33,6 +39,7 @@ public ModelAndView verifyEmail(@RequestParam String token) {
 
         ModelAndView modelAndView = new ModelAndView("verification-result");
         modelAndView.addObject("status", EmailVerificationStatus.SUCCESS.name());
+        modelAndView.addObject("baseUrl", baseUrl);
 
         return modelAndView;
     }

diff --git a/src/main/java/com/space/server/domain/mail/service/EmailTokenService.java b/src/main/java/com/space/server/domain/mail/service/EmailTokenService.java
@@ -8,12 +8,9 @@
 import com.space.server.domain.user.domain.repository.UserRepository;
 import com.space.server.domain.user.exception.UserExistedException;
 import lombok.RequiredArgsConstructor;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.time.LocalDateTime;
-
 @Service
 @RequiredArgsConstructor
 @Transactional
@@ -27,11 +24,7 @@ public void sendVerificationEmail(String email) {
             throw new UserExistedException();
         }
 
-        EmailToken existingToken =
-                emailTokenRepository.findByEmailAndIsVerifiedFalse(email);
-        if (existingToken != null) {
-            emailTokenRepository.delete(existingToken);
-        }
+        emailTokenRepository.deleteByEmail(email);
 
         EmailToken emailToken = EmailToken.builder()
                 .email(email)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
@@ -24,7 +24,7 @@ server:
   port: 8081
   serverAddress: localhost
   serverName: local_server
-  url: http://localhost:3000
+  url: http://localhost:5173
   proxy:
     url: http://localhost:8081
 

diff --git a/src/main/resources/templates/verification-result.html b/src/main/resources/templates/verification-result.html
@@ -35,10 +35,10 @@ <h2 class="text-2xl font-bold mt-4">이미 인증됨</h2>
         </div>
 
         <div class="mt-8 space-y-4">
-            <a href="http://localhost:5173" class="block w-full px-6 py-3 text-white bg-blue-600 rounded-lg hover:bg-blue-700 text-center transition-colors duration-200">
+            <a th:href="${baseUrl}" class="block w-full px-6 py-3 text-white bg-blue-600 rounded-lg hover:bg-blue-700 text-center transition-colors duration-200">
                 홈으로 돌아가기
             </a>
-            <a href="http://localhost:5173/login" class="block w-full px-6 py-3 text-blue-600 bg-white border-2 border-blue-600 rounded-lg hover:bg-blue-50 text-center transition-colors duration-200">
+            <a th:href="${baseUrl} + '/login'" class="block w-full px-6 py-3 text-blue-600 bg-white border-2 border-blue-600 rounded-lg hover:bg-blue-50 text-center transition-colors duration-200">
                 로그인하기
             </a>
         </div>