From bbfa9d219a89514a55c61f256961427a1f7ec3db Mon Sep 17 00:00:00 2001 From: egmp777 Date: Wed, 26 Nov 2014 11:22:28 -0500 Subject: [PATCH] Email Confirmation Article Eliminated unnecessary stuff in IUserService and UserService --- .../event/OnRegistrationCompleteEvent.java | 4 ++-- .../event/listener/RegistrationListener.java | 2 +- .../org/baeldung/persistence/model/User.java | 10 +++++----- .../persistence/model/VerificationToken.java | 1 - .../persistence/service/IUserService.java | 4 ---- .../baeldung/persistence/service/UserDto.java | 4 ++++ .../persistence/service/UserService.java | 16 ---------------- .../MySimpleUrlAuthenticationSuccessHandler.java | 2 +- .../baeldung/security/MyUserDetailsService.java | 2 +- .../web/controller/RegistrationController.java | 6 +++--- .../src/main/resources/application.properties | 5 +++-- 11 files changed, 20 insertions(+), 36 deletions(-) diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/event/OnRegistrationCompleteEvent.java b/spring-security-login-and-registration/src/main/java/org/baeldung/event/OnRegistrationCompleteEvent.java index 6dace5ad4a..06c3627b50 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/event/OnRegistrationCompleteEvent.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/event/OnRegistrationCompleteEvent.java @@ -11,12 +11,12 @@ public class OnRegistrationCompleteEvent extends ApplicationEvent { private final String appUrl; private final Locale locale; private final User user; - + public OnRegistrationCompleteEvent(User user, Locale locale, String appUrl) { super(user); this.user = user; this.locale = locale; - this.appUrl = appUrl; + this.appUrl = appUrl; } public String getAppUrl() { diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/event/listener/RegistrationListener.java b/spring-security-login-and-registration/src/main/java/org/baeldung/event/listener/RegistrationListener.java index 7723c64121..b391b6d583 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/event/listener/RegistrationListener.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/event/listener/RegistrationListener.java @@ -15,7 +15,7 @@ import org.springframework.stereotype.Component; public class RegistrationListener implements ApplicationListener { @Autowired private IUserService service; - + @Autowired private MessageSource messages; diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java index 2b5274f3eb..ca81b82c79 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java @@ -17,19 +17,19 @@ public class User { @Id @GeneratedValue(strategy = GenerationType.AUTO) private Long id; - + @Column(name = "firstName") private String firstName; - + @Column(name = "lastName") private String lastName; - + @Column(name = "email") private String email; - + @Column(name = "password") private String password; - + @Column(name = "enabled") private boolean enabled; diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/VerificationToken.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/VerificationToken.java index 651df6c858..45b8c79cb7 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/VerificationToken.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/VerificationToken.java @@ -79,7 +79,6 @@ public class VerificationToken { cal.setTime(new Timestamp(cal.getTime().getTime())); cal.add(Calendar.MINUTE, expiryTimeInMinutes); return new Date(cal.getTime().getTime()); - } @Override diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java index 260dad9453..828514caa2 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java @@ -8,8 +8,6 @@ public interface IUserService { public User registerNewUserAccount(UserDto accountDto) throws EmailExistsException; - /* public User getRegisteredUser(String email);*/ - public User getUser(String verificationToken); public void saveRegisteredUser(User user); @@ -18,7 +16,5 @@ public interface IUserService { public VerificationToken getVerificationToken(String VerificationToken); - public void verifyUser(VerificationToken token); - public void deleteUser(User user); } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java index c8d63fb891..29a59be2fc 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/UserDto.java @@ -11,15 +11,19 @@ public class UserDto { @NotNull @NotEmpty private String firstName; + @NotNull @NotEmpty private String lastName; + @NotNull @NotEmpty private String password; + @NotNull @NotEmpty private String matchingPassword; + @ValidEmail @NotNull @NotEmpty 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 ce292e43a5..00f1770c66 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 @@ -42,14 +42,6 @@ public class UserService implements IUserService { return false; } - /* @Override - public User getRegisteredUser(String email) { - - User user = repository.findByEmail(email); - return user; - - }*/ - @Override public User getUser(String verificationToken) { User user = tokenRepository.findByToken(verificationToken).getUser(); @@ -67,12 +59,6 @@ public class UserService implements IUserService { repository.save(user); } - @Transactional - @Override - public void verifyUser(VerificationToken token) { - tokenRepository.save(token); - } - @Transactional @Override public void deleteUser(User user) { @@ -83,8 +69,6 @@ public class UserService implements IUserService { @Override public void addVerificationToken(User user, String token) { VerificationToken myToken = new VerificationToken(token, user); - // user.setVerificationToken(myToken); tokenRepository.save(myToken); - // repository.save(user); } } diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java b/spring-security-login-and-registration/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java index 591b821ab2..a4cdc708d9 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/security/MySimpleUrlAuthenticationSuccessHandler.java @@ -55,7 +55,7 @@ public class MySimpleUrlAuthenticationSuccessHandler implements AuthenticationSu } } if (isUser) { - return "/homepage.html?user="+authentication.getName(); + return "/homepage.html?user=" + authentication.getName(); } else if (isAdmin) { return "/console.html"; } else { 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 ebc4f334a4..6083adebcd 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 @@ -29,7 +29,7 @@ public class MyUserDetailsService implements UserDetailsService { private IUserService service; @Autowired private MessageSource messages; - + @Autowired public MyUserDetailsService(UserRepository repository) { this.userRepository = repository; diff --git a/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java b/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java index 407ca58f4a..6dc79de0ee 100644 --- a/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java +++ b/spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java @@ -30,13 +30,13 @@ public class RegistrationController { private final Logger LOGGER = LoggerFactory.getLogger(getClass()); private IUserService service; - + @Autowired private MessageSource messages; - + @Autowired private JavaMailSender mailSender; - + @Autowired private ApplicationEventPublisher eventPublisher; diff --git a/spring-security-login-and-registration/src/main/resources/application.properties b/spring-security-login-and-registration/src/main/resources/application.properties index 44c39f583b..4471b61a49 100644 --- a/spring-security-login-and-registration/src/main/resources/application.properties +++ b/spring-security-login-and-registration/src/main/resources/application.properties @@ -8,10 +8,11 @@ init-db=false hibernate.dialect=org.hibernate.dialect.MySQLDialect hibernate.show_sql=false hibernate.hbm2ddl.auto=create-drop + ################### JavaMail Configuration ########################## smtp.host=smtp.gmail.com smtp.port=465 smtp.protocol=smtps -smtp.username=xxx@gmail.com +smtp.username=xxx777@gmail.com smtp.password= -support.email=xxx@gmail.com +support.email=xxx777@gmail.com \ No newline at end of file