@@ -78,11 +78,12 @@ public class RegRequestHandler implements RequestHandler {
|
||||
throw new ValidationException(bindingResult, request.getMsgId());
|
||||
}
|
||||
|
||||
AuthToken authToken = authService.register(regRequest);
|
||||
boolean verified = regRequest.getMailVerified().equals("true");
|
||||
AuthToken authToken = authService.register(regRequest, verified);
|
||||
EmailVerificationToken emailToken = emailService.createEmailVerificationToken(authToken);
|
||||
RegAnswer regAnswer = new RegAnswer();
|
||||
|
||||
if (regRequest.getMailVerified().equals("true")) {
|
||||
if (verified) {
|
||||
try {
|
||||
emailService.sendVerificationEmail(authToken.getUser(), emailToken.getToken());
|
||||
} catch (Exception e) {
|
||||
|
||||
@@ -51,13 +51,13 @@ public class AuthService {
|
||||
private final SecureRandom secureRandom = new SecureRandom();
|
||||
|
||||
@Transactional
|
||||
public AuthToken register(RegRequest registerRequest) {
|
||||
public AuthToken register(RegRequest registerRequest, boolean verified) {
|
||||
User user = new User();
|
||||
user.setFullName(registerRequest.getFullName());
|
||||
user.setEmail(registerRequest.getEmail());
|
||||
user.setPassword(passwordEncoder.encode(registerRequest.getPassword()));
|
||||
user.setActive(true);
|
||||
user.setEmailVerified(true);
|
||||
user.setActive(!verified);
|
||||
user.setEmailVerified(!verified);
|
||||
|
||||
AccountType accountType = AccountType.valueOf(registerRequest.getAccountType().toUpperCase());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user