add password validation to registering user and updating

momentum-devs · Jan 24, 2024 · 07253b6 · 07253b6
1 parent 3734790
commit 07253b6
Show file tree

Hide file tree

Showing 7 changed files with 52 additions and 17 deletions.
diff --git a/...cation/commandHandlers/user/registerUserCommandHandler/RegisterUserCommandHandlerImpl.cpp b/...cation/commandHandlers/user/registerUserCommandHandler/RegisterUserCommandHandlerImpl.cpp
@@ -11,8 +11,11 @@
 namespace server::application
 {
 RegisterUserCommandHandlerImpl::RegisterUserCommandHandlerImpl(
-    std::shared_ptr<domain::UserRepository> userRepositoryInit, std::shared_ptr<HashService> hashServiceInit)
-    : userRepository{std::move(userRepositoryInit)}, hashService{std::move(hashServiceInit)}
+    std::shared_ptr<domain::UserRepository> userRepositoryInit, std::shared_ptr<HashService> hashServiceInit,
+    std::shared_ptr<PasswordValidationService> passwordValidationServiceInit)
+    : userRepository{std::move(userRepositoryInit)},
+      hashService{std::move(hashServiceInit)},
+      passwordValidationService{std::move(passwordValidationServiceInit)}
 {
 }
 
@@ -28,6 +31,8 @@ RegisterUserCommandHandlerImpl::execute(const RegisterUserCommandHandlerPayload&
         throw errors::ResourceAlreadyExistsError{fmt::format("User with email \"{}\" already exists.", payload.email)};
     }
 
+    passwordValidationService->validate(payload.password);
+
     const auto hashedPassword = hashService->hash(payload.password);
 
     std::stringstream uuid;

diff --git a/...lication/commandHandlers/user/registerUserCommandHandler/RegisterUserCommandHandlerImpl.h b/...lication/commandHandlers/user/registerUserCommandHandler/RegisterUserCommandHandlerImpl.h
@@ -4,19 +4,22 @@
 
 #include "RegisterUserCommandHandler.h"
 #include "server/application/services/hashService/HashService.h"
+#include "server/application/services/passwordValidationService/PasswordValidationService.h"
 #include "server/domain/repositories/userRepository/UserRepository.h"
 
 namespace server::application
 {
 class RegisterUserCommandHandlerImpl : public RegisterUserCommandHandler
 {
 public:
-    RegisterUserCommandHandlerImpl(std::shared_ptr<domain::UserRepository>, std::shared_ptr<HashService>);
+    RegisterUserCommandHandlerImpl(std::shared_ptr<domain::UserRepository>, std::shared_ptr<HashService>,
+                                   std::shared_ptr<PasswordValidationService>);
 
     RegisterUserCommandHandlerResult execute(const RegisterUserCommandHandlerPayload&) const override;
 
 private:
     std::shared_ptr<domain::UserRepository> userRepository;
     std::shared_ptr<HashService> hashService;
+    std::shared_ptr<PasswordValidationService> passwordValidationService;
 };
 }
diff --git a/...andlers/user/registerUserCommandHandler/RegisterUserCommandHandlerImplIntegrationTest.cpp b/...andlers/user/registerUserCommandHandler/RegisterUserCommandHandlerImplIntegrationTest.cpp
@@ -2,8 +2,10 @@
 
 #include "faker-cxx/Internet.h"
 #include "RegisterUserCommandHandlerImpl.h"
+#include "server/application/errors/OperationNotValidError.h"
 #include "server/application/errors/ResourceAlreadyExistsError.h"
 #include "server/application/services/hashService/HashServiceImpl.h"
+#include "server/application/services/passwordValidationService/PasswordValidationServiceImpl.h"
 #include "server/infrastructure/repositories/userRepository/userMapper/UserMapperImpl.h"
 #include "server/infrastructure/repositories/userRepository/UserRepositoryImpl.h"
 #include "server/tests/factories/databaseClientTestFactory/DatabaseClientTestFactory.h"
@@ -39,14 +41,17 @@ class RegisterUserCommandImplIntegrationTest : public Test
 
     std::shared_ptr<HashService> hashService = std::make_shared<HashServiceImpl>();
 
