@@ -12,6 +12,7 @@ import ru.soune.nocopy.dto.register.RegAnswer;
|
||||
import ru.soune.nocopy.dto.register.RegRequest;
|
||||
import ru.soune.nocopy.entity.referral.Referral;
|
||||
import ru.soune.nocopy.entity.user.AuthToken;
|
||||
import ru.soune.nocopy.entity.user.EmailVerificationToken;
|
||||
import ru.soune.nocopy.exception.NotValidFieldException;
|
||||
import ru.soune.nocopy.exception.ValidationException;
|
||||
import ru.soune.nocopy.handler.validator.RegRequestValidator;
|
||||
@@ -78,17 +79,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();
|
||||
@@ -96,10 +97,13 @@ public class RegRequestHandler implements RequestHandler {
|
||||
|
||||
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.setUserId(authToken.getUser().getId());
|
||||
regAnswer.setToken(token);
|
||||
regAnswer.setVerified(true);
|
||||
regAnswer.setActive(true);
|
||||
|
||||
if (regRequest.getAccountType().equals("b2c")) {
|
||||
referralService.onRegister(authToken.getUser().getId(), regRequest.getReferralLink());
|
||||
|
||||
Reference in New Issue
Block a user