This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
@@ -80,7 +80,9 @@ public class RegRequestHandler implements RequestHandler {
|
||||
|
||||
AuthToken authToken = authService.register(regRequest);
|
||||
EmailVerificationToken emailToken = emailService.createEmailVerificationToken(authToken);
|
||||
RegAnswer regAnswer = new RegAnswer();
|
||||
|
||||
if (regRequest.getMailVerified().equals("true")) {
|
||||
try {
|
||||
emailService.sendVerificationEmail(authToken.getUser(), emailToken.getToken());
|
||||
} catch (Exception e) {
|
||||
@@ -91,18 +93,19 @@ public class RegRequestHandler implements RequestHandler {
|
||||
));
|
||||
}
|
||||
|
||||
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")) {
|
||||
|
||||
Reference in New Issue
Block a user