Skip to content

Commit 4179c84

Browse files
author
eugenp
committed
removing password encoder new bean - using the default
1 parent 59a2a42 commit 4179c84

File tree

4 files changed

+12
-23
lines changed

4 files changed

+12
-23
lines changed

spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
import org.baeldung.persistence.model.Role;
88
import org.baeldung.persistence.model.User;
99
import org.baeldung.persistence.model.VerificationToken;
10-
import org.baeldung.security.hash.HashGenerator;
1110
import org.baeldung.validation.EmailExistsException;
1211
import org.springframework.beans.factory.annotation.Autowired;
12+
import org.springframework.security.crypto.password.PasswordEncoder;
1313
import org.springframework.stereotype.Service;
1414

1515
@Service
@@ -22,19 +22,20 @@ public class UserService implements IUserService {
2222
private VerificationTokenRepository tokenRepository;
2323

2424
@Autowired
25-
private HashGenerator hashGenerator;
25+
private PasswordEncoder passwordEncoder;
2626

2727
@Override
2828
public User registerNewUserAccount(UserDto accountDto) throws EmailExistsException {
2929
if (emailExist(accountDto.getEmail())) {
3030
throw new EmailExistsException("There is an account with that email adress: " + accountDto.getEmail());
3131
}
32-
User user = new User();
32+
final User user = new User();
33+
3334
user.setFirstName(accountDto.getFirstName());
3435
user.setLastName(accountDto.getLastName());
35-
String hashedPassword = hashGenerator.getHashedPassword(accountDto.getPassword());
36-
user.setPassword(hashedPassword);
36+
user.setPassword(passwordEncoder.encode(accountDto.getPassword()));
3737
user.setEmail(accountDto.getEmail());
38+
3839
user.setRole(new Role(Integer.valueOf(1), user));
3940
return repository.save(user);
4041
}

spring-security-login-and-registration/src/main/java/org/baeldung/security/hash/HashGenerator.java

Lines changed: 0 additions & 12 deletions
This file was deleted.

spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import java.util.Locale;
44

5-
import org.baeldung.security.hash.HashGenerator;
65
import org.baeldung.validation.EmailValidator;
76
import org.baeldung.validation.PasswordMatchesValidator;
87
import org.springframework.context.MessageSource;
@@ -101,9 +100,4 @@ public PasswordMatchesValidator passwordMatchesValidator() {
101100
return new PasswordMatchesValidator();
102101
}
103102

104-
@Bean
105-
public HashGenerator hashGenerator() {
106-
return new HashGenerator();
107-
}
108-
109103
}

spring-security-login-and-registration/src/main/java/org/baeldung/spring/SecSecurityConfig.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import org.springframework.context.annotation.ImportResource;
88
import org.springframework.security.core.userdetails.UserDetailsService;
99
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
10+
import org.springframework.security.crypto.password.PasswordEncoder;
1011
import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
1112

1213
@Configuration
@@ -35,4 +36,9 @@ public DaoAuthenticationProvider authProvider() {
3536
return authProvider;
3637
}
3738

39+
@Bean
40+
public PasswordEncoder passwordEncoder() {
41+
return new BCryptPasswordEncoder();
42+
}
43+
3844
}

0 commit comments

Comments
 (0)