From e0e6d3c79f14614f72114dc0024ed2afdc4d1982 Mon Sep 17 00:00:00 2001
From: eugenp <hanriseldon@gmail.com>
Date: Wed, 3 Dec 2014 10:37:04 +0200
Subject: [PATCH] registration logic simplifications

---
 .../persistence/service/UserService.java      | 27 ++++++++++---------
 .../security/MyUserDetailsService.java        |  8 ++----
 2 files changed, 16 insertions(+), 19 deletions(-)

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 a54867ddfc..299a3cdfcd 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
@@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
+@Transactional
 public class UserService implements IUserService {
     @Autowired
     private UserRepository repository;
@@ -19,7 +20,8 @@ public class UserService implements IUserService {
     @Autowired
     private VerificationTokenRepository tokenRepository;
 
-    @Transactional
+    // API
+
     @Override
     public User registerNewUserAccount(UserDto accountDto) throws EmailExistsException {
         if (emailExist(accountDto.getEmail())) {
@@ -34,14 +36,6 @@ public class UserService implements IUserService {
         return repository.save(user);
     }
 
-    private boolean emailExist(String email) {
-        User user = repository.findByEmail(email);
-        if (user != null) {
-            return true;
-        }
-        return false;
-    }
-
     @Override
     public User getUser(String verificationToken) {
         User user = tokenRepository.findByToken(verificationToken).getUser();
@@ -53,23 +47,30 @@ public class UserService implements IUserService {
         return tokenRepository.findByToken(VerificationToken);
     }
 
-    @Transactional
     @Override
     public void saveRegisteredUser(User user) {
         repository.save(user);
     }
 
-    @Transactional
     @Override
     public void deleteUser(User user) {
         repository.delete(user);
     }
 
-    @Transactional
     @Override
     public void createVerificationTokenForUser(User user, String token) {
         VerificationToken myToken = new VerificationToken(token, user);
         tokenRepository.save(myToken);
     }
-    
+
+    //
+
+    private boolean emailExist(String email) {
+        User user = repository.findByEmail(email);
+        if (user != null) {
+            return true;
+        }
+        return false;
+    }
+
 }
diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/security/MyUserDetailsService.java b/spring-security-login-and-registration/src/main/java/org/baeldung/security/MyUserDetailsService.java
index e75cb4fa7b..c08c47d1b2 100644
--- a/spring-security-login-and-registration/src/main/java/org/baeldung/security/MyUserDetailsService.java
+++ b/spring-security-login-and-registration/src/main/java/org/baeldung/security/MyUserDetailsService.java
@@ -47,12 +47,8 @@ public class MyUserDetailsService implements UserDetailsService {
             if (user == null) {
                 return new org.springframework.security.core.userdetails.User(" ", " ", enabled, true, true, true, getAuthorities(new Integer(1)));
             }
-            if (!user.isEnabled()) {
-                enabled = false;
-                return new org.springframework.security.core.userdetails.User(" ", " ", enabled, true, true, true, getAuthorities(new Integer(1)));
-            }
-            return new org.springframework.security.core.userdetails.User(user.getEmail(), user.getPassword().toLowerCase(), enabled, accountNonExpired, credentialsNonExpired, accountNonLocked, getAuthorities(user.getRole().getRole()));
-
+            
+            return new org.springframework.security.core.userdetails.User(user.getEmail(), user.getPassword().toLowerCase(), user.isEnabled(), accountNonExpired, credentialsNonExpired, accountNonLocked, getAuthorities(user.getRole().getRole()));
         } catch (Exception e) {
             throw new RuntimeException(e);
         }