diff --git a/src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java b/src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java index e104977..4cf3914 100644 --- a/src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java @@ -59,17 +59,17 @@ public class RegRequestHandler implements RequestHandler { } AuthToken authToken = authService.register(regRequest); - EmailVerificationToken emailToken = emailService.createEmailVerificationToken(authToken); +// EmailVerificationToken emailToken = emailService.createEmailVerificationToken(authToken); - try { - emailService.sendVerificationEmail(authToken.getUser(), emailToken.getToken()); - } catch (Exception e) { - return new BaseResponse(request.getMsgId(), MessageCode.SEND_EMAIL_EXCEPTION.getCode(), - MessageCode.SEND_EMAIL_EXCEPTION.getDescription(), Map.of( - "message", "not send", - "email", regRequest.getEmail() - )); - } +// try { +// emailService.sendVerificationEmail(authToken.getUser(), emailToken.getToken()); +// } catch (Exception e) { +// return new BaseResponse(request.getMsgId(), MessageCode.SEND_EMAIL_EXCEPTION.getCode(), +// MessageCode.SEND_EMAIL_EXCEPTION.getDescription(), Map.of( +// "message", "not send", +// "email", regRequest.getEmail() +// )); +// } String token = authToken.getToken(); diff --git a/src/main/java/ru/soune/nocopy/service/mail/EmailService.java b/src/main/java/ru/soune/nocopy/service/mail/EmailService.java index a78b804..b610f3e 100644 --- a/src/main/java/ru/soune/nocopy/service/mail/EmailService.java +++ b/src/main/java/ru/soune/nocopy/service/mail/EmailService.java @@ -50,17 +50,6 @@ public class EmailService { helper.setText(htmlContent, true); 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 diff --git a/src/main/java/ru/soune/nocopy/service/register/AuthService.java b/src/main/java/ru/soune/nocopy/service/register/AuthService.java index 1038e63..379636b 100644 --- a/src/main/java/ru/soune/nocopy/service/register/AuthService.java +++ b/src/main/java/ru/soune/nocopy/service/register/AuthService.java @@ -40,6 +40,8 @@ public class AuthService { user.setFullName(registerRequest.getFullName()); user.setEmail(registerRequest.getEmail()); user.setPassword(passwordEncoder.encode(registerRequest.getPassword())); + user.setActive(true); + user.setEmailVerified(true); if (registerRequest.getCompanyName() != null) { user.setCompany(registerRequest.getCompanyName());