Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public SpringLiquibase liquibase(
LiquibaseProperties liquibaseProperties,
ObjectProvider<DataSource> dataSource,
DataSourceProperties dataSourceProperties

) {

SpringLiquibase liquibase = SpringLiquibaseUtil.createAsyncSpringLiquibase(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,6 @@ public User registerUser(AdminUserDTO userDTO, String password) {

return userPersistencePort.save(userDTO, password);


}

@Override
Expand All @@ -136,7 +135,7 @@ public User createUser(AdminUserDTO userDTO) {
return userPersistencePort.createUser(userDTO);

}

}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
@Service
public class AuthorityJPAAdaptor implements AuthorityPersistencePort{



private final AuthorityRepository authRepository;

public AuthorityJPAAdaptor(AuthorityRepository authRepository) {
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/springboot/rest/rest/AccountResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ public class AccountResource {

private final UserServicePort userServicePort;


private final MailServicePort mailServicePort;

private final UserMapper userMapper;
Expand Down Expand Up @@ -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());

}
Expand Down Expand Up @@ -165,7 +165,7 @@ public void changePassword(@RequestBody PasswordChangeDTO passwordChangeDto) {
public void requestPasswordReset(@RequestBody String mail) {
Optional<User> 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");
}
Expand Down
2 changes: 0 additions & 2 deletions src/main/java/com/springboot/rest/rest/UserResource.java
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,7 @@ public class UserResource {
private String applicationName;

private final UserServicePort userServicePort;



public UserResource(UserServicePort userServicePort) {
this.userServicePort = userServicePort;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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.
*/
Expand All @@ -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);
Expand Down
3 changes: 2 additions & 1 deletion src/main/resources/config/application-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions src/test/java/com/springboot/rest/rest/AccountResourceIT.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -837,4 +839,6 @@ void testFinishPasswordResetWrongKey() throws Exception {
}



}

Original file line number Diff line number Diff line change
Expand Up @@ -249,4 +249,4 @@ private String getJavaLocale(String langKey) {
}
return javaLangKey;
}
}
}
18 changes: 17 additions & 1 deletion src/test/resources/templates/mail/testEmail.html
Original file line number Diff line number Diff line change
@@ -1 +1,17 @@
<html xmlns:th="http://www.thymeleaf.org" th:text="|#{email.test.title}, ${baseUrl}, ${user.login}|"></html>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"

<html xmlns:th="http://www.thymeleaf.org" th:text="|#{email.test.title}, ${baseUrl}, ${user.login}|">

<HEAD>
<TITLE>Neosoft</TITLE>
</HEAD>
<BODY>
<P>Hello World!
</BODY>
</HTML>