configuration fix

VAuthenticator · Oct 25, 2024 · f90b76b · f90b76b
1 parent ea6ff16
commit f90b76b
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 44 deletions.
diff --git a/src/main/kotlin/com/vauthenticator/server/config/ChangePasswordConfig.kt b/src/main/kotlin/com/vauthenticator/server/config/ChangePasswordConfig.kt
diff --git a/...tor/server/config/PasswordPolicyConfig.kt → ...enticator/server/config/PasswordConfig.kt b/...tor/server/config/PasswordPolicyConfig.kt → ...enticator/server/config/PasswordConfig.kt
@@ -1,7 +1,12 @@
 package com.vauthenticator.server.config
 
+import com.vauthenticator.server.account.repository.AccountRepository
+import com.vauthenticator.server.events.VAuthenticatorEventsDispatcher
 import com.vauthenticator.server.password.adapter.dynamodb.DynamoPasswordHistoryRepository
 import com.vauthenticator.server.password.domain.*
+import com.vauthenticator.server.password.domain.changepassword.ChangePassword
+import com.vauthenticator.server.password.domain.changepassword.ChangePasswordEventConsumer
+import com.vauthenticator.server.password.domain.resetpassword.ResetPasswordEventConsumer
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.context.properties.ConfigurationProperties
 import org.springframework.boot.context.properties.EnableConfigurationProperties
@@ -10,9 +15,17 @@ import org.springframework.context.annotation.Configuration
 import software.amazon.awssdk.services.dynamodb.DynamoDbClient
 import java.time.Clock
 
+@EnableConfigurationProperties(PasswordGeneratorCriteria::class, PasswordPolicyConfigProp::class)
 @Configuration(proxyBeanMethods = false)
-@EnableConfigurationProperties(PasswordPolicyConfigProp::class)
-class PasswordPolicyConfig {
+class PasswordConfig {
+
+    @Bean
+    fun changePasswordEventConsumer(passwordHistoryRepository: PasswordHistoryRepository) =
+        ChangePasswordEventConsumer(passwordHistoryRepository)
+
+    @Bean
+    fun resetPasswordEventConsumer(passwordHistoryRepository: PasswordHistoryRepository) =
+        ResetPasswordEventConsumer(passwordHistoryRepository)
 
     @Bean
     fun passwordPolicy(
@@ -55,8 +68,20 @@ class PasswordPolicyConfig {
         dynamoPasswordHistoryTableName,
         dynamoDbClient
     )
-}
 
+    @Bean
+    fun changePassword(
+        eventsDispatcher: VAuthenticatorEventsDispatcher,
+        passwordPolicy: PasswordPolicy,
+        passwordEncoder: VAuthenticatorPasswordEncoder,
+        accountRepository: AccountRepository
+    ) =
+        ChangePassword(eventsDispatcher, passwordPolicy, passwordEncoder, accountRepository)
+
+    @Bean
+    fun passwordGenerator(passwordGeneratorCriteria: PasswordGeneratorCriteria) =
+        PasswordGenerator(passwordGeneratorCriteria)
+}
 
 @ConfigurationProperties(prefix = "password.policy")
 data class PasswordPolicyConfigProp(

diff --git a/src/main/kotlin/com/vauthenticator/server/config/PasswordGeneratorConfig.kt b/src/main/kotlin/com/vauthenticator/server/config/PasswordGeneratorConfig.kt
diff --git a/...rdEncoderVAuthenticatorPasswordEncoder.kt → ...ng/Argon2VAuthenticatorPasswordEncoder.kt b/...rdEncoderVAuthenticatorPasswordEncoder.kt → ...ng/Argon2VAuthenticatorPasswordEncoder.kt
@@ -3,7 +3,7 @@ package com.vauthenticator.server.password.adapter.spring
 import com.vauthenticator.server.password.domain.VAuthenticatorPasswordEncoder
 import org.springframework.security.crypto.password.PasswordEncoder
 
-class Argon2PasswordEncoderVAuthenticatorPasswordEncoder(private val passwordEncoder: PasswordEncoder) :
+class Argon2VAuthenticatorPasswordEncoder(private val passwordEncoder: PasswordEncoder) :
     VAuthenticatorPasswordEncoder {
 
     override fun encode(password: String): String = passwordEncoder.encode(password)

diff --git a/...n/com/vauthenticator/server/password/domain/changepassword/ChangePasswordEventConsumer.kt b/...n/com/vauthenticator/server/password/domain/changepassword/ChangePasswordEventConsumer.kt
@@ -7,7 +7,6 @@ import com.vauthenticator.server.password.domain.Password
 import com.vauthenticator.server.password.domain.PasswordHistoryRepository
 import org.springframework.stereotype.Service
 
-@Service
 class ChangePasswordEventConsumer(
     private val passwordHistoryRepository: PasswordHistoryRepository
 ) : EventConsumer {

diff --git a/...lin/com/vauthenticator/server/password/domain/resetpassword/ResetPasswordEventConsumer.kt b/...lin/com/vauthenticator/server/password/domain/resetpassword/ResetPasswordEventConsumer.kt
@@ -7,7 +7,6 @@ import com.vauthenticator.server.password.domain.Password
 import com.vauthenticator.server.password.domain.PasswordHistoryRepository
 import org.springframework.stereotype.Service
 
-@Service
 class ResetPasswordEventConsumer(
     private val passwordHistoryRepository: PasswordHistoryRepository
 ) : EventConsumer {