iSharkFly-Docs/java-tutorials
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

registration logic simplifications

Browse Source
This commit is contained in:
eugenp 2014-12-03 10:37:04 +02:00
parent 9c2395e61f
commit e0e6d3c79f
2 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@Service @Service
@Transactional
public class UserService implements IUserService { public class UserService implements IUserService {
@Autowired @Autowired
private UserRepository repository; private UserRepository repository;
@ -19,7 +20,8 @@ public class UserService implements IUserService {
@Autowired @Autowired
private VerificationTokenRepository tokenRepository; private VerificationTokenRepository tokenRepository;
@Transactional // API
@Override @Override
public User registerNewUserAccount(UserDto accountDto) throws EmailExistsException { public User registerNewUserAccount(UserDto accountDto) throws EmailExistsException {
if (emailExist(accountDto.getEmail())) { if (emailExist(accountDto.getEmail())) {
@ -34,14 +36,6 @@ public class UserService implements IUserService {
return repository.save(user); return repository.save(user);
} }
private boolean emailExist(String email) {
User user = repository.findByEmail(email);
if (user != null) {
return true;
}
return false;
}
@Override @Override
public User getUser(String verificationToken) { public User getUser(String verificationToken) {
User user = tokenRepository.findByToken(verificationToken).getUser(); User user = tokenRepository.findByToken(verificationToken).getUser();
@ -53,23 +47,30 @@ public class UserService implements IUserService {
return tokenRepository.findByToken(VerificationToken); return tokenRepository.findByToken(VerificationToken);
} }
@Transactional
@Override @Override
public void saveRegisteredUser(User user) { public void saveRegisteredUser(User user) {
repository.save(user); repository.save(user);
} }
@Transactional
@Override @Override
public void deleteUser(User user) { public void deleteUser(User user) {
repository.delete(user); repository.delete(user);
} }
@Transactional
@Override @Override
public void createVerificationTokenForUser(User user, String token) { public void createVerificationTokenForUser(User user, String token) {
VerificationToken myToken = new VerificationToken(token, user); VerificationToken myToken = new VerificationToken(token, user);
tokenRepository.save(myToken); tokenRepository.save(myToken);
} }
//
private boolean emailExist(String email) {
User user = repository.findByEmail(email);
if (user != null) {
return true;
}
return false;
}
} }

8
spring-security-login-and-registration/src/main/java/org/baeldung/security/MyUserDetailsService.java
View File

@ -47,12 +47,8 @@ public class MyUserDetailsService implements UserDetailsService {
if (user == null) { if (user == null) {
return new org.springframework.security.core.userdetails.User(" ", " ", enabled, true, true, true, getAuthorities(new Integer(1))); 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(user.getEmail(), user.getPassword().toLowerCase(), user.isEnabled(), accountNonExpired, credentialsNonExpired, accountNonLocked, getAuthorities(user.getRole().getRole()));
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()));
} catch (Exception e) { } catch (Exception e) {
throw new RuntimeException(e); throw new RuntimeException(e);
} }