Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import jakarta.mail.internet.MimeMessage;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Service;
Expand All @@ -14,6 +15,7 @@
@Slf4j
@Service
@RequiredArgsConstructor
@ConditionalOnBean(JavaMailSender.class)
public class EmailService {
private final JavaMailSender mailSender;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,32 +2,40 @@

import com.back.domain.member.member.email.EmailService;
import com.back.global.exception.ServiceException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.security.SecureRandom;
import java.time.Duration;
import java.util.Optional;

@Service
@RequiredArgsConstructor
@Slf4j
public class EmailVerificationService {
private final VerificationCodeStore codeStore;
private final EmailService emailService;
private final Optional<EmailService> emailService;
private static final Duration CODE_TTL = Duration.ofMinutes(5);
private static final SecureRandom random = new SecureRandom();

public EmailVerificationService(VerificationCodeStore codeStore,
@Autowired(required = false) EmailService emailService) {
this.codeStore = codeStore;
this.emailService = Optional.ofNullable(emailService);
}

public String generateAndSendCode(String email) {
// 6자리 랜덤 코드 생성
String code = String.format("%06d", random.nextInt(1000000));

// 저장
codeStore.saveCode(email, code, CODE_TTL);

// 이메일 발송
emailService.sendVerificationCode(email, code);
// 이메일 발송 (EmailService가 있을 때만)
emailService.ifPresentOrElse(
service -> service.sendVerificationCode(email, code),
() -> log.info("EmailService not available - verification code: {}", code)
);
log.info("Generated and sent verification code for {}: {}", email, code);

return code; // 테스트용으로 반환 (실제로는 이메일로만 전송)
Expand All @@ -48,4 +56,4 @@ public void verifyCode(String email, String inputCode) {
codeStore.deleteCode(email);
log.info("Email verification successful for: {}", email);
}
}
}
5 changes: 3 additions & 2 deletions back/src/main/resources/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ spring:
username: sa
password:
driver-class-name: org.h2.Driver


autoconfigure:
exclude:
- org.springframework.boot.autoconfigure.mail.MailSenderAutoConfiguration
5 changes: 4 additions & 1 deletion back/src/main/resources/application-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,7 @@ spring:
url: jdbc:h2:mem:db_test;MODE=MySQL
username: sa
password:
driver-class-name: org.h2.Driver
driver-class-name: org.h2.Driver
autoconfigure:
exclude:
- org.springframework.boot.autoconfigure.mail.MailSenderAutoConfiguration