review

.gitignore

@@ -38,3 +38,8 @@ out/
 
 ### Kotlin ###
 .kotlin
+
+### mac OS ###
+**/.DS_Store
+
+/src/main/resources/application-mail.yml

README.md

@@ -0,0 +1,11 @@
+# kotlin-api-server
+
+### 🔥 개요
+
+- [코틀린 스터디](https://github.com/brdm-study/atomic-kotlin-study)와 개인 학습 내용을 기반으로  
+[java-api-server](https://github.com/yoonseon12/java-api-server) 프로젝트를 코틀린으로 마이그레이션 했습니다.
+
+### 🔥 프로젝트 구현 내용 포스팅
+
+- 💡 [@TransactionEventListener의 phase 옵션을 주의해서 사용하자](https://yoonseon.tistory.com/157)
+- 💡 [스프링+코틀린에서 @Valid이 동작하지 않는 경우](https://yoonseon.tistory.com/156)

build.gradle

@@ -22,11 +22,27 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-security'
+    implementation 'org.springframework.boot:spring-boot-starter-mail'
+
+    // kotlin
     implementation 'com.fasterxml.jackson.module:jackson-module-kotlin'
     implementation 'org.jetbrains.kotlin:kotlin-reflect'
+
+    // jwt
+    implementation group: 'io.jsonwebtoken', name: 'jjwt-api', version: '0.11.5'
+    runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-impl', version: '0.11.5'
+    runtimeOnly group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.5'
+
+    // H2
     runtimeOnly 'com.h2database:h2'
+
+    // test
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
+    testImplementation 'org.springframework.security:spring-security-test'
     testImplementation 'org.jetbrains.kotlin:kotlin-test-junit5'
+    testImplementation 'org.mockito.kotlin:mockito-kotlin:4.0.0'
     testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 }
 

http/get_memberInfo.http

@@ -0,0 +1,4 @@
+GET localhost:8080/api/members/1
+x-api-version: v1
+Content-Type: application/json
+Authorization: Bearer eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJ5b29uc2VvbjNAZ21haWwuY29tIiwiYXV0aCI6IlJPTEVfVVNFUiIsImV4cCI6MTcyMTEyMzQ4MH0.3-MFaAiWwAgICiTFxej4E-BvBNjoAhVD_8s6igLl-6U1jLcxEJwv-YE0v3hmTlbegQeOcfH8WHnFMp9vvr-UKA

http/post_resetPassword.http

@@ -0,0 +1,7 @@
+POST localhost:8080/api/members/reset-password
+x-api-version: v1
+Content-Type: application/json
+
+{
+  "email": "[email protected]"
+}

http/post_signin.http

@@ -0,0 +1,8 @@
+POST localhost:8080/api/members/signin
+x-api-version: v1
+Content-Type: application/json
+
+{
+  "email": "[email protected]",
+  "password": "aa1234@@@@"
+}

http/post_signup.http

@@ -0,0 +1,9 @@
+POST localhost:8080/api/members
+x-api-version: v1
+Content-Type: application/json
+
+{
+  "nickname": "Kevin3",
+  "email": "[email protected]",
+  "password": "aa1234@@@@"
+}

src/main/kotlin/io/study/kotlinapiserver/KotlinApiServerApplication.kt

@@ -1,9 +1,11 @@
 package io.study.kotlinapiserver
 
 import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.context.properties.ConfigurationPropertiesScan
 import org.springframework.boot.runApplication
 
 @SpringBootApplication
+@ConfigurationPropertiesScan
 class KotlinApiServerApplication
 
 fun main(args: Array<String>) {

src/main/kotlin/io/study/kotlinapiserver/api/domain/member/application/MemberInfoService.kt

@@ -0,0 +1,21 @@
+package io.study.kotlinapiserver.api.domain.member.application
+
+import io.study.kotlinapiserver.api.domain.member.domain.MemberDomainService
+import io.study.kotlinapiserver.api.domain.member.domain.dto.response.MemberInfoResponse
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+
+@Service
+@Transactional
+class MemberInfoService(
+
+    private val memberDomainService: MemberDomainService,
+
+) {
+
+    @Transactional(readOnly = true)
+    fun getMemberInfo(id: Long): MemberInfoResponse {
+        return memberDomainService.getInfo(id)
+    }
+
+}

src/main/kotlin/io/study/kotlinapiserver/api/domain/member/application/MemberResetService.kt

@@ -0,0 +1,83 @@
+package io.study.kotlinapiserver.api.domain.member.application
+
+import io.study.kotlinapiserver.api.domain.member.domain.MemberDomainService
+import io.study.kotlinapiserver.api.domain.member.domain.dto.request.MemberResetPasswordRequest
+import io.study.kotlinapiserver.api.domain.member.domain.event.ResetPasswordEvent
+import io.study.kotlinapiserver.web.base.event.Events
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+import java.security.SecureRandom
+import java.util.*
+
+@Service
+@Transactional(readOnly = true)
+class MemberResetService(
+
+    private val memberDomainService: MemberDomainService,
+
+) {
+    companion object {
+        private const val VALID_CHARACTERS = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
+        private const val SPECIAL_CHARACTERS = "!@#$%^&*()\\-_=+"
+        private const val MAX_SPECIAL_CHARACTER = 3;
+        private const val MIN_LENGTH = 8;
+        private const val MAX_LENGTH = 16;
+    }
+
+    @Transactional
+    fun resetPassword(request: MemberResetPasswordRequest) {
+        val tempPassword = createTempPassword()
+
+        memberDomainService.resetPassword(MemberResetPasswordRequest(request.email, tempPassword))
+
+        /** 비밀번호 변경 메일 전송 **/
+        publishResetPasswordSuccessEmailEvent(tempPassword, request.email)
+    }
+
+    private fun createTempPassword(): String {
+        val random = SecureRandom()
+        val passwordLength = MIN_LENGTH + random.nextInt(MAX_LENGTH - MIN_LENGTH + 1)
+        val password = StringBuilder(passwordLength)
+
+        val specialCharacterLength = addSpecialCharacters(password)
+        addValidCharacters(specialCharacterLength, passwordLength, password)
+
+        return shufflePassword(password)
+    }
+
+    private fun publishResetPasswordSuccessEmailEvent(
+        password: String,
+        registeredEmail: String,
+    ) {
+        Events.raise(ResetPasswordEvent.of(password, registeredEmail))
+    }
+
+    private fun shufflePassword(password: StringBuilder): String {
+        val map = password.toList()
+        Collections.shuffle(map)
+        return map.joinToString("")
+    }
+
+    private fun addSpecialCharacters(password: StringBuilder): Int {
+        val random = SecureRandom()
+        val specialCharacterLength = random.nextInt(MAX_SPECIAL_CHARACTER) + 1
+
+        for (i in 0 until specialCharacterLength) {
+            password.append(SPECIAL_CHARACTERS[random.nextInt(SPECIAL_CHARACTERS.length)])
+        }
+
+        return specialCharacterLength
+    }
+
+    private fun addValidCharacters(
+        specialCharacterLength: Int,
+        passwordLength: Int,
+        password: StringBuilder
+    ) {
+        val random = SecureRandom()
+        for (i in specialCharacterLength until passwordLength) {
+            val index = random.nextInt(VALID_CHARACTERS.length)
+            password.append(VALID_CHARACTERS[index])
+        }
+    }
+}

src/main/kotlin/io/study/kotlinapiserver/api/domain/member/application/MemberSigninService.kt

@@ -0,0 +1,26 @@
+package io.study.kotlinapiserver.api.domain.member.application
+
+import io.study.kotlinapiserver.api.domain.member.domain.dto.request.MemberSigninRequest
+import io.study.kotlinapiserver.api.domain.member.domain.dto.response.MemberSigninResponse
+import io.study.kotlinapiserver.web.jwt.JwtProvider
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+
+@Service
+@Transactional(readOnly = true)
+class MemberSigninService(
+    private val jwtProvider: JwtProvider,
+    private val authenticationManagerBuilder: AuthenticationManagerBuilder,
+) {
+
+    fun signin(request: MemberSigninRequest): MemberSigninResponse {
+        val authenticationToken = UsernamePasswordAuthenticationToken(request.email, request.password)
+        val authentication = authenticationManagerBuilder.`object`.authenticate(authenticationToken)
+        val token = jwtProvider.createToken(authentication)
+
+        return MemberSigninResponse.of(token)
+    }
+
+}

src/main/kotlin/io/study/kotlinapiserver/api/domain/member/application/MemberSignupService.kt

@@ -0,0 +1,32 @@
+package io.study.kotlinapiserver.api.domain.member.application
+
+import io.study.kotlinapiserver.api.domain.member.domain.MemberDomainService
+import io.study.kotlinapiserver.api.domain.member.domain.dto.request.MemberSignupRequest
+import io.study.kotlinapiserver.api.domain.member.domain.dto.response.MemberSignupResponse
+import io.study.kotlinapiserver.api.domain.member.domain.event.SignupEvent
+import io.study.kotlinapiserver.web.base.event.Events
+import org.springframework.stereotype.Service
+import org.springframework.transaction.annotation.Transactional
+
+@Service
+@Transactional(readOnly = true)
+class MemberSignupService(
+    private val memberDomainService: MemberDomainService,
+) {
+
+    @Transactional
+    fun signup(command: MemberSignupRequest): MemberSignupResponse {
+        /** 회원가입 **/
+        val savedInfo = memberDomainService.register(command)
+
+        /** 이메일 전송 **/
+        publishSignupSuccessEmailEvent(savedInfo.email)
+
+        return savedInfo
+    }
+
+    private fun publishSignupSuccessEmailEvent(registeredEmail: String) {
+        Events.raise(SignupEvent.of(registeredEmail))
+    }
+
+}

src/main/kotlin/io/study/kotlinapiserver/api/domain/member/domain/MemberDomainService.kt

@@ -0,0 +1,16 @@
+package io.study.kotlinapiserver.api.domain.member.domain
+
+import io.study.kotlinapiserver.api.domain.member.domain.dto.request.MemberResetPasswordRequest
+import io.study.kotlinapiserver.api.domain.member.domain.dto.request.MemberSignupRequest
+import io.study.kotlinapiserver.api.domain.member.domain.dto.response.MemberInfoResponse
+import io.study.kotlinapiserver.api.domain.member.domain.dto.response.MemberSignupResponse
+
+interface MemberDomainService {
+
+    fun register(request: MemberSignupRequest): MemberSignupResponse
+
+    fun getInfo(id: Long): MemberInfoResponse
+
+    fun resetPassword(request: MemberResetPasswordRequest)
+
+}

src/main/kotlin/io/study/kotlinapiserver/api/domain/member/domain/MemberDomainServiceImpl.kt

@@ -0,0 +1,56 @@
+package io.study.kotlinapiserver.api.domain.member.domain
+
+import io.study.kotlinapiserver.api.domain.member.domain.dto.request.MemberResetPasswordRequest
+import io.study.kotlinapiserver.api.domain.member.domain.dto.request.MemberSignupRequest
+import io.study.kotlinapiserver.api.domain.member.domain.dto.response.MemberInfoResponse
+import io.study.kotlinapiserver.api.domain.member.domain.dto.response.MemberSignupResponse
+import io.study.kotlinapiserver.api.domain.member.domain.entity.Member
+import io.study.kotlinapiserver.api.domain.member.domain.repository.MemberQueryRepository
+import io.study.kotlinapiserver.api.domain.member.domain.repository.MemberRepository
+import io.study.kotlinapiserver.api.domain.member.domain.validation.MemberValidator
+import io.study.kotlinapiserver.web.exception.ApiException
+import io.study.kotlinapiserver.web.exception.error.MemberErrorCode
+import org.springframework.security.crypto.password.PasswordEncoder
+import org.springframework.stereotype.Component
+
+@Component
+class MemberDomainServiceImpl(
+
+    private val memberRepository: MemberRepository,
+    private val memberQueryRepository: MemberQueryRepository,
+    private val memberValidator: MemberValidator,
+    private val passwordEncoder: PasswordEncoder,
+
+) : MemberDomainService {
+
+    override fun register(request: MemberSignupRequest): MemberSignupResponse {
+        memberValidator.signinValidate(request)
+        val initBasicMember = Member.createBasicMember(request.email, request.nickname, encodePassword(request.password))
+        val savedMember = memberRepository.save(initBasicMember)
+
+        return MemberSignupResponse(savedMember.email)
+    }
+
+    override fun getInfo(id: Long): MemberInfoResponse {
+        val findMember = memberQueryRepository.findByIdWithAuthorities(id)
+            ?: throw ApiException(MemberErrorCode.NOT_FOUND_MEMBER)
+
+        return MemberInfoResponse(
+            email = findMember.email,
+            nickname = findMember.nickname,
+            roles = findMember.authorities.map { it.authority }
+        )
+    }
+
+    override fun resetPassword(request: MemberResetPasswordRequest) {
+        val findMember = memberQueryRepository.findByEmail(request.email)
+            ?: throw ApiException(MemberErrorCode.NOT_FOUND_MEMBER)
+
+        findMember.changePassword(encodePassword(request.tempPassword!!))
+    }
+
+    private fun encodePassword(password: String): String {
+        return passwordEncoder.encode(password)
+    }
+
+}

src/main/kotlin/io/study/kotlinapiserver/api/domain/member/domain/dto/request/MemberResetPasswordRequest.kt

@@ -0,0 +1,6 @@
+package io.study.kotlinapiserver.api.domain.member.domain.dto.request
+
+data class MemberResetPasswordRequest(
+    val email: String,
+    val tempPassword: String? = null,
+)

src/main/kotlin/io/study/kotlinapiserver/api/domain/member/domain/dto/request/MemberSigninRequest.kt

@@ -0,0 +1,17 @@
+package io.study.kotlinapiserver.api.domain.member.domain.dto.request
+
+import io.study.kotlinapiserver.api.domain.member.ui.dto.request.PostMemberSigninRequest
+
+data class MemberSigninRequest(
+    val email: String,
+    val password: String,
+) {
+    companion object {
+        fun of(request: PostMemberSigninRequest): MemberSigninRequest {
+            return MemberSigninRequest(
+                email = request.email,
+                password = request.password,
+            )
+        }
+    }
+}

src/main/kotlin/io/study/kotlinapiserver/api/domain/member/domain/dto/request/MemberSignupRequest.kt

@@ -0,0 +1,19 @@
+package io.study.kotlinapiserver.api.domain.member.domain.dto.request
+
+import io.study.kotlinapiserver.api.domain.member.ui.dto.request.PostMemberSignupRequest
+
+data class MemberSignupRequest(
+    val nickname: String,
+    val email: String,
+    val password: String,
+) {
+    companion object {
+        fun of(request: PostMemberSignupRequest): MemberSignupRequest {
+            return MemberSignupRequest(
+                nickname = request.nickname,
+                email = request.email,
+                password = request.password,
+            )
+        }
+    }
+}

src/main/kotlin/io/study/kotlinapiserver/api/domain/member/domain/dto/response/MemberInfoResponse.kt

@@ -0,0 +1,9 @@
+package io.study.kotlinapiserver.api.domain.member.domain.dto.response
+
+import io.study.kotlinapiserver.api.domain.member.domain.entity.authority.AuthorityType
+
+data class MemberInfoResponse(
+    val email: String,
+    val nickname: String,
+    val roles: List<AuthorityType>
+)