Skip to content

Commit 9c2395e

Browse files
author
eugenp
committed
minor registration cleanup
1 parent 14849eb commit 9c2395e

File tree

6 files changed

+68
-39
lines changed

6 files changed

+68
-39
lines changed

‎spring-security-login-and-registration/src/main/java/org/baeldung/event/listener/RegistrationListener.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,12 @@
22

33
import java.util.UUID;
44

5-
import javax.mail.AuthenticationFailedException;
6-
75
import org.baeldung.event.OnRegistrationCompleteEvent;
86
import org.baeldung.persistence.model.User;
97
import org.baeldung.persistence.service.IUserService;
108
import org.springframework.beans.factory.annotation.Autowired;
119
import org.springframework.context.ApplicationListener;
1210
import org.springframework.context.MessageSource;
13-
import org.springframework.mail.MailAuthenticationException;
1411
import org.springframework.mail.SimpleMailMessage;
1512
import org.springframework.mail.javamail.JavaMailSender;
1613
import org.springframework.stereotype.Component;
@@ -34,7 +31,8 @@ public void onApplicationEvent(OnRegistrationCompleteEvent event) {
3431
private void confirmRegistration(OnRegistrationCompleteEvent event) {
3532
User user = event.getUser();
3633
String token = UUID.randomUUID().toString();
37-
service.addVerificationToken(user, token);
34+
service.createVerificationTokenForUser(user, token);
35+
3836
String recipientAddress = user.getEmail();
3937
String subject = "Registration Confirmation";
4038
String confirmationUrl = event.getAppUrl() + "/regitrationConfirm.html?token=" + token;

‎spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,43 @@
11
package org.baeldung.persistence.model;
22

33
import javax.persistence.CascadeType;
4-
import javax.persistence.Column;
54
import javax.persistence.Entity;
65
import javax.persistence.FetchType;
76
import javax.persistence.GeneratedValue;
87
import javax.persistence.GenerationType;
98
import javax.persistence.Id;
109
import javax.persistence.OneToOne;
11-
import javax.persistence.Table;
1210

1311
@Entity
14-
@Table
1512
public class User {
1613

1714
@Id
1815
@GeneratedValue(strategy = GenerationType.AUTO)
1916
private Long id;
2017

21-
@Column(name = "firstName")
2218
private String firstName;
2319

24-
@Column(name = "lastName")
2520
private String lastName;
2621

27-
@Column(name = "email")
2822
private String email;
2923

30-
@Column(name = "password")
3124
private String password;
3225

33-
@Column(name = "enabled")
3426
private boolean enabled;
35-
36-
@Column(name = "token_expired")
27+
3728
private boolean tokenExpired;
3829

3930
@OneToOne(mappedBy = "user", fetch = FetchType.EAGER, cascade = CascadeType.ALL)
4031
private Role role;
41-
32+
4233
public User() {
4334
super();
4435
this.enabled = false;
4536
this.tokenExpired = false;
4637
}
38+
39+
//
40+
4741
public Long getId() {
4842
return id;
4943
}
@@ -99,7 +93,7 @@ public boolean isEnabled() {
9993
public void setEnabled(boolean enabled) {
10094
this.enabled = enabled;
10195
}
102-
96+
10397
public boolean isTokenExpired() {
10498
return tokenExpired;
10599
}
@@ -108,6 +102,7 @@ public void setTokenExpired(boolean expired) {
108102
this.tokenExpired = expired;
109103
}
110104

105+
//
111106

112107
@Override
113108
public int hashCode() {
@@ -137,4 +132,5 @@ public String toString() {
137132
builder.append("User [firstName=").append(firstName).append("]").append("[lastName=").append(lastName).append("]").append("[username").append(email).append("]");
138133
return builder.toString();
139134
}
135+
140136
}

‎spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/VerificationToken.java‎

Lines changed: 33 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,16 @@
33
import java.util.Calendar;
44
import java.sql.Date;
55
import java.sql.Timestamp;
6-
import javax.persistence.Column;
6+
77
import javax.persistence.Entity;
88
import javax.persistence.FetchType;
99
import javax.persistence.GeneratedValue;
1010
import javax.persistence.GenerationType;
1111
import javax.persistence.Id;
1212
import javax.persistence.JoinColumn;
1313
import javax.persistence.OneToOne;
14-
import javax.persistence.Table;
1514

1615
@Entity
17-
@Table
1816
public class VerificationToken {
1917

2018
private static final int EXPIRATION = 60 * 24;
@@ -23,14 +21,12 @@ public class VerificationToken {
2321
@GeneratedValue(strategy = GenerationType.AUTO)
2422
private Long id;
2523

26-
@Column(name = "token")
2724
private String token;
2825

2926
@OneToOne(targetEntity = User.class, fetch = FetchType.EAGER)
3027
@JoinColumn(nullable = false, name = "user_id")
3128
private User user;
3229

33-
@Column(name = "expiry_date")
3430
private Date expiryDate;
3531

3632
public VerificationToken() {
@@ -39,17 +35,21 @@ public VerificationToken() {
3935

4036
public VerificationToken(String token) {
4137
super();
38+
4239
this.token = token;
4340
this.expiryDate = calculateExpiryDate(EXPIRATION);
4441
}
4542

4643
public VerificationToken(String token, User user) {
4744
super();
45+
4846
this.token = token;
4947
this.user = user;
5048
this.expiryDate = calculateExpiryDate(EXPIRATION);
5149
}
5250

51+
//
52+
5353
public String getToken() {
5454
return token;
5555
}
@@ -81,16 +81,41 @@ private Date calculateExpiryDate(int expiryTimeInMinutes) {
8181
return new Date(cal.getTime().getTime());
8282
}
8383

84+
//
85+
86+
@Override
87+
public int hashCode() {
88+
final int prime = 31;
89+
int result = 1;
90+
result = prime * result + ((expiryDate == null) ? 0 : expiryDate.hashCode());
91+
result = prime * result + ((token == null) ? 0 : token.hashCode());
92+
result = prime * result + ((user == null) ? 0 : user.hashCode());
93+
return result;
94+
}
95+
8496
@Override
85-
public boolean equals(final Object obj) {
97+
public boolean equals(Object obj) {
8698
if (this == obj)
8799
return true;
88100
if (obj == null)
89101
return false;
90102
if (getClass() != obj.getClass())
91103
return false;
92-
final VerificationToken verificationToken = (VerificationToken) obj;
93-
if (!token.equals(verificationToken.getToken()))
104+
VerificationToken other = (VerificationToken) obj;
105+
if (expiryDate == null) {
106+
if (other.expiryDate != null)
107+
return false;
108+
} else if (!expiryDate.equals(other.expiryDate))
109+
return false;
110+
if (token == null) {
111+
if (other.token != null)
112+
return false;
113+
} else if (!token.equals(other.token))
114+
return false;
115+
if (user == null) {
116+
if (other.user != null)
117+
return false;
118+
} else if (!user.equals(other.user))
94119
return false;
95120
return true;
96121
}

‎spring-security-login-and-registration/src/main/java/org/baeldung/persistence/service/IUserService.java‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,16 @@
66

77
public interface IUserService {
88

9-
public User registerNewUserAccount(UserDto accountDto) throws EmailExistsException;
9+
User registerNewUserAccount(UserDto accountDto) throws EmailExistsException;
1010

11-
public User getUser(String verificationToken);
11+
User getUser(String verificationToken);
1212

13-
public void saveRegisteredUser(User user);
13+
void saveRegisteredUser(User user);
1414

15-
public void addVerificationToken(User user, String token);
15+
void deleteUser(User user);
1616

17-
public VerificationToken getVerificationToken(String VerificationToken);
17+
void createVerificationTokenForUser(User user, String token);
18+
19+
VerificationToken getVerificationToken(String VerificationToken);
1820

19-
public void deleteUser(User user);
2021
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,9 @@ public void deleteUser(User user) {
6767

6868
@Transactional
6969
@Override
70-
public void addVerificationToken(User user, String token) {
70+
public void createVerificationTokenForUser(User user, String token) {
7171
VerificationToken myToken = new VerificationToken(token, user);
7272
tokenRepository.save(myToken);
7373
}
74+
7475
}

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

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
package org.baeldung.web.controller;
22

33
import java.util.Calendar;
4+
import java.util.Locale;
5+
46
import javax.validation.Valid;
7+
58
import org.baeldung.persistence.model.User;
69
import org.baeldung.persistence.model.VerificationToken;
710
import org.baeldung.persistence.service.UserDto;
@@ -56,35 +59,40 @@ public String showRegistrationForm(WebRequest request, Model model) {
5659

5760
@RequestMapping(value = "/regitrationConfirm", method = RequestMethod.GET)
5861
public String confirmRegistration(WebRequest request, Model model, @RequestParam("token") String token) {
62+
Locale locale = request.getLocale();
63+
5964
VerificationToken verificationToken = service.getVerificationToken(token);
6065
if (verificationToken == null) {
61-
model.addAttribute("message", messages.getMessage("auth.message.invalidToken", null, request.getLocale()));
62-
return "redirect:/badUser.html?lang=" + request.getLocale().getLanguage();
66+
String message = messages.getMessage("auth.message.invalidToken", null, locale);
67+
model.addAttribute("message", message);
68+
return "redirect:/badUser.html?lang=" + locale.getLanguage();
6369
}
70+
6471
User user = verificationToken.getUser();
6572
Calendar cal = Calendar.getInstance();
6673
if ((verificationToken.getExpiryDate().getTime() - cal.getTime().getTime()) <= 0) {
67-
model.addAttribute("message", messages.getMessage("auth.message.expired", null, request.getLocale()));
68-
return "redirect:/badUser.html?lang=" + request.getLocale().getLanguage();
74+
model.addAttribute("message", messages.getMessage("auth.message.expired", null, locale));
75+
return "redirect:/badUser.html?lang=" + locale.getLanguage();
6976
}
77+
7078
user.setEnabled(true);
7179
service.saveRegisteredUser(user);
72-
return "redirect:/login.html?lang=" + request.getLocale().getLanguage();
80+
return "redirect:/login.html?lang=" + locale.getLanguage();
7381
}
7482

7583
@RequestMapping(value = "/user/registration", method = RequestMethod.POST)
7684
public ModelAndView registerUserAccount(@ModelAttribute("user") @Valid UserDto accountDto, BindingResult result, WebRequest request, Errors errors) {
7785
LOGGER.debug("Registering user account with information: {}", accountDto);
78-
User registered = new User();
79-
String appUrl = request.getContextPath();
8086
if (result.hasErrors()) {
8187
return new ModelAndView("registration", "user", accountDto);
8288
}
83-
registered = createUserAccount(accountDto);
89+
90+
User registered = createUserAccount(accountDto);
8491
if (registered == null) {
8592
result.rejectValue("email", "message.regError");
8693
}
8794
try {
95+
String appUrl = request.getContextPath();
8896
eventPublisher.publishEvent(new OnRegistrationCompleteEvent(registered, request.getLocale(), appUrl));
8997
} catch (Exception me) {
9098
return new ModelAndView("emailError", "user", accountDto);

0 commit comments

Comments
 (0)