Merge pull request #51 from LearnMate-Dev/feat/#49

daeun084 · web-flow · commit 3444139ade49 · 2025-08-24T20:47:15.000+09:00
[Feat/#49] 자체 로그인 이메일 인증 기능 구현
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -56,6 +56,9 @@ dependencies {
 	// coroutine
 	implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
 	implementation("org.jetbrains.kotlinx:kotlinx-coroutines-reactor:1.7.3")
+	// email
+	implementation ("org.springframework.boot:spring-boot-starter-mail")
+	implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
 
 	compileOnly("org.projectlombok:lombok")
 	annotationProcessor("org.projectlombok:lombok")
diff --git a/src/main/kotlin/learn_mate_it/dev/common/base/BaseEntity.kt b/src/main/kotlin/learn_mate_it/dev/common/base/BaseEntity.kt
@@ -19,7 +19,7 @@ abstract class BaseEntity {
 
     @LastModifiedDate
     @Column(nullable = false)
-    private var updatedAt: LocalDateTime? = null
+    protected var updatedAt: LocalDateTime? = null
 
     fun getCreatedAtFormatted(): String {
         val formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd")
diff --git a/src/main/kotlin/learn_mate_it/dev/common/status/ErrorStatus.kt b/src/main/kotlin/learn_mate_it/dev/common/status/ErrorStatus.kt
@@ -27,17 +27,22 @@ enum class ErrorStatus (
     APPLE_LOGIN_PUB_KEY_CLIENT_ERROR(HttpStatus.BAD_REQUEST, "400", "애플 로그인을 위한 공개키 조회 중 클라이언트 오류가 발생했습니다."),
     INVALID_PASSWORD(HttpStatus.BAD_REQUEST, "400", "비밀번호가 일치하지 않습니다."),
     INVALID_PASSWORD_FORMAT(HttpStatus.BAD_REQUEST, "400", "비밀번호 형식이 올바르지 않습니다. 8자 이상 영소문자, 숫자, 특수문자를 1개 이상 포함해주세요."),
+    INVALID_EMAIL_VERIFICATION_CODE(HttpStatus.BAD_REQUEST, "400", "잘못된 이메일 인증 번호입니다."),
+    EMAIL_IS_NOT_VERIFIED(HttpStatus.BAD_REQUEST, "400", "인증이 완료되지 않은 이메일 주소입니다."),
     INVALID_ACCESS_TOKEN(HttpStatus.UNAUTHORIZED, "401", "유효하지 않은 액세스 토큰입니다."),
     INVALID_REFRESH_TOKEN(HttpStatus.UNAUTHORIZED, "401", "유효하지 않은 리프레시 토큰입니다."),
     EXPIRED_TOKEN_ERROR(HttpStatus.UNAUTHORIZED, "401", "토큰이 만료되었습니다."),
     APPLE_LOGIN_NO_MATCHING_PUB_KEY(HttpStatus.NOT_FOUND, "404", "애플 로그인을 위한 일치하는 공개키가 존재하지 않습니다."),
     NOT_FOUND_REFRESH_TOKEN(HttpStatus.NOT_FOUND, "404", "존재하지 않는 리프레시 토큰입니다."),
     NOT_FOUND_USER(HttpStatus.NOT_FOUND, "404", "존재하지 않는 유저입니다."),
+    NOT_FOUND_EMAIL_TO_VERIFICATION(HttpStatus.NOT_FOUND, "404", "해당 계정의 이메일 인증 요청 정보가 존재하지 않습니다."),
     ALREADY_ACCOUNT_EXIST(HttpStatus.CONFLICT, "409", "이미 해당 이메일로 가입한 계정이 존재합니다."),
     SOCIAL_LOGIN_USER(HttpStatus.CONFLICT, "409", "해당 이메일은 소셜 로그인으로 가입된 계정이 존재합니다. 소셜 로그인을 이용해주세요."),
+    EXPIRED_EMAIL_VERIFICATION_CODE(HttpStatus.CONFLICT, "409", "이메일 인증 번호가 만료되었습니다. 다시 시도해주세요."),
     APPLE_LOGIN_PUB_KEY_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "500", "애플 로그인을 위한 공개키 조회 중 서버 오류가 발생했습니다."),
     APPLE_LOGIN_KID_DECODE_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "500", "애플 로그인을 위한 Key ID 추출 과정에서 서버 오류가 발생했습니다."),
     APPLE_LOGIN_VERIFY_IDENTITY_TOKEN_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "500", "애플 로그인을 위한 Identity Token 검증 과정에서 오류가 발생했습니다."),
+    SEND_VERIFICATION_CODE_EMAIL_INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "500", "이메일 인증 코드 발송 중 오류가 발생했습니다."),
 
     /**
      * Course
diff --git a/src/main/kotlin/learn_mate_it/dev/common/status/SuccessStatus.kt b/src/main/kotlin/learn_mate_it/dev/common/status/SuccessStatus.kt
@@ -20,6 +20,8 @@ enum class SuccessStatus (
     USER_LOGOUT_SUCCESS(HttpStatus.OK, "200", "로그아웃이 성공적으로 완료되었습니다."),
     DELETE_USER_SUCCESS(HttpStatus.OK, "200", "회원탈퇴가 성공적으로 완료되었습니다."),
     GET_USER_PROFILE_SUCCESS(HttpStatus.OK, "200", "유저 프로필 조회가 성공적으로 완료되었습니다."),
+    SEND_EMAIL_VERIFICATION_CODE_SUCCESS(HttpStatus.OK, "200", "이메일 인증 코드 발송이 성공적으로 완료되었습니다."),
+    VERIFY_EMAIL_SUCCESS(HttpStatus.OK, "200", "이메일 인증이 성공적으로 완료되었습니다."),
 
     /**
      * Course
diff --git a/src/main/kotlin/learn_mate_it/dev/domain/auth/application/dto/request/AuthRequest.kt b/src/main/kotlin/learn_mate_it/dev/domain/auth/application/dto/request/AuthRequest.kt
@@ -33,4 +33,21 @@ data class SignInRequest(
     @field:NotBlank(message = "비밀번호는 필수입니다.")
     @field:Size(min = 8, message = "비밀번호는 최소 8자 이상이어야 합니다.")
     val password: String
+)
+
+data class EmailVerificationRequest(
+    @field:NotBlank(message = "이메일 주소는 필수입니다.")
+    @field:Email(message = "이메일 형식이 올바르지 않습니다.")
+    @field:Size(max = 30, message = "이메일은 30자를 초과할 수 없습니다.")
+    val email: String
+)
+
+data class ConfirmEmailVerificationRequest(
+    @field:NotBlank(message = "이메일 주소는 필수입니다.")
+    @field:Email(message = "이메일 형식이 올바르지 않습니다.")
+    @field:Size(max = 30, message = "이메일은 30자를 초과할 수 없습니다.")
+    val email: String,
+
+    @field:NotBlank(message = "인증 코드는 필수입니다.")
+    val code: String
 )
diff --git a/src/main/kotlin/learn_mate_it/dev/domain/auth/application/service/EmailVerificationService.kt b/src/main/kotlin/learn_mate_it/dev/domain/auth/application/service/EmailVerificationService.kt
@@ -0,0 +1,9 @@
+package learn_mate_it.dev.domain.auth.application.service
+
+interface EmailVerificationService {
+
+    fun sendVerificationCodeToEmail(email: String)
+    fun confirmEmailVerificationCode(email: String, code: String)
+    fun validateIsEmailVerified(email: String)
+
+}
diff --git a/src/main/kotlin/learn_mate_it/dev/domain/auth/application/service/impl/AuthServiceImpl.kt b/src/main/kotlin/learn_mate_it/dev/domain/auth/application/service/impl/AuthServiceImpl.kt
@@ -1,6 +1,7 @@
 package learn_mate_it.dev.domain.auth.application.service.impl
 
 import io.jsonwebtoken.Claims
+import jakarta.transaction.Transactional
 import learn_mate_it.dev.common.exception.GeneralException
 import learn_mate_it.dev.common.status.ErrorStatus
 import learn_mate_it.dev.domain.auth.application.dto.request.AppleLoginRequest
@@ -9,6 +10,7 @@ import learn_mate_it.dev.domain.auth.application.dto.request.SignUpRequest
 import learn_mate_it.dev.domain.auth.application.dto.response.TokenResponse
 import learn_mate_it.dev.domain.auth.application.service.AppleClient
 import learn_mate_it.dev.domain.auth.application.service.AuthService
+import learn_mate_it.dev.domain.auth.application.service.EmailVerificationService
 import learn_mate_it.dev.domain.auth.application.service.TokenService
 import learn_mate_it.dev.domain.auth.infra.application.dto.response.Key
 import learn_mate_it.dev.domain.auth.jwt.JwtUtil
@@ -33,15 +35,18 @@ class AuthServiceImpl(
     private val userRepository: UserRepository,
     private val passwordEncoder: PasswordEncoder,
     private val tokenService: TokenService,
+    private val emailVerificationService: EmailVerificationService,
     private val jwtUtil: JwtUtil
 ): AuthService {
 
     /**
      * Sign-Up with Email, Username, Pwd
      */
+    @Transactional
     override fun signUp(request: SignUpRequest) {
         checkEmailExist(request.email)
         checkPwdPatternIsValid(request.password)
+        emailVerificationService.validateIsEmailVerified(request.email)
 
         userRepository.save(
             User(
diff --git a/src/main/kotlin/learn_mate_it/dev/domain/auth/application/service/impl/EmailVerificationServiceImpl.kt b/src/main/kotlin/learn_mate_it/dev/domain/auth/application/service/impl/EmailVerificationServiceImpl.kt
@@ -0,0 +1,67 @@
+package learn_mate_it.dev.domain.auth.application.service.impl
+
+import jakarta.transaction.Transactional
+import learn_mate_it.dev.common.exception.GeneralException
+import learn_mate_it.dev.common.status.ErrorStatus
+import learn_mate_it.dev.domain.auth.application.service.EmailVerificationService
+import learn_mate_it.dev.domain.auth.domain.model.EmailVerification
+import learn_mate_it.dev.domain.auth.domain.repository.EmailVerificationRepository
+import learn_mate_it.dev.domain.auth.infra.application.service.EmailSendService
+import org.springframework.stereotype.Service
+
+@Service
+class EmailVerificationServiceImpl(
+    private val emailSendService: EmailSendService,
+    private val emailVerificationRepository: EmailVerificationRepository
+): EmailVerificationService {
+
+    /**
+     * Send Verification Code To Email
+     */
+    @Transactional
+    override fun sendVerificationCodeToEmail(email: String) {
+        val code = createVerificationCode()
+        val verification = emailVerificationRepository.findByEmail(email)
+            ?: EmailVerification(email, code)
+
+        verification.updateCode(code)
+        emailVerificationRepository.save(verification)
+
+        emailSendService.sendEmail(email, code)
+    }
+
+    private fun createVerificationCode() = (100000..999999).random().toString()
+
+
+    /**
+     * Verify Email Verification Code
+     */
+    @Transactional
+    override fun confirmEmailVerificationCode(email: String, code: String) {
+        val verification = getEmailVerificationByEmail(email)
+
+        if (verification.isExpired()) {
+            throw GeneralException(ErrorStatus.EXPIRED_EMAIL_VERIFICATION_CODE)
+        }
+
+        if (verification.code != code) {
+            throw GeneralException(ErrorStatus.INVALID_EMAIL_VERIFICATION_CODE)
+        }
+
+        verification.verify()
+    }
+
+    @Transactional
+    override fun validateIsEmailVerified(email: String) {
+        val verification = getEmailVerificationByEmail(email)
+        verification.ensureIsNotVerified()
+
+        emailVerificationRepository.delete(verification)
+    }
+
+    private fun getEmailVerificationByEmail(email: String): EmailVerification {
+        return emailVerificationRepository.findByEmail(email)
+            ?: throw GeneralException(ErrorStatus.NOT_FOUND_EMAIL_TO_VERIFICATION)
+    }
+
+}
diff --git a/src/main/kotlin/learn_mate_it/dev/domain/auth/domain/model/EmailVerification.kt b/src/main/kotlin/learn_mate_it/dev/domain/auth/domain/model/EmailVerification.kt
@@ -0,0 +1,46 @@
+package learn_mate_it.dev.domain.auth.domain.model
+
+import jakarta.persistence.*
+import learn_mate_it.dev.common.base.BaseEntity
+import learn_mate_it.dev.common.exception.GeneralException
+import learn_mate_it.dev.common.status.ErrorStatus
+import java.time.LocalDateTime
+
+@Entity
+data class EmailVerification(
+
+    @Column(nullable = false)
+    val email: String,
+
+    @Column(nullable = false)
+    var code: String
+
+): BaseEntity() {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    val emailVerificationId: Long = 0L
+
+    @Column(nullable = false)
+    var isVerified: Boolean = false
+
+    fun verify() {
+        this.isVerified = true
+    }
+
+    fun updateCode(code: String) {
+        this.code = code
+    }
+
+    fun isExpired(): Boolean {
+        val expirationTime = this.updatedAt!!.plusMinutes(5L)
+        return LocalDateTime.now().isAfter(expirationTime)
+    }
+
+    fun ensureIsNotVerified() {
+        if (!this.isVerified) {
+            throw GeneralException(ErrorStatus.EMAIL_IS_NOT_VERIFIED)
+        }
+    }
+
+}
diff --git a/src/main/kotlin/learn_mate_it/dev/domain/auth/domain/repository/EmailVerificationRepository.kt b/src/main/kotlin/learn_mate_it/dev/domain/auth/domain/repository/EmailVerificationRepository.kt
@@ -0,0 +1,8 @@
+package learn_mate_it.dev.domain.auth.domain.repository
+
+import learn_mate_it.dev.domain.auth.domain.model.EmailVerification
+import org.springframework.data.jpa.repository.JpaRepository
+
+interface EmailVerificationRepository: JpaRepository<EmailVerification, Long> {
+    fun findByEmail(email: String): EmailVerification?
+}
diff --git a/src/main/kotlin/learn_mate_it/dev/domain/auth/infra/application/service/EmailSendService.kt b/src/main/kotlin/learn_mate_it/dev/domain/auth/infra/application/service/EmailSendService.kt
@@ -0,0 +1,47 @@
+package learn_mate_it.dev.domain.auth.infra.application.service
+
+import jakarta.mail.internet.MimeMessage
+import learn_mate_it.dev.common.exception.GeneralException
+import learn_mate_it.dev.common.status.ErrorStatus
+import org.slf4j.LoggerFactory
+import org.springframework.mail.javamail.JavaMailSender
+import org.springframework.mail.javamail.MimeMessageHelper
+import org.springframework.stereotype.Service
+import org.thymeleaf.TemplateEngine
+import org.thymeleaf.context.Context
+
+@Service
+class EmailSendService(
+    private val javaMailSender: JavaMailSender,
+    private val templateEngine: TemplateEngine
+) {
+
+    private val log = LoggerFactory.getLogger(this::class.java)
+
+    fun sendEmail(email: String, code: String) {
+        val subject = "[LearnMate] 이메일 인증 코드"
+
+        try {
+            val mimeMessage: MimeMessage = javaMailSender.createMimeMessage()
+            val mimeMessageHelper = MimeMessageHelper(mimeMessage, true, "UTF-8")
+            mimeMessageHelper.setTo(email)
+            mimeMessageHelper.setSubject(subject)
+
+            val content = setHtmlBody(code)
+            mimeMessageHelper.setText(content, true)
+
+            javaMailSender.send(mimeMessage)
+        } catch (e: Exception) {
+            log.error("[*] Sending email Code : $e")
+            throw GeneralException(ErrorStatus.SEND_VERIFICATION_CODE_EMAIL_INTERNAL_SERVER_ERROR)
+        }
+
+    }
+
+    private fun setHtmlBody(code: String): String {
+        val context = Context()
+        context.setVariable("verificationCode", code)
+        return templateEngine.process("mail/verificationEmail", context)
+    }
+
+}
diff --git a/src/main/kotlin/learn_mate_it/dev/domain/auth/presentation/AuthController.kt b/src/main/kotlin/learn_mate_it/dev/domain/auth/presentation/AuthController.kt
@@ -5,11 +5,10 @@ import jakarta.servlet.http.HttpServletRequest
 import jakarta.servlet.http.HttpServletResponse
 import jakarta.validation.Valid
 import learn_mate_it.dev.common.status.SuccessStatus
-import learn_mate_it.dev.domain.auth.application.dto.request.AppleLoginRequest
-import learn_mate_it.dev.domain.auth.application.dto.request.SignInRequest
-import learn_mate_it.dev.domain.auth.application.dto.request.SignUpRequest
+import learn_mate_it.dev.domain.auth.application.dto.request.*
 import learn_mate_it.dev.domain.auth.application.dto.response.TokenResponse
 import learn_mate_it.dev.domain.auth.application.service.AuthService
+import learn_mate_it.dev.domain.auth.application.service.EmailVerificationService
 import learn_mate_it.dev.domain.auth.application.service.TokenService
 import learn_mate_it.dev.domain.auth.handler.OAuthLoginSuccessHandler
 import org.springframework.http.ResponseEntity
@@ -24,6 +23,7 @@ import org.springframework.web.bind.annotation.RestController
 class AuthController(
     private val authService: AuthService,
     private val tokenService: TokenService,
+    private val emailVerificationService: EmailVerificationService,
     private val oAuthLoginSuccessHandler: OAuthLoginSuccessHandler
 ) {
 
@@ -72,4 +72,20 @@ class AuthController(
         return ApiResponse.success(SuccessStatus.USER_LOGOUT_SUCCESS)
     }
 
+    @PostMapping("/email")
+    fun sendEmailVerificationCode(
+        @Valid @RequestBody request: EmailVerificationRequest
+    ): ResponseEntity<ApiResponse<Nothing>> {
+        emailVerificationService.sendVerificationCodeToEmail(request.email)
+        return ApiResponse.success(SuccessStatus.SEND_EMAIL_VERIFICATION_CODE_SUCCESS)
+    }
+
+    @PostMapping("/email/confirm")
+    fun confirmEmailVerificationCode(
+        @Valid @RequestBody request: ConfirmEmailVerificationRequest
+    ): ResponseEntity<ApiResponse<Nothing>> {
+        emailVerificationService.confirmEmailVerificationCode(request.email, request.code)
+        return ApiResponse.success(SuccessStatus.VERIFY_EMAIL_SUCCESS)
+    }
+
 }
diff --git a/src/main/resources/templates/mail/verificationEmail.html b/src/main/resources/templates/mail/verificationEmail.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html lang="ko">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>이메일 인증</title>
+</head>
+<body style="margin: 0; padding: 0; background-color: #f4f4f4; font-family: 'Apple SD Gothic Neo', 'Malgun Gothic', '맑은 고딕', Dotum, '돋움', sans-serif;">
+
+<table width="100%" border="0" cellspacing="0" cellpadding="0" style="background-color: #f4f4f4;">
+    <tr>
+        <td align="center">
+            <table width="600" border="0" cellspacing="0" cellpadding="0" style="max-width: 600px; margin: 20px auto; background-color: #ffffff; border-radius: 8px; box-shadow: 0 4px 10px rgba(0,0,0,0.1);">
+
+                <tr>
+                    <td style="padding: 40px 30px;">
+                        <h2 style="margin: 0 0 20px 0; font-size: 24px; font-weight: 600; color: #333333;">이메일 인증 코드를 확인해주세요.</h2>
+                        <p style="margin: 0 0 30px 0; font-size: 16px; line-height: 1.5; color: #555555;">
+                            안녕하세요! LearnMate에 가입해주셔서 감사합니다.<br>
+                            아래 인증 코드를 입력하여 이메일 인증을 완료해주세요.
+                        </p>
+
+                        <table width="100%" border="0" cellspacing="0" cellpadding="0">
+                            <tr>
+                                <td align="center" style="padding: 20px; background-color: #f9f9f9; border-radius: 4px;">
+                                    <span style="font-size: 32px; font-weight: bold; color: #FF6711; letter-spacing: 8px;" th:text="${verificationCode}"> 123456 </span>
+                                </td>
+                            </tr>
+                        </table>
+
+                        <p style="margin: 30px 0 0 0; font-size: 14px; color: #888888;">
+                            * 이 인증 코드는 5분 동안 유효합니다.<br>
+                            * 본인이 요청하지 않은 인증 메일이라면 이 메일을 무시해주세요.
+                        </p>
+                    </td>
+                </tr>
+
+                <tr>
+                    <td align="center" style="padding: 20px 30px; background-color: #fafafa; border-top: 1px solid #eeeeee;">
+                        <p style="margin: 0; font-size: 12px; color: #999999;">
+                            © 2025 LearnMate. All Rights Reserved.
+                        </p>
+                    </td>
+                </tr>
+
+            </table>
+        </td>
+    </tr>
+</table>
+
+</body>
+</html>
