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

small fixes

Browse Source
This commit is contained in:
eugenp 2015-02-09 00:44:52 +02:00
parent 12dab9fdcb
commit e27818266a
2 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
spring-security-login-and-registration/src/main/java/org/baeldung/web/controller/RegistrationController.java
View File

@ -39,7 +39,6 @@ import org.springframework.web.servlet.ModelAndView;
@Controller @Controller
public class RegistrationController { public class RegistrationController {
private final Logger LOGGER = LoggerFactory.getLogger(getClass()); private final Logger LOGGER = LoggerFactory.getLogger(getClass());
@Autowired @Autowired
@ -111,7 +110,8 @@ public class RegistrationController {
try { try {
final String appUrl = request.getContextPath(); final String appUrl = request.getContextPath();
eventPublisher.publishEvent(new OnRegistrationCompleteEvent(registered, request.getLocale(), appUrl)); eventPublisher.publishEvent(new OnRegistrationCompleteEvent(registered, request.getLocale(), appUrl));
} catch (final Exception me) { } catch (final Exception ex) {
LOGGER.warn("Unable to register user", ex);
return new ModelAndView("emailError", "user", accountDto); return new ModelAndView("emailError", "user", accountDto);
} }
return new ModelAndView("successRegister", "user", accountDto); return new ModelAndView("successRegister", "user", accountDto);
@ -126,10 +126,10 @@ public class RegistrationController {
final SimpleMailMessage email = constructResetVerificationTokenEmail(request.getContextPath(), request.getLocale(), newToken, user); final SimpleMailMessage email = constructResetVerificationTokenEmail(request.getContextPath(), request.getLocale(), newToken, user);
mailSender.send(email); mailSender.send(email);
} catch (final MailAuthenticationException e) { } catch (final MailAuthenticationException e) {
LOGGER.debug("MailAuthenticationException"); LOGGER.debug("MailAuthenticationException", e);
return "redirect:/emailError.html?lang=" + locale.getLanguage(); return "redirect:/emailError.html?lang=" + locale.getLanguage();
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.debug(e.getLocalizedMessage()); LOGGER.debug(e.getLocalizedMessage(), e);
model.addAttribute("message", e.getLocalizedMessage()); model.addAttribute("message", e.getLocalizedMessage());
return "redirect:/login.html?lang=" + locale.getLanguage(); return "redirect:/login.html?lang=" + locale.getLanguage();
} }
@ -149,13 +149,14 @@ public class RegistrationController {
userService.createPasswordResetTokenForUser(user, token); userService.createPasswordResetTokenForUser(user, token);
try { try {
final SimpleMailMessage email = constructResetTokenEmail(request.getContextPath(), request.getLocale(), token, user); final SimpleMailMessage email = constructResetTokenEmail(request.getContextPath(), request.getLocale(), token, user);
LOGGER.debug(email.getText()); LOGGER.debug(email.getText());
mailSender.send(email); mailSender.send(email);
} catch (final MailAuthenticationException e) { } catch (final MailAuthenticationException e) {
LOGGER.debug("MailAuthenticationException"); LOGGER.debug("MailAuthenticationException", e);
return "redirect:/emailError.html?lang=" + request.getLocale().getLanguage(); return "redirect:/emailError.html?lang=" + request.getLocale().getLanguage();
} catch (final Exception e) { } catch (final Exception e) {
LOGGER.debug(e.getLocalizedMessage()); LOGGER.debug(e.getLocalizedMessage(), e);
model.addAttribute("message", e.getLocalizedMessage()); model.addAttribute("message", e.getLocalizedMessage());
return "redirect:/login.html?lang=" + request.getLocale().getLanguage(); return "redirect:/login.html?lang=" + request.getLocale().getLanguage();
} }
@ -206,7 +207,6 @@ public class RegistrationController {
final SimpleMailMessage email = new SimpleMailMessage(); final SimpleMailMessage email = new SimpleMailMessage();
email.setSubject("Resend Registration Token"); email.setSubject("Resend Registration Token");
email.setText(message + " \r\n" + "http://localhost:8080" + confirmationUrl); email.setText(message + " \r\n" + "http://localhost:8080" + confirmationUrl);
email.setTo(user.getEmail()); email.setTo(user.getEmail());
return email; return email;
} }

16
spring-security-login-and-registration/src/main/resources/email.properties
View File

@ -1,17 +1,7 @@
################### DataSource Configuration ##########################
jdbc.driverClassName=com.mysql.jdbc.Driver
jdbc.url=jdbc:mysql://localhost:3306/registration_02?createDatabaseIfNotExist=true
jdbc.user=tutorialuser
jdbc.pass=tutorialmy5ql
init-db=false
################### Hibernate Configuration ##########################
hibernate.dialect=org.hibernate.dialect.MySQLDialect
hibernate.show_sql=false
hibernate.hbm2ddl.auto=create-drop
################### JavaMail Configuration ########################## ################### JavaMail Configuration ##########################
smtp.host=smtp.gmail.com smtp.host=email-smtp.us-east-1.amazonaws.com
smtp.port=465 smtp.port=465
smtp.protocol=smtps smtp.protocol=smtps
smtp.username=xxx777@gmail.com smtp.username=AKIAJIKXZAQFFJDXI4VQ
smtp.password= smtp.password=AjYQNjXVTalbpfRL37RYqyXEkyQAvmKFcUFQllfAsBLh
support.email=xxx777@gmail.com support.email=xxx777@gmail.com