diff --git a/build.gradle b/build.gradle index 12368d9..9013a18 100644 --- a/build.gradle +++ b/build.gradle @@ -138,7 +138,7 @@ liquibase { url "jdbc:mysql://localhost:3306/basicSample" username "root" password "admin" - + changeLogFile "src/main/resources/config/liquibase/master.xml" defaultSchemaName "basicSample" logLevel "debug" diff --git a/src/main/java/com/springboot/rest/config/LiquibaseConfiguration.java b/src/main/java/com/springboot/rest/config/LiquibaseConfiguration.java index 1c7052f..1206417 100644 --- a/src/main/java/com/springboot/rest/config/LiquibaseConfiguration.java +++ b/src/main/java/com/springboot/rest/config/LiquibaseConfiguration.java @@ -35,6 +35,7 @@ public SpringLiquibase liquibase( LiquibaseProperties liquibaseProperties, ObjectProvider dataSource, DataSourceProperties dataSourceProperties + ) { SpringLiquibase liquibase = SpringLiquibaseUtil.createAsyncSpringLiquibase( diff --git a/src/main/java/com/springboot/rest/domain/service/UserService.java b/src/main/java/com/springboot/rest/domain/service/UserService.java index f6f10c7..eafec17 100644 --- a/src/main/java/com/springboot/rest/domain/service/UserService.java +++ b/src/main/java/com/springboot/rest/domain/service/UserService.java @@ -109,7 +109,6 @@ public User registerUser(AdminUserDTO userDTO, String password) { return userPersistencePort.save(userDTO, password); - } @Override @@ -136,7 +135,7 @@ public User createUser(AdminUserDTO userDTO) { return userPersistencePort.createUser(userDTO); } - + } /** diff --git a/src/main/java/com/springboot/rest/infrastructure/adaptor/AuthorityJPAAdaptor.java b/src/main/java/com/springboot/rest/infrastructure/adaptor/AuthorityJPAAdaptor.java index 7392633..ff0dc2a 100644 --- a/src/main/java/com/springboot/rest/infrastructure/adaptor/AuthorityJPAAdaptor.java +++ b/src/main/java/com/springboot/rest/infrastructure/adaptor/AuthorityJPAAdaptor.java @@ -13,8 +13,6 @@ @Service public class AuthorityJPAAdaptor implements AuthorityPersistencePort{ - - private final AuthorityRepository authRepository; public AuthorityJPAAdaptor(AuthorityRepository authRepository) { diff --git a/src/main/java/com/springboot/rest/rest/AccountResource.java b/src/main/java/com/springboot/rest/rest/AccountResource.java index 926d1ea..a4b74aa 100644 --- a/src/main/java/com/springboot/rest/rest/AccountResource.java +++ b/src/main/java/com/springboot/rest/rest/AccountResource.java @@ -37,7 +37,6 @@ public class AccountResource { private final UserServicePort userServicePort; - private final MailServicePort mailServicePort; private final UserMapper userMapper; @@ -67,6 +66,7 @@ public void registerAccount(@Valid @RequestBody ManagedUserVM managedUserVM) { if (isPasswordLengthInvalid(managedUserVM.getPassword())) { throw new InvalidPasswordException(); } + User user = userServicePort.registerUser(managedUserVM, managedUserVM.getPassword()); } @@ -165,7 +165,7 @@ public void changePassword(@RequestBody PasswordChangeDTO passwordChangeDto) { public void requestPasswordReset(@RequestBody String mail) { Optional user = userServicePort.requestPasswordReset(mail); if (user.isPresent()) { - log.warn("Password reset requested for existing mail"); + log.warn("Password reset requested for existing mail"); } else { log.warn("Password reset requested for non existing mail"); } diff --git a/src/main/java/com/springboot/rest/rest/UserResource.java b/src/main/java/com/springboot/rest/rest/UserResource.java index b08ba13..91735cd 100644 --- a/src/main/java/com/springboot/rest/rest/UserResource.java +++ b/src/main/java/com/springboot/rest/rest/UserResource.java @@ -79,9 +79,7 @@ public class UserResource { private String applicationName; private final UserServicePort userServicePort; - - public UserResource(UserServicePort userServicePort) { this.userServicePort = userServicePort; diff --git a/src/main/java/com/springboot/rest/security/DomainUserDetailsService.java b/src/main/java/com/springboot/rest/security/DomainUserDetailsService.java index d4efcc2..b179044 100644 --- a/src/main/java/com/springboot/rest/security/DomainUserDetailsService.java +++ b/src/main/java/com/springboot/rest/security/DomainUserDetailsService.java @@ -1,13 +1,14 @@ package com.springboot.rest.security; import java.util.List; + import java.util.Locale; import java.util.stream.Collectors; import org.hibernate.validator.internal.constraintvalidators.hv.EmailValidator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.*; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; @@ -17,7 +18,6 @@ import com.springboot.rest.domain.port.spi.UserPersistencPort; import com.springboot.rest.infrastructure.entity.User; - /** * Authenticate a user from the database. */ @@ -38,11 +38,12 @@ public UserDetails loadUserByUsername(final String login) { log.debug("Authenticating {}", login); if (new EmailValidator().isValid(login, null)) { - + return userPersistencPort .findOneWithAuthoritiesByEmailIgnoreCase(login).map(user -> createSpringSecurityUser(login, user)). orElseThrow(() -> new UsernameNotFoundException("User with email " + login + " was not found in the database")); + } String lowercaseLogin = login.toLowerCase(Locale.ENGLISH); diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index d3f4aef..8d41b02 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -35,7 +35,8 @@ spring: type: com.zaxxer.hikari.HikariDataSource url: jdbc:mysql://localhost:3306/basicSample?allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf8&useSSL=false&useLegacyDatetimeCode=false&serverTimezone=UTC&createDatabaseIfNotExist=true username: root - password: Ravikiran@123 + password: admin + hikari: poolName: Hikari auto-commit: false diff --git a/src/test/java/com/springboot/rest/rest/AccountResourceIT.java b/src/test/java/com/springboot/rest/rest/AccountResourceIT.java index 777fda2..51ca245 100644 --- a/src/test/java/com/springboot/rest/rest/AccountResourceIT.java +++ b/src/test/java/com/springboot/rest/rest/AccountResourceIT.java @@ -35,6 +35,8 @@ import java.util.HashSet; import java.util.Optional; +import javax.validation.constraints.AssertTrue; + import static com.springboot.rest.rest.AccountResourceIT.TEST_USER_LOGIN; import static org.assertj.core.api.Assertions.assertThat; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; @@ -837,4 +839,6 @@ void testFinishPasswordResetWrongKey() throws Exception { } + } + diff --git a/src/test/java/com/springboot/rest/service/MailServiceIT.java b/src/test/java/com/springboot/rest/service/MailServiceIT.java index b76587b..ac8ccba 100644 --- a/src/test/java/com/springboot/rest/service/MailServiceIT.java +++ b/src/test/java/com/springboot/rest/service/MailServiceIT.java @@ -249,4 +249,4 @@ private String getJavaLocale(String langKey) { } return javaLangKey; } -} +} \ No newline at end of file diff --git a/src/test/resources/templates/mail/testEmail.html b/src/test/resources/templates/mail/testEmail.html index a4ca16a..1fb37eb 100644 --- a/src/test/resources/templates/mail/testEmail.html +++ b/src/test/resources/templates/mail/testEmail.html @@ -1 +1,17 @@ - + + + + Neosoft + + +

Hello World! + + + + + + + +