This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
package ru.soune.nocopy.dto.register;
|
package ru.soune.nocopy.dto.register;
|
||||||
|
|
||||||
import com.fasterxml.jackson.annotation.JsonFormat;
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonProperty;
|
||||||
import jakarta.validation.constraints.*;
|
import jakarta.validation.constraints.*;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
@@ -33,4 +34,7 @@ public class RegRequest {
|
|||||||
private String authToken;
|
private String authToken;
|
||||||
|
|
||||||
private String referralLink;
|
private String referralLink;
|
||||||
|
|
||||||
|
@JsonProperty("mail_verified")
|
||||||
|
private String mailVerified;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -80,29 +80,32 @@ public class RegRequestHandler implements RequestHandler {
|
|||||||
|
|
||||||
AuthToken authToken = authService.register(regRequest);
|
AuthToken authToken = authService.register(regRequest);
|
||||||
EmailVerificationToken emailToken = emailService.createEmailVerificationToken(authToken);
|
EmailVerificationToken emailToken = emailService.createEmailVerificationToken(authToken);
|
||||||
|
RegAnswer regAnswer = new RegAnswer();
|
||||||
|
|
||||||
try {
|
if (regRequest.getMailVerified().equals("true")) {
|
||||||
emailService.sendVerificationEmail(authToken.getUser(), emailToken.getToken());
|
try {
|
||||||
} catch (Exception e) {
|
emailService.sendVerificationEmail(authToken.getUser(), emailToken.getToken());
|
||||||
return new BaseResponse(request.getMsgId(), MessageCode.SEND_EMAIL_EXCEPTION.getCode(),
|
} catch (Exception e) {
|
||||||
MessageCode.SEND_EMAIL_EXCEPTION.getDescription(), Map.of(
|
return new BaseResponse(request.getMsgId(), MessageCode.SEND_EMAIL_EXCEPTION.getCode(),
|
||||||
|
MessageCode.SEND_EMAIL_EXCEPTION.getDescription(), Map.of(
|
||||||
"message", "not send",
|
"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();
|
String token = authToken.getToken();
|
||||||
authService.useUserAuthToken(token);
|
authService.useUserAuthToken(token);
|
||||||
|
|
||||||
RegAnswer regAnswer = new RegAnswer();
|
regAnswer.setToken(token);
|
||||||
|
|
||||||
// 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.setUserId(authToken.getUser().getId());
|
||||||
|
|
||||||
if (regRequest.getAccountType().equals("b2c")) {
|
if (regRequest.getAccountType().equals("b2c")) {
|
||||||
|
|||||||
Reference in New Issue
Block a user