From 6e96338fb56dd64334ccb93bf39e1f0fa9b5a170 Mon Sep 17 00:00:00 2001 From: eugenp Date: Mon, 1 Dec 2014 00:35:27 +0200 Subject: [PATCH 1/4] http async client cleanup --- httpclient/pom.xml | 21 +++++++++---------- .../httpclient/HttpAsyncClientTest.java | 15 +++++++------ 2 files changed, 19 insertions(+), 17 deletions(-) diff --git a/httpclient/pom.xml b/httpclient/pom.xml index be8440f126..bb9bda23ba 100644 --- a/httpclient/pom.xml +++ b/httpclient/pom.xml @@ -1,5 +1,4 @@ - + 4.0.0 org.baeldung httpclient @@ -36,11 +35,11 @@ - - org.apache.httpcomponents - httpcore - ${httpcore.version} - + + + + + org.apache.httpcomponents @@ -61,9 +60,9 @@ - org.apache.httpcomponents - httpasyncclient - 4.1-beta1 + org.apache.httpcomponents + httpasyncclient + 4.1-beta1 @@ -179,7 +178,7 @@ 1.10.8 4.3.3 - 4.3.6 + 4.4-beta1 2.4.0 diff --git a/httpclient/src/test/java/org/baeldung/httpclient/HttpAsyncClientTest.java b/httpclient/src/test/java/org/baeldung/httpclient/HttpAsyncClientTest.java index beb826850b..151ed10f37 100644 --- a/httpclient/src/test/java/org/baeldung/httpclient/HttpAsyncClientTest.java +++ b/httpclient/src/test/java/org/baeldung/httpclient/HttpAsyncClientTest.java @@ -3,7 +3,9 @@ package org.baeldung.httpclient; import static org.hamcrest.Matchers.equalTo; import static org.junit.Assert.assertThat; +import java.io.IOException; import java.security.cert.X509Certificate; +import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import javax.net.ssl.SSLContext; @@ -44,14 +46,17 @@ public class HttpAsyncClientTest { private static final String COOKIE_DOMAIN = ".yuilibrary.com"; // ".github.com"; private static final String COOKIE_NAME = "example"; // "JSESSIONID"; + // tests @Test - public void whenUseHttpAsyncClient_thenCorrect() throws Exception { + public void whenUseHttpAsyncClient_thenCorrect() throws InterruptedException, ExecutionException, IOException { final CloseableHttpAsyncClient client = HttpAsyncClients.createDefault(); - client.start(); + // client.start(); final HttpGet request = new HttpGet(HOST); + final Future future = client.execute(request, null); final HttpResponse response = future.get(); + assertThat(response.getStatusLine().getStatusCode(), equalTo(200)); client.close(); } @@ -114,7 +119,6 @@ public class HttpAsyncClientTest { client.close(); } - @Test public void whenUseCookiesWithHttpAsyncClient_thenCorrect() throws Exception { final BasicCookieStore cookieStore = new BasicCookieStore(); @@ -138,8 +142,8 @@ public class HttpAsyncClientTest { @Test public void whenUseAuthenticationWithHttpAsyncClient_thenCorrect() throws Exception { final CredentialsProvider provider = new BasicCredentialsProvider(); - final UsernamePasswordCredentials credentials = new UsernamePasswordCredentials(DEFAULT_USER, DEFAULT_PASS); - provider.setCredentials(AuthScope.ANY, credentials); + final UsernamePasswordCredentials creds = new UsernamePasswordCredentials(DEFAULT_USER, DEFAULT_PASS); + provider.setCredentials(AuthScope.ANY, creds); final CloseableHttpAsyncClient client = HttpAsyncClients.custom().setDefaultCredentialsProvider(provider).build(); final HttpGet request = new HttpGet(URL_SECURED_BY_BASIC_AUTHENTICATION); @@ -175,4 +179,3 @@ public class HttpAsyncClientTest { } } - From 430762f4d5f0678d7580b10510fefc581efb2ca3 Mon Sep 17 00:00:00 2001 From: egmp777 Date: Mon, 1 Dec 2014 12:11:06 -0500 Subject: [PATCH 2/4] Email Confirmation Article When VerificationToken expires Redirect to error page --- .../baeldung/security/MyUserDetailsService.java | 4 ---- .../web/controller/RegistrationController.java | 3 ++- .../src/main/resources/application.properties | 14 +++++++------- 3 files changed, 9 insertions(+), 12 deletions(-) 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 f1896ab3d7..e75cb4fa7b 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 @@ -51,10 +51,6 @@ public class MyUserDetailsService implements UserDetailsService { enabled = false; return new org.springframework.security.core.userdetails.User(" ", " ", enabled, true, true, true, getAuthorities(new Integer(1))); } - if (user.isTokenExpired()) { - accountNonExpired = false; - return new org.springframework.security.core.userdetails.User(" ", " ", enabled, accountNonExpired, 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) { 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 211ea95c1f..fe22f25bf2 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 @@ -64,7 +64,8 @@ public class RegistrationController { User user = verificationToken.getUser(); Calendar cal = Calendar.getInstance(); if ((verificationToken.getExpiryDate().getTime() - cal.getTime().getTime()) <= 0) { - user.setTokenExpired(true); + model.addAttribute("message", messages.getMessage("auth.message.expired", null, request.getLocale())); + return "redirect:/badUser.html?lang=" + request.getLocale().getLanguage(); } user.setEnabled(true); service.saveRegisteredUser(user); 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 baf7f37034..51db801043 100644 --- a/spring-security-login-and-registration/src/main/resources/application.properties +++ b/spring-security-login-and-registration/src/main/resources/application.properties @@ -1,17 +1,17 @@ ################### DataSource Configuration ########################## jdbc.driverClassName=com.mysql.jdbc.Driver -jdbc.url=jdbc:mysql://localhost:3306/AUTHDATA -jdbc.user=root -###jdbc.pass=admin### +jdbc.url=jdbc:mysql://localhost:3306/spring_hibernate4_02?createDatabaseIfNotExist=true +jdbc.user=tutorialuser +jdbc.pass=tutorialmy5ql init-db=false ################### Hibernate Configuration ########################## hibernate.dialect=org.hibernate.dialect.MySQLDialect -hibernate.show_sql=true -hibernate.hbm2ddl.auto=validate +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 \ No newline at end of file +support.email=xxx777@gmail.com \ No newline at end of file From 9c2395e61f5447838beac6321cee7d3f101ebfce Mon Sep 17 00:00:00 2001 From: eugenp Date: Tue, 2 Dec 2014 12:19:19 +0200 Subject: [PATCH 3/4] minor registration cleanup --- .../event/listener/RegistrationListener.java | 6 +-- .../org/baeldung/persistence/model/User.java | 20 ++++----- .../persistence/model/VerificationToken.java | 41 +++++++++++++++---- .../persistence/service/IUserService.java | 13 +++--- .../persistence/service/UserService.java | 3 +- .../controller/RegistrationController.java | 24 +++++++---- 6 files changed, 68 insertions(+), 39 deletions(-) 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 068a05ddf3..17cd7d6b0c 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 @@ -2,15 +2,12 @@ package org.baeldung.event.listener; import java.util.UUID; -import javax.mail.AuthenticationFailedException; - import org.baeldung.event.OnRegistrationCompleteEvent; import org.baeldung.persistence.model.User; import org.baeldung.persistence.service.IUserService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.ApplicationListener; import org.springframework.context.MessageSource; -import org.springframework.mail.MailAuthenticationException; import org.springframework.mail.SimpleMailMessage; import org.springframework.mail.javamail.JavaMailSender; import org.springframework.stereotype.Component; @@ -34,7 +31,8 @@ public class RegistrationListener implements ApplicationListener Date: Wed, 3 Dec 2014 10:37:04 +0200 Subject: [PATCH 4/4] 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); }