merge: (#103) 비밀번호 변경 기능

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/ChangePasswordRequest.kt

@@ -0,0 +1,14 @@
+package team.comit.simtong.domain.user.dto
+
+/**
+ *
+ * 사용자의 비밀번호 변경 요청을 하는 ChangePasswordRequest
+ *
+ * @author Chokyunghyeon
+ * @date 2022/10/14
+ * @version 1.0.0
+ **/
+data class ChangePasswordRequest(
+    val password: String,
+    val newPassword: String
+)

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/usecase/ChangePasswordUseCase.kt

@@ -0,0 +1,41 @@
+package team.comit.simtong.domain.user.usecase
+
+import team.comit.simtong.domain.user.dto.ChangePasswordRequest
+import team.comit.simtong.domain.user.exception.DifferentPasswordException
+import team.comit.simtong.domain.user.exception.UserNotFoundException
+import team.comit.simtong.domain.user.spi.CommandUserPort
+import team.comit.simtong.domain.user.spi.QueryUserPort
+import team.comit.simtong.domain.user.spi.UserSecurityPort
+import team.comit.simtong.global.annotation.UseCase
+
+/**
+ *
+ * 사용자의 비밀번호 변경을 담당하는 ChangePasswordUseCase
+ *
+ * @author Chokyunghyeon
+ * @date 2022/10/14
+ * @version 1.0.0
+ **/
+@UseCase
+class ChangePasswordUseCase(
+    private val queryUserPort: QueryUserPort,
+    private val userSecurityPort: UserSecurityPort,
+    private val commandUserPort: CommandUserPort
+) {
+
+    fun execute(request: ChangePasswordRequest) {
+        val currentUserId = userSecurityPort.getCurrentUserId()
+        val user = queryUserPort.queryUserById(currentUserId) ?: throw UserNotFoundException.EXCEPTION
+
+        if (!userSecurityPort.compare(request.password, user.password)) {
+            throw DifferentPasswordException.EXCEPTION
+        }
+
+        commandUserPort.save(
+            user.copy(
+                password = userSecurityPort.encode(request.newPassword)
+            )
+        )
+    }
+
+}

simtong-infrastructure/src/main/kotlin/team/comit/simtong/global/security/SecurityConfig.kt

@@ -9,6 +9,7 @@ import org.springframework.security.config.http.SessionCreationPolicy
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder
 import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.security.web.SecurityFilterChain
+import team.comit.simtong.domain.user.model.Authority.ROLE_ADMIN
 import team.comit.simtong.domain.user.model.Authority.ROLE_COMMON
 import team.comit.simtong.global.filter.FilterConfig
 import team.comit.simtong.global.security.token.JwtParser
@@ -53,7 +54,8 @@ class SecurityConfig(
             // commons
             .antMatchers(HttpMethod.GET, "/commons/employee-number").permitAll()
             .antMatchers(HttpMethod.PUT, "/commons/token/reissue").permitAll()
-            .antMatchers(HttpMethod.PUT, "/commons/password").permitAll()
+            .antMatchers(HttpMethod.PUT, "/commons/password/initialization").permitAll()
+            .antMatchers(HttpMethod.PUT, "/commons/password").hasAnyRole(ROLE_COMMON.role, ROLE_ADMIN.role)
 
             // emails
             .antMatchers(HttpMethod.GET, "/emails").permitAll()

simtong-presentation/src/main/kotlin/team/comit/simtong/common/WebCommonAdapter.kt

@@ -2,15 +2,18 @@ package team.comit.simtong.common
 
 import org.springframework.http.HttpStatus
 import org.springframework.web.bind.annotation.*
+import team.comit.simtong.common.dto.request.WebChangePasswordRequest
 import team.comit.simtong.common.dto.request.WebFindEmployeeNumberRequest
+import team.comit.simtong.common.dto.request.WebResetPasswordRequest
 import team.comit.simtong.common.dto.response.WebFindEmployeeNumberResponse
 import team.comit.simtong.domain.auth.dto.TokenResponse
 import team.comit.simtong.domain.auth.usecase.ReissueTokenUseCase
+import team.comit.simtong.domain.user.dto.ChangePasswordRequest
 import team.comit.simtong.domain.user.dto.FindEmployeeNumberRequest
 import team.comit.simtong.domain.user.dto.ResetPasswordRequest
+import team.comit.simtong.domain.user.usecase.ChangePasswordUseCase
 import team.comit.simtong.domain.user.usecase.FindEmployeeNumberUseCase
 import team.comit.simtong.domain.user.usecase.ResetPasswordUseCase
-import team.comit.simtong.user.dto.request.WebResetPasswordRequest
 import javax.validation.Valid
 
 /**
@@ -26,7 +29,8 @@ import javax.validation.Valid
 class WebCommonAdapter(
     private val reissueTokenUseCase: ReissueTokenUseCase,
     private val findEmployeeNumberUseCase: FindEmployeeNumberUseCase,
-    private val resetPasswordUseCase: ResetPasswordUseCase
+    private val resetPasswordUseCase: ResetPasswordUseCase,
+    private val changePasswordUseCase: ChangePasswordUseCase
 ) {
 
     @GetMapping("/employee-number")
@@ -45,7 +49,7 @@ class WebCommonAdapter(
         return reissueTokenUseCase.execute(request)
     }
 
-    @PutMapping("/password")
+    @PutMapping("/password/initialization")
     @ResponseStatus(HttpStatus.NO_CONTENT)
     fun resetPassword(@Valid @RequestBody request: WebResetPasswordRequest) {
         resetPasswordUseCase.execute(
@@ -57,4 +61,15 @@ class WebCommonAdapter(
         )
     }
 
+    @PutMapping("/password")
+    @ResponseStatus(HttpStatus.NO_CONTENT)
+    fun changePassword(@Valid @RequestBody request: WebChangePasswordRequest) {
+        changePasswordUseCase.execute(
+            ChangePasswordRequest(
+                password = request.password,
+                newPassword = request.newPassword
+            )
+        )
+    }
+
 }

simtong-presentation/src/main/kotlin/team/comit/simtong/common/dto/request/WebChangePasswordRequest.kt

@@ -0,0 +1,27 @@
+package team.comit.simtong.common.dto.request
+
+import org.hibernate.validator.constraints.Length
+import javax.validation.constraints.NotBlank
+import javax.validation.constraints.Pattern
+
+/**
+ *
+ * 비밀번호 변경을 요청하는 WebChangePasswordRequest
+ *
+ * @author Chokyunghyeon
+ * @date 2022/10/14
+ * @version 1.0.0
+ **/
+data class WebChangePasswordRequest(
+
+    @field:NotBlank
+    val password: String,
+
+    /**
+     * $ , + , - , _ , a ~ z , A ~ Z , 0 ~ 9
+     **/
+    @field:NotBlank
+    @field:Pattern(regexp = """[+\-_$\w]*""")
+    @field:Length(max = 20, min = 8)
+    val newPassword: String
+)

simtong-presentation/src/main/kotlin/team/comit/simtong/user/dto/request/WebResetPasswordRequest.kt → simtong-presentation/src/main/kotlin/team/comit/simtong/common/dto/request/WebResetPasswordRequest.kt

@@ -1,4 +1,4 @@
-package team.comit.simtong.user.dto.request
+package team.comit.simtong.common.dto.request
 
 import org.hibernate.validator.constraints.Length
 import javax.validation.constraints.Email