From 4179c843b85223ab39ab656af5b8ee77143c16f3 Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Sun, 4 Jan 2015 12:56:16 +0200
Subject: [PATCH] removing password encoder new bean - using the default

---
 .../baeldung/persistence/service/UserService.java    | 11 ++++++-----
 .../org/baeldung/security/hash/HashGenerator.java    | 12 ------------
 .../src/main/java/org/baeldung/spring/MvcConfig.java |  6 ------
 .../java/org/baeldung/spring/SecSecurityConfig.java  |  6 ++++++
 4 files changed, 12 insertions(+), 23 deletions(-)
 delete mode 100644 spring-security-login-and-registration/src/main/java/org/baeldung/security/hash/HashGenerator.java

diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java
index 4b3abb0582..d6a6f33017 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserService.java
@@ -7,9 +7,9 @@ import org.baeldung.persistence.dao.VerificationTokenRepository;
 import org.baeldung.persistence.model.Role;
 import org.baeldung.persistence.model.User;
 import org.baeldung.persistence.model.VerificationToken;
-import org.baeldung.security.hash.HashGenerator;
 import org.baeldung.validation.EmailExistsException;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -22,19 +22,20 @@ public class UserService implements IUserService {
     private VerificationTokenRepository tokenRepository;
 
     @Autowired
-    private HashGenerator hashGenerator;
+    private PasswordEncoder passwordEncoder;
 
     @Override
     public User registerNewUserAccount(UserDto accountDto) throws EmailExistsException {
         if (emailExist(accountDto.getEmail())) {
             throw new EmailExistsException("There is an account with that email adress: " + accountDto.getEmail());
         }
-        User user = new User();
+        final User user = new User();
+
         user.setFirstName(accountDto.getFirstName());
         user.setLastName(accountDto.getLastName());
-        String hashedPassword = hashGenerator.getHashedPassword(accountDto.getPassword());
-        user.setPassword(hashedPassword);
+        user.setPassword(passwordEncoder.encode(accountDto.getPassword()));
         user.setEmail(accountDto.getEmail());
+
         user.setRole(new Role(Integer.valueOf(1), user));
         return repository.save(user);
     }
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/security/hash/HashGenerator.java b/spring-security-login-and-registration/src/main/java/org/baeldung/security/hash/HashGenerator.java
deleted file mode 100644
index 6032cf4108..0000000000
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/security/hash/HashGenerator.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.baeldung.security.hash;
-
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-
-public class HashGenerator {
-
-    public String getHashedPassword(String password) {
-        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
-        String hashedPassword = passwordEncoder.encode(password);
-        return hashedPassword;
-    }
-}
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java
index ce7f022c7d..b6cdd986ee 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/MvcConfig.java
@@ -2,7 +2,6 @@ package org.baeldung.spring;
 
 import java.util.Locale;
 
-import org.baeldung.security.hash.HashGenerator;
 import org.baeldung.validation.EmailValidator;
 import org.baeldung.validation.PasswordMatchesValidator;
 import org.springframework.context.MessageSource;
@@ -101,9 +100,4 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
         return new PasswordMatchesValidator();
     }
 
-    @Bean
-    public HashGenerator hashGenerator() {
-        return new HashGenerator();
-    }
-
 }
\ No newline at end of file
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/SecSecurityConfig.java b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/SecSecurityConfig.java
index 8043325b1d..9dbb2b1b8a 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/spring/SecSecurityConfig.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/spring/SecSecurityConfig.java
@@ -7,6 +7,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
 import org.springframework.security.core.userdetails.UserDetailsService;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.security.crypto.password.PasswordEncoder;
 import org.springframework.security.authentication.dao.DaoAuthenticationProvider;
 
 @Configuration
@@ -35,4 +36,9 @@ public class SecSecurityConfig {
         return authProvider;
     }
 
+    @Bean
+    public PasswordEncoder passwordEncoder() {
+        return new BCryptPasswordEncoder();
+    }
+
 }
\ No newline at end of file