🔀 Redis Email Send

build.gradle

@@ -46,6 +46,7 @@ dependencies {
     // JPA & DB
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     runtimeOnly 'com.mysql:mysql-connector-j'
+    implementation 'org.springframework.boot:spring-boot-starter-data-redis'
 
     // Lombok
     compileOnly 'org.projectlombok:lombok'

src/main/java/com/mycom/socket/auth/jwt/JWTProperties.java → src/main/java/com/mycom/socket/auth/config/JWTProperties.java

@@ -1,4 +1,4 @@
-package com.mycom.socket.auth.jwt;
+package com.mycom.socket.auth.config;
 import lombok.Getter;
 import lombok.Setter;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/com/mycom/socket/auth/config/MailProperties.java

@@ -0,0 +1,22 @@
+package com.mycom.socket.auth.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "spring.mail")
+public class MailProperties {
+    private String host;
+    private int port;
+    private String protocol;
+    private String username;
+    private String password;
+    private String senderEmail;
+    private String senderName;
+    private String subject;
+    private String bodyTemplate;
+}

src/main/java/com/mycom/socket/auth/config/SecurityConfig.java

@@ -1,7 +1,6 @@
 package com.mycom.socket.auth.config;
 
 import com.mycom.socket.auth.jwt.JWTFilter;
-import com.mycom.socket.auth.jwt.JWTProperties;
 import com.mycom.socket.auth.jwt.JWTUtil;
 import com.mycom.socket.auth.service.MemberDetailsService;
 import lombok.RequiredArgsConstructor;

src/main/java/com/mycom/socket/auth/controller/AuthController.java

@@ -38,12 +38,12 @@ public void logout(HttpServletResponse response) {
         authService.logout(response);
     }
 
-    @PostMapping("/verification")
+    @PostMapping("/verify-email")
     public EmailVerificationResponse sendVerificationEmail(@Valid @RequestBody EmailRequest request) {
         return mailService.sendMail(request.email());
     }
 
-    @PostMapping("/email/verify")
+    @PostMapping("/verification-code")
     public EmailVerificationResponse verifyEmail(@Valid @RequestBody EmailVerificationRequest request) {
         return mailService.verifyCode(request.email(), request.code());
     }

src/main/java/com/mycom/socket/auth/jwt/JWTFilter.java

@@ -1,5 +1,6 @@
 package com.mycom.socket.auth.jwt;
 
+import com.mycom.socket.auth.config.JWTProperties;
 import com.mycom.socket.auth.service.MemberDetailsService;
 import jakarta.servlet.FilterChain;
 import jakarta.servlet.ServletException;

src/main/java/com/mycom/socket/auth/jwt/JWTUtil.java

@@ -1,5 +1,6 @@
 package com.mycom.socket.auth.jwt;
 
+import com.mycom.socket.auth.config.JWTProperties;
 import io.jsonwebtoken.Jwts;
 import io.jsonwebtoken.security.Keys;
 import lombok.extern.slf4j.Slf4j;

src/main/java/com/mycom/socket/auth/security/CookieUtil.java

@@ -1,6 +1,6 @@
 package com.mycom.socket.auth.security;
 
-import com.mycom.socket.auth.jwt.JWTProperties;
+import com.mycom.socket.auth.config.JWTProperties;
 import jakarta.servlet.http.Cookie;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;

src/main/java/com/mycom/socket/auth/service/MailService.java

@@ -1,43 +1,37 @@
 package com.mycom.socket.auth.service;
 
+import com.mycom.socket.auth.config.MailProperties;
 import com.mycom.socket.auth.dto.response.EmailVerificationResponse;
-import com.mycom.socket.auth.service.data.VerificationData;
 import com.mycom.socket.global.exception.BaseException;
+import com.mycom.socket.global.service.RedisService;
 import jakarta.mail.MessagingException;
 import jakarta.mail.internet.MimeMessage;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.stereotype.Service;
