diff --git a/src/main/java/ru/soune/nocopy/dto/register/RegRequest.java b/src/main/java/ru/soune/nocopy/dto/register/RegRequest.java index af948fa..ef19795 100644 --- a/src/main/java/ru/soune/nocopy/dto/register/RegRequest.java +++ b/src/main/java/ru/soune/nocopy/dto/register/RegRequest.java @@ -1,6 +1,7 @@ package ru.soune.nocopy.dto.register; import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; import jakarta.validation.constraints.*; import lombok.Data; @@ -33,4 +34,7 @@ public class RegRequest { private String authToken; private String referralLink; + + @JsonProperty("mail_verified") + private String mailVerified; } diff --git a/src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java b/src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java index f6a988d..dc06ffa 100644 --- a/src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java @@ -80,29 +80,32 @@ public class RegRequestHandler implements RequestHandler { AuthToken authToken = authService.register(regRequest); EmailVerificationToken emailToken = emailService.createEmailVerificationToken(authToken); + RegAnswer regAnswer = new RegAnswer(); - 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( + if (regRequest.getMailVerified().equals("true")) { + 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() - )); - } + "email", regRequest.getEmail() + )); + } + regAnswer.setVerified(false); + regAnswer.setActive(false); + } else { + regAnswer.setUserId(authToken.getUser().getId()); + + regAnswer.setVerified(true); + regAnswer.setActive(true); + } String token = authToken.getToken(); authService.useUserAuthToken(token); - RegAnswer regAnswer = new RegAnswer(); - -// regAnswer.setUserId(authToken.getUser().getId()); -// regAnswer.setToken(token); -// regAnswer.setVerified(true); -// regAnswer.setActive(true); - regAnswer.setVerified(false); - regAnswer.setActive(false); + regAnswer.setToken(token); regAnswer.setUserId(authToken.getUser().getId()); if (regRequest.getAccountType().equals("b2c")) {