@@ -59,17 +59,17 @@ public class RegRequestHandler implements RequestHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
AuthToken authToken = authService.register(regRequest);
|
AuthToken authToken = authService.register(regRequest);
|
||||||
EmailVerificationToken emailToken = emailService.createEmailVerificationToken(authToken);
|
// EmailVerificationToken emailToken = emailService.createEmailVerificationToken(authToken);
|
||||||
|
|
||||||
try {
|
// try {
|
||||||
emailService.sendVerificationEmail(authToken.getUser(), emailToken.getToken());
|
// emailService.sendVerificationEmail(authToken.getUser(), emailToken.getToken());
|
||||||
} catch (Exception e) {
|
// } catch (Exception e) {
|
||||||
return new BaseResponse(request.getMsgId(), MessageCode.SEND_EMAIL_EXCEPTION.getCode(),
|
// return new BaseResponse(request.getMsgId(), MessageCode.SEND_EMAIL_EXCEPTION.getCode(),
|
||||||
MessageCode.SEND_EMAIL_EXCEPTION.getDescription(), Map.of(
|
// MessageCode.SEND_EMAIL_EXCEPTION.getDescription(), Map.of(
|
||||||
"message", "not send",
|
// "message", "not send",
|
||||||
"email", regRequest.getEmail()
|
// "email", regRequest.getEmail()
|
||||||
));
|
// ));
|
||||||
}
|
// }
|
||||||
|
|
||||||
|
|
||||||
String token = authToken.getToken();
|
String token = authToken.getToken();
|
||||||
|
|||||||
@@ -50,17 +50,6 @@ public class EmailService {
|
|||||||
helper.setText(htmlContent, true);
|
helper.setText(htmlContent, true);
|
||||||
|
|
||||||
mailSender.send(message);
|
mailSender.send(message);
|
||||||
|
|
||||||
log.info("Email sent to: {}", user.getEmail());
|
|
||||||
log.info("Email sent to: {}", user.getEmail());
|
|
||||||
log.info("Email sent to: {}", user.getEmail());
|
|
||||||
log.info("Email sent to: {}", user.getEmail());
|
|
||||||
log.info("Email sent to: {}", user.getEmail());
|
|
||||||
log.info("Email sent to: {}", user.getEmail());
|
|
||||||
log.info("Email sent to: {}", user.getEmail());
|
|
||||||
log.info("Email sent to: {}", user.getEmail());
|
|
||||||
log.info("Email sent to: {}", user.getEmail());
|
|
||||||
log.info("Email sent to: {}", user.getEmail());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
|
|||||||
@@ -40,6 +40,8 @@ public class AuthService {
|
|||||||
user.setFullName(registerRequest.getFullName());
|
user.setFullName(registerRequest.getFullName());
|
||||||
user.setEmail(registerRequest.getEmail());
|
user.setEmail(registerRequest.getEmail());
|
||||||
user.setPassword(passwordEncoder.encode(registerRequest.getPassword()));
|
user.setPassword(passwordEncoder.encode(registerRequest.getPassword()));
|
||||||
|
user.setActive(true);
|
||||||
|
user.setEmailVerified(true);
|
||||||
|
|
||||||
if (registerRequest.getCompanyName() != null) {
|
if (registerRequest.getCompanyName() != null) {
|
||||||
user.setCompany(registerRequest.getCompanyName());
|
user.setCompany(registerRequest.getCompanyName());
|
||||||
|
|||||||
Reference in New Issue
Block a user