@@ -6,6 +6,7 @@ public enum MessageCode {
|
|||||||
REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
|
REG_EMAIL_OR_PHONE_EXISTS(1, "Email or phone already registered"),
|
||||||
REFERRAL_LINK_IS_NOT_EXIST(1, "Refferal link is not exist"),
|
REFERRAL_LINK_IS_NOT_EXIST(1, "Refferal link is not exist"),
|
||||||
INVALID_FIELD(2, "Invalid field"),
|
INVALID_FIELD(2, "Invalid field"),
|
||||||
|
MAIL_VERIFIED_NULL(2, "Mail verified null"),
|
||||||
INVALID_TOKEN(2, "Invalid token"),
|
INVALID_TOKEN(2, "Invalid token"),
|
||||||
TOKEN_IS_ALIVE(2, "Token is alive"),
|
TOKEN_IS_ALIVE(2, "Token is alive"),
|
||||||
INVALID_ACTION(2, "Invalid action"),
|
INVALID_ACTION(2, "Invalid action"),
|
||||||
|
|||||||
@@ -58,6 +58,7 @@ public class RegRequestHandler implements RequestHandler {
|
|||||||
}
|
}
|
||||||
|
|
||||||
String referralLink = regRequest.getReferralLink();
|
String referralLink = regRequest.getReferralLink();
|
||||||
|
String mailVerified = regRequest.getMailVerified();
|
||||||
|
|
||||||
if (referralLink != null) {
|
if (referralLink != null) {
|
||||||
Referral referral = referralJpaRepository.findByReferralLink(referralLink);
|
Referral referral = referralJpaRepository.findByReferralLink(referralLink);
|
||||||
@@ -68,6 +69,14 @@ public class RegRequestHandler implements RequestHandler {
|
|||||||
MessageCode.REFERRAL_LINK_IS_NOT_EXIST.getDescription(), Map.of(
|
MessageCode.REFERRAL_LINK_IS_NOT_EXIST.getDescription(), Map.of(
|
||||||
"referralLink", referralLink)));
|
"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");
|
BindingResult bindingResult = new BeanPropertyBindingResult(regRequest, "regRequest");
|
||||||
@@ -78,7 +87,7 @@ public class RegRequestHandler implements RequestHandler {
|
|||||||
throw new ValidationException(bindingResult, request.getMsgId());
|
throw new ValidationException(bindingResult, request.getMsgId());
|
||||||
}
|
}
|
||||||
|
|
||||||
boolean verified = regRequest.getMailVerified().equals("true");
|
boolean verified = mailVerified.equals("true");
|
||||||
AuthToken authToken = authService.register(regRequest, verified);
|
AuthToken authToken = authService.register(regRequest, verified);
|
||||||
EmailVerificationToken emailToken = emailService.createEmailVerificationToken(authToken);
|
EmailVerificationToken emailToken = emailService.createEmailVerificationToken(authToken);
|
||||||
RegAnswer regAnswer = new RegAnswer();
|
RegAnswer regAnswer = new RegAnswer();
|
||||||
|
|||||||
Reference in New Issue
Block a user