-import org.springframework.util.StringUtils;
 
 import java.security.SecureRandom;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
 
 @Service
 @RequiredArgsConstructor
 public class MailService {
 
     private final JavaMailSender javaMailSender;
-    private final RateLimiter rateLimiter; // 인증 번호 요청 제한
-
-    private final Map<String, VerificationData> verificationDataMap = new ConcurrentHashMap<>();
-
-    @Value("${spring.mail.username}")
-    private String senderEmail;
+    private final RedisService redisService;
+    private final MailProperties mailProperties;
 
     /**
-     * 6자리 난수 인증번호 생성
-     * SecureRandom 사용하여 보안성 향상
-     * @return 100000~999999 범위의 인증번호
+     * 6자리 인증번호 생성 (100000-999999)
      */
     private String createVerificationCode() {
         // Math.random()은 예측 가능한 난수를 생성할 수 있어 보안에 취약
         // SecureRandom은 암호학적으로 안전한 난수를 생성하므로 인증번호 생성에 더 적합
-        SecureRandom secureRandom = new SecureRandom();
-        return String.format("%06d", secureRandom.nextInt(1000000));
+        return String.format("%06d", new SecureRandom().nextInt(1000000));
+    }
+
+    public boolean isEmailVerified(String email) {
+        return redisService.isEmailVerified(email);
     }
 
     /**
@@ -48,14 +42,10 @@ private String createVerificationCode() {
     public MimeMessage createMail(String email, String verificationCode) {
         MimeMessage message = javaMailSender.createMimeMessage();
         try {
-            message.setFrom(senderEmail);
+            message.setFrom(mailProperties.getSenderEmail());
             message.setRecipients(MimeMessage.RecipientType.TO, email);
             message.setSubject("이메일 인증");
-            String body = String.format("""
-                   <h3>요청하신 인증 번호입니다.</h3>
-                   <h1>%s</h1>
-                   <h3>감사합니다.</h3>
-                   """, verificationCode);
+            String body = String.format(mailProperties.getBodyTemplate(), verificationCode);
             message.setText(body, "UTF-8", "html");
         } catch (MessagingException e) {
             throw new BaseException("이메일 생성 중 오류가 발생했습니다: " + e.getMessage(),
@@ -70,15 +60,18 @@ public MimeMessage createMail(String email, String verificationCode) {
      * @return 생성된 인증번호
      */
     public EmailVerificationResponse sendMail(String email) {
-        rateLimiter.checkRateLimit(email);
+        if (redisService.incrementCount(email) > 3) {
+            throw new BaseException("너무 많은 요청입니다. 1분 후에 다시 시도해주세요.",
+                    HttpStatus.TOO_MANY_REQUESTS);
+        }
 
         String verificationCode = createVerificationCode();
-        verificationDataMap.put(email, new VerificationData(verificationCode));
+        redisService.saveCode(email, verificationCode);
 
         MimeMessage message = createMail(email, verificationCode);
         try {
             javaMailSender.send(message);
-            return EmailVerificationResponse.of("이메일 전송 성공");
+            return EmailVerificationResponse.of("이메일 전송 성공");  // 메시지 수정
         } catch (Exception e) {
             throw new BaseException("이메일 발송 중 오류가 발생했습니다: " + e.getMessage(),
                     HttpStatus.INTERNAL_SERVER_ERROR);
@@ -93,30 +86,19 @@ public EmailVerificationResponse sendMail(String email) {
      * @return 인증번호 일치 여부
      */
     public EmailVerificationResponse verifyCode(String email, String code) {
-        validateVerificationCode(code);
-
-        VerificationData data = verificationDataMap.get(email);
-        if (data == null || data.isExpired()) {
-            throw new BaseException("인증 코드가 만료되었거나 존재하지 않습니다.", HttpStatus.BAD_REQUEST);
+        if (!code.matches("\\d{6}")) {
+            throw new BaseException("유효하지 않은 인증 코드 형식입니다.", HttpStatus.BAD_REQUEST);
         }
 
-        if (!data.code().equals(code)) {
+        try {
+            String saveCode = redisService.getCode(code);  // 인증코드 검증
+            if(!saveCode.equals(code)) {
+                throw new BaseException("인증 코드가 일치하지 않습니다.", HttpStatus.BAD_REQUEST);
+            }
+            return EmailVerificationResponse.of("이메일 인증이 완료되었습니다.");
+        } catch (Exception e) {
             throw new BaseException("인증 코드가 일치하지 않습니다.", HttpStatus.BAD_REQUEST);
         }
-
-        verificationDataMap.put(email, data.withVerified());
-        return EmailVerificationResponse.of("이메일 인증이 완료되었습니다.");
-    }
-
-    private void validateVerificationCode(String code) {
-        if (!StringUtils.hasText(code) || !code.matches("\\d{6}")) {
-            throw new BaseException("유효하지 않은 인증 코드 형식입니다.", HttpStatus.BAD_REQUEST);
-        }
-    }
-
-    public boolean isEmailVerified(String email) {
-        VerificationData data = verificationDataMap.get(email);
-        return data != null && !data.isExpired() && data.verified();
     }
 
 }

src/main/java/com/mycom/socket/global/config/RedisConfig.java

@@ -0,0 +1,43 @@
+package com.mycom.socket.global.config;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.data.redis.connection.RedisStandaloneConfiguration;
+import org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration;
+import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.repository.configuration.EnableRedisRepositories;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+import java.time.Duration;
+
+@Configuration
+@RequiredArgsConstructor
+@EnableRedisRepositories
+public class RedisConfig {
+    private final RedisProperties redisProperties;
+
+    @Bean
+    public LettuceConnectionFactory redisConnectionFactory() {
+        LettuceClientConfiguration clientConfig = LettuceClientConfiguration.builder()
+                .commandTimeout(Duration.ofSeconds(1))
+                .build();
+        RedisStandaloneConfiguration serverConfig = new RedisStandaloneConfiguration(
+                redisProperties.getHost(),
+                redisProperties.getPort()
+        );
+        return new LettuceConnectionFactory(serverConfig, clientConfig);
+    }
+
+    @Bean
+    public RedisTemplate<?, ?> redisTemplate() {
+        RedisTemplate<String, Object> redisTemplate = new RedisTemplate<>();
+        redisTemplate.setConnectionFactory(redisConnectionFactory());
+
+        redisTemplate.setKeySerializer(new StringRedisSerializer());
+        redisTemplate.setValueSerializer(new StringRedisSerializer());
+        return redisTemplate;
+    }
+
+}

src/main/java/com/mycom/socket/global/config/RedisProperties.java

@@ -0,0 +1,16 @@
+package com.mycom.socket.global.config;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "spring.data.redis")
+public class RedisProperties {
+
+    private String host;
+    private int port;
+}