From 78bf9c6e085737d09cc616ca1b62f0cf7040f39e Mon Sep 17 00:00:00 2001
From: "good0619@naver.com" <32181771@dankook.ac.kr>
Date: Sun, 13 Aug 2023 05:58:38 +0900
Subject: [PATCH] feat : apply feedback

---
 src/main/java/se/ton/t210/T210Application.java           | 2 +-
 src/main/java/se/ton/t210/cache/EmailAuthMailCache.java  | 5 +++--
 .../java/se/ton/t210/controller/MemberController.java    | 1 +
 src/main/java/se/ton/t210/service/AuthService.java       | 0
 src/main/java/se/ton/t210/service/MemberService.java     | 7 +++++--
 .../java/se/ton/t210/service/token/TokenService.java     | 9 ++-------
 6 files changed, 12 insertions(+), 12 deletions(-)
 delete mode 100644 src/main/java/se/ton/t210/service/AuthService.java

diff --git a/src/main/java/se/ton/t210/T210Application.java b/src/main/java/se/ton/t210/T210Application.java
index 9163deb..aa63b39 100644
--- a/src/main/java/se/ton/t210/T210Application.java
+++ b/src/main/java/se/ton/t210/T210Application.java
@@ -10,7 +10,7 @@ public class T210Application {
 
     public static void main(String[] args) {
         SpringApplication app = new SpringApplication(T210Application.class);
-        app.setAdditionalProfiles("prod");
+        app.setAdditionalProfiles("dev");
         app.run(args);
     }
 }
diff --git a/src/main/java/se/ton/t210/cache/EmailAuthMailCache.java b/src/main/java/se/ton/t210/cache/EmailAuthMailCache.java
index d868aee..4821aaf 100644
--- a/src/main/java/se/ton/t210/cache/EmailAuthMailCache.java
+++ b/src/main/java/se/ton/t210/cache/EmailAuthMailCache.java
@@ -13,10 +13,11 @@ public class EmailAuthMailCache {
     @Id
     private final String email;
     private final String authCode;
-    private final LocalTime createdTime = LocalTime.now();
+    private final LocalTime createdTime;
 
-    public EmailAuthMailCache(String email, String authCode) {
+    public EmailAuthMailCache(String email, String authCode, LocalTime createdTime) {
         this.email = email;
         this.authCode = authCode;
+        this.createdTime = createdTime;
     }
 }
diff --git a/src/main/java/se/ton/t210/controller/MemberController.java b/src/main/java/se/ton/t210/controller/MemberController.java
index 68b9a43..3cc38e0 100644
--- a/src/main/java/se/ton/t210/controller/MemberController.java
+++ b/src/main/java/se/ton/t210/controller/MemberController.java
@@ -22,6 +22,7 @@ public MemberController(MemberService memberService) {
     public ResponseEntity<Void> signUp(@RequestBody @Valid SignUpRequest request,
                                        @CookieValue String emailAuthToken,
                                        HttpServletResponse response) {
+        System.out.println(emailAuthToken);
         request.validateSignUpRequest();
         memberService.signUp(request, emailAuthToken, response);
         return ResponseEntity.ok().build();
diff --git a/src/main/java/se/ton/t210/service/AuthService.java b/src/main/java/se/ton/t210/service/AuthService.java
deleted file mode 100644
index e69de29..0000000
diff --git a/src/main/java/se/ton/t210/service/MemberService.java b/src/main/java/se/ton/t210/service/MemberService.java
index 01bb9ab..fc99567 100644
--- a/src/main/java/se/ton/t210/service/MemberService.java
+++ b/src/main/java/se/ton/t210/service/MemberService.java
@@ -28,6 +28,9 @@
 @Service
 public class MemberService {
 
+    @Value("${auth.jwt.payload.key:email}")
+    private String tokenKey;
+
     @Value("${auth.jwt.token.access.cookie.key:accessToken}")
     private String accessTokenCookieKey;
 
@@ -62,7 +65,7 @@ public void signUp(SignUpRequest request, String emailAuthToken, HttpServletResp
         if (memberRepository.existsByEmail(request.getEmail())) {
             throw new AuthException(HttpStatus.CONFLICT, "Email is already exists");
         }
-        final String emailFromToken = tokenSecret.getPayloadValue(emailAuthTokenCookieKey, emailAuthToken);
+        final String emailFromToken = tokenSecret.getPayloadValue(tokenKey, emailAuthToken);
         if (!request.getEmail().equals(emailFromToken)) {
             throw new AuthException(HttpStatus.FORBIDDEN, "It is different from the previous email information you entered.");
         }
@@ -122,6 +125,6 @@ private void responseTokens(HttpServletResponse response, MemberTokens tokens) {
     public void sendEmailAuthMail(String userEmailAddress) {
         String emailAuthCode = AuthCodeUtils.generate(authCodeLength);
         mailServiceInterface.sendMail(userEmailAddress, new SignUpAuthMailForm(emailAuthCode));
-        emailAuthMailCacheRepository.save(new EmailAuthMailCache(userEmailAddress, emailAuthCode));
+        emailAuthMailCacheRepository.save(new EmailAuthMailCache(userEmailAddress, emailAuthCode, LocalTime.now()));
     }
 }
diff --git a/src/main/java/se/ton/t210/service/token/TokenService.java b/src/main/java/se/ton/t210/service/token/TokenService.java
index 036332b..d281ee8 100644
--- a/src/main/java/se/ton/t210/service/token/TokenService.java
+++ b/src/main/java/se/ton/t210/service/token/TokenService.java
@@ -12,6 +12,7 @@
 import se.ton.t210.exception.AuthException;
 import se.ton.t210.utils.auth.AuthCodeUtils;
 
+import java.time.LocalTime;
 import java.util.Map;
 
 @Service
@@ -31,16 +32,10 @@ public class TokenService {
 
     private final TokenSecret tokenSecret;
     private final TokenCacheRepository tokenCacheRepository;
-    private final EmailAuthMailCacheRepository emailAuthMailCacheRepository;
 
-    public TokenService(TokenSecret tokenSecret, TokenCacheRepository tokenCacheRepository, EmailAuthMailCacheRepository emailAuthMailCacheRepository) {
+    public TokenService(TokenSecret tokenSecret, TokenCacheRepository tokenCacheRepository) {
         this.tokenSecret = tokenSecret;
         this.tokenCacheRepository = tokenCacheRepository;
-        this.emailAuthMailCacheRepository = emailAuthMailCacheRepository;
-    }
-
-    public void saveEmailAuthInfoInCache(String email, String emailAuthCode) {
-        emailAuthMailCacheRepository.save(new EmailAuthMailCache(email, emailAuthCode));
     }
 
     public String issueMailToken(String email) {