From ad97ba029e4c7c5831e07b1a02ca2c4b08660eb2 Mon Sep 17 00:00:00 2001 From: Hubert Van De Walle Date: Wed, 2 Sep 2020 22:13:08 +0200 Subject: [PATCH] Fix small bug --- app/src/main/kotlin/controllers/SettingsController.kt | 2 +- domain/src/main/kotlin/DomainModule.kt | 2 +- .../main/kotlin/usecases/users/delete/DeleteUseCaseImpl.kt | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/src/main/kotlin/controllers/SettingsController.kt b/app/src/main/kotlin/controllers/SettingsController.kt index 98326d4..971c354 100644 --- a/app/src/main/kotlin/controllers/SettingsController.kt +++ b/app/src/main/kotlin/controllers/SettingsController.kt @@ -44,7 +44,7 @@ class SettingsController( } }, { - Response.redirect("/").invalidateCookie("Authorization") + Response.redirect("/").invalidateCookie("Bearer") } ) } diff --git a/domain/src/main/kotlin/DomainModule.kt b/domain/src/main/kotlin/DomainModule.kt index 6d4de57..15af5a2 100644 --- a/domain/src/main/kotlin/DomainModule.kt +++ b/domain/src/main/kotlin/DomainModule.kt @@ -21,7 +21,7 @@ import org.koin.dsl.module val domainModule = module { single { LoginUseCaseImpl(get(), get(), get()) } single { RegisterUseCaseImpl(get(), get()) } - single { DeleteUseCaseImpl(get(), get()) } + single { DeleteUseCaseImpl(get(), get(), get()) } single { UserService(get(), get(), get(), get()) } single { BcryptPasswordHash() } single { SimpleJwt(get()) } diff --git a/domain/src/main/kotlin/usecases/users/delete/DeleteUseCaseImpl.kt b/domain/src/main/kotlin/usecases/users/delete/DeleteUseCaseImpl.kt index d53bc3d..12c26e2 100644 --- a/domain/src/main/kotlin/usecases/users/delete/DeleteUseCaseImpl.kt +++ b/domain/src/main/kotlin/usecases/users/delete/DeleteUseCaseImpl.kt @@ -5,12 +5,14 @@ import arrow.core.extensions.fx import arrow.core.rightIfNotNull import be.simplenotes.domain.security.PasswordHash import be.simplenotes.domain.usecases.repositories.UserRepository +import be.simplenotes.domain.usecases.search.NoteSearcher import be.simplenotes.domain.validation.UserValidations internal class DeleteUseCaseImpl( private val userRepository: UserRepository, private val passwordHash: PasswordHash, -) : DeleteUseCase { + private val searcher: NoteSearcher, + ) : DeleteUseCase { override fun delete(form: DeleteForm) = Either.fx { val user = !UserValidations.validateDelete(form) val persistedUser = !userRepository.find(user.username).rightIfNotNull { DeleteError.Unregistered } @@ -20,5 +22,6 @@ internal class DeleteUseCaseImpl( { DeleteError.WrongPassword } ) !Either.cond(userRepository.delete(persistedUser.id), { Unit }, { DeleteError.Unregistered }) + searcher.dropIndex(persistedUser.id) } }