diff --git a/src/main/java/ru/soune/nocopy/dto/MessageCode.java b/src/main/java/ru/soune/nocopy/dto/MessageCode.java index 00e2597..61b92aa 100644 --- a/src/main/java/ru/soune/nocopy/dto/MessageCode.java +++ b/src/main/java/ru/soune/nocopy/dto/MessageCode.java @@ -6,6 +6,7 @@ public enum MessageCode { REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"), REFERRAL_LINK_IS_NOT_EXIST(1, "Refferal link is not exist"), INVALID_FIELD(2, "Invalid field"), + MAIL_VERIFIED_NULL(2, "Mail verified null"), INVALID_TOKEN(2, "Invalid token"), TOKEN_IS_ALIVE(2, "Token is alive"), INVALID_ACTION(2, "Invalid action"), diff --git a/src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java b/src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java index 39a100e..e3aad4e 100644 --- a/src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java +++ b/src/main/java/ru/soune/nocopy/handler/RegRequestHandler.java @@ -58,6 +58,7 @@ public class RegRequestHandler implements RequestHandler { } String referralLink = regRequest.getReferralLink(); + String mailVerified = regRequest.getMailVerified(); if (referralLink != null) { Referral referral = referralJpaRepository.findByReferralLink(referralLink); @@ -68,6 +69,14 @@ public class RegRequestHandler implements RequestHandler { MessageCode.REFERRAL_LINK_IS_NOT_EXIST.getDescription(), Map.of( "referralLink", referralLink))); } + + if (mailVerified == null) { + throw new NotValidFieldException("Mailverified is null:" + referralLink + + referralLink, new BaseResponse(request.getMsgId(), + MessageCode.MAIL_VERIFIED_NULL.getCode(), + MessageCode.MAIL_VERIFIED_NULL.getDescription(), Map.of( + "mailVerified", mailVerified))); + } } BindingResult bindingResult = new BeanPropertyBindingResult(regRequest, "regRequest"); @@ -78,7 +87,7 @@ public class RegRequestHandler implements RequestHandler { throw new ValidationException(bindingResult, request.getMsgId()); } - boolean verified = regRequest.getMailVerified().equals("true"); + boolean verified = mailVerified.equals("true"); AuthToken authToken = authService.register(regRequest, verified); EmailVerificationToken emailToken = emailService.createEmailVerificationToken(authToken); RegAnswer regAnswer = new RegAnswer();