-    RegisterUserCommandHandlerImpl registerUserCommandHandler{userRepository, hashService};
+    std::shared_ptr<PasswordValidationService> passwordValidationService =
+        std::make_shared<PasswordValidationServiceImpl>();
+
+    RegisterUserCommandHandlerImpl registerUserCommandHandler{userRepository, hashService, passwordValidationService};
 };
 
 TEST_F(RegisterUserCommandImplIntegrationTest, registerUser)
 {
     const auto email = faker::Internet::email();
-    const auto password = "password";
-    const auto expectedHashPassword = "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8";
+    const auto password = "Password123";
+    const auto expectedHashPassword = "b2e98ad6f6eb8508dd6a14cfa704bad7f05f6fb1";
     const auto nickname = faker::Internet::username();
 
     const auto [user] = registerUserCommandHandler.execute({email, password, nickname});
@@ -56,6 +61,15 @@ TEST_F(RegisterUserCommandImplIntegrationTest, registerUser)
     ASSERT_EQ(user.getNickname(), nickname);
 }
 
+TEST_F(RegisterUserCommandImplIntegrationTest, givenPasswordNotMatchingRequirements_shouldThrow)
+{
+    const auto email = faker::Internet::email();
+    const auto password = "password";
+    const auto nickname = faker::Internet::username();
+
+    ASSERT_THROW(registerUserCommandHandler.execute({email, password, nickname}), errors::OperationNotValidError);
+}
+
 TEST_F(RegisterUserCommandImplIntegrationTest, givenUserWithSameEmail_shouldThrow)
 {
     const auto user = userTestUtils.createAndPersist();

diff --git a/...pplication/commandHandlers/user/updateUserCommandHandler/UpdateUserCommandHandlerImpl.cpp b/...pplication/commandHandlers/user/updateUserCommandHandler/UpdateUserCommandHandlerImpl.cpp
@@ -1,17 +1,18 @@
 #include "UpdateUserCommandHandlerImpl.h"
 
-#include <boost/uuid/uuid_io.hpp>
-
 #include "fmt/format.h"
 #include "loguru.hpp"
 #include "server/application/errors/ResourceAlreadyExistsError.h"
 #include "server/application/errors/ResourceNotFoundError.h"
 
 namespace server::application
 {
-UpdateUserCommandHandlerImpl::UpdateUserCommandHandlerImpl(std::shared_ptr<domain::UserRepository> userRepositoryInit,
-                                                           std::shared_ptr<HashService> hashServiceInit)
-    : userRepository{std::move(userRepositoryInit)}, hashService{std::move(hashServiceInit)}
+UpdateUserCommandHandlerImpl::UpdateUserCommandHandlerImpl(
+    std::shared_ptr<domain::UserRepository> userRepositoryInit, std::shared_ptr<HashService> hashServiceInit,
+    std::shared_ptr<PasswordValidationService> passwordValidationServiceInit)
+    : userRepository{std::move(userRepositoryInit)},
+      hashService{std::move(hashServiceInit)},
+      passwordValidationService{std::move(passwordValidationServiceInit)}
 {
 }
 
@@ -34,6 +35,8 @@ UpdateUserCommandHandlerImpl::execute(const UpdateUserCommandHandlerPayload& pay
 
     if (payload.password)
     {
+        passwordValidationService->validate(*payload.password);
+
         const auto hashedPassword = hashService->hash(*payload.password);
 
         existingUser->get()->setPassword(hashedPassword);

diff --git a/.../application/commandHandlers/user/updateUserCommandHandler/UpdateUserCommandHandlerImpl.h b/.../application/commandHandlers/user/updateUserCommandHandler/UpdateUserCommandHandlerImpl.h
@@ -3,6 +3,7 @@
 #include <memory>
 
 #include "server/application/services/hashService/HashService.h"
+#include "server/application/services/passwordValidationService/PasswordValidationService.h"
 #include "server/domain/repositories/userRepository/UserRepository.h"
 #include "UpdateUserCommandHandler.h"
 
@@ -11,12 +12,14 @@ namespace server::application
 class UpdateUserCommandHandlerImpl : public UpdateUserCommandHandler
 {
 public:
-    UpdateUserCommandHandlerImpl(std::shared_ptr<domain::UserRepository>, std::shared_ptr<HashService>);
+    UpdateUserCommandHandlerImpl(std::shared_ptr<domain::UserRepository>, std::shared_ptr<HashService>,
+                                 std::shared_ptr<PasswordValidationService>);
 
     UpdateUserCommandHandlerResult execute(const UpdateUserCommandHandlerPayload&) const override;
 
 private:
     std::shared_ptr<domain::UserRepository> userRepository;
     std::shared_ptr<HashService> hashService;
+    std::shared_ptr<PasswordValidationService> passwordValidationService;
 };
 }
diff --git a/...andHandlers/user/updateUserCommandHandler/UpdateUserCommandHandlerImplIntegrationTest.cpp b/...andHandlers/user/updateUserCommandHandler/UpdateUserCommandHandlerImplIntegrationTest.cpp
@@ -4,6 +4,7 @@
 #include "faker-cxx/String.h"
 #include "server/application/errors/ResourceNotFoundError.h"
 #include "server/application/services/hashService/HashServiceImpl.h"
+#include "server/application/services/passwordValidationService/PasswordValidationServiceImpl.h"
 #include "server/infrastructure/repositories/userRepository/userMapper/UserMapperImpl.h"
 #include "server/infrastructure/repositories/userRepository/UserRepositoryImpl.h"
 #include "server/tests/factories/databaseClientTestFactory/DatabaseClientTestFactory.h"
@@ -40,7 +41,10 @@ class UpdateUserCommandImplIntegrationTest : public Test
 
     std::shared_ptr<HashServiceImpl> hashService = std::make_shared<HashServiceImpl>();
 
-    UpdateUserCommandHandlerImpl updateUserCommandHandler{userRepository, hashService};
+    std::shared_ptr<PasswordValidationService> passwordValidationService =
+        std::make_shared<PasswordValidationServiceImpl>();
+
+    UpdateUserCommandHandlerImpl updateUserCommandHandler{userRepository, hashService, passwordValidationService};
 };
 
 TEST_F(UpdateUserCommandImplIntegrationTest, updateNotExistingUser_shouldThrow)

diff --git a/apps/server/core/session/MessageRouterFactory.cpp b/apps/server/core/session/MessageRouterFactory.cpp
@@ -57,6 +57,7 @@
 #include "server/application/queryHandlers/user/findUserByEmailQueryHandler/FindUserByEmailQueryHandlerImpl.h"
 #include "server/application/queryHandlers/user/findUserQueryHandler/FindUserQueryHandlerImpl.h"
 #include "server/application/services/hashService/HashServiceImpl.h"
+#include "server/application/services/passwordValidationService/PasswordValidationServiceImpl.h"
 #include "server/infrastructure/repositories/channelInvitationRepository/channelInvitationMapper/ChannelInvitationMapperImpl.h"
 #include "server/infrastructure/repositories/channelInvitationRepository/ChannelInvitationRepositoryImpl.h"
 #include "server/infrastructure/repositories/channelRepository/channelMapper/ChannelMapperImpl.h"
@@ -106,8 +107,10 @@ std::unique_ptr<MessageRouter> MessageRouterFactory::createMessageRouter() const
     auto userGroupRepository =
         std::make_shared<server::infrastructure::UserGroupRepositoryImpl>(db, userGroupMapper, userMapper, groupMapper);
 
-    auto registerUserCommandHandler =
-        std::make_unique<server::application::RegisterUserCommandHandlerImpl>(userRepository, hashService);
+    auto passwordValidationService = std::make_shared<application::PasswordValidationServiceImpl>();
+
+    auto registerUserCommandHandler = std::make_unique<server::application::RegisterUserCommandHandlerImpl>(
+        userRepository, hashService, passwordValidationService);
 
     auto loginUserCommandHandler =
         std::make_unique<server::application::LoginUserCommandHandlerImpl>(userRepository, hashService, tokenService);
@@ -160,8 +163,8 @@ std::unique_ptr<MessageRouter> MessageRouterFactory::createMessageRouter() const
     auto getUserDataMessageHandler =
         std::make_shared<api::GetUserDataMessageHandler>(tokenService, findUserQueryHandler);
 
-    auto updateUserCommandHandler =
-        std::make_unique<server::application::UpdateUserCommandHandlerImpl>(userRepository, hashService);
+    auto updateUserCommandHandler = std::make_unique<server::application::UpdateUserCommandHandlerImpl>(
+        userRepository, hashService, passwordValidationService);
 
     auto updateUserMessageHandler =
         std::make_shared<api::UpdateUserMessageHandler>(tokenService, std::move(updateUserCommandHandler));