dev add check verified email
Test Workflow / test (push) Waiting to run

This commit is contained in:
vladp
2026-02-17 18:48:34 +07:00
parent c54dfc994b
commit 9f67f0c06d
2 changed files with 23 additions and 16 deletions
@@ -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,7 +80,9 @@ 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();
if (regRequest.getMailVerified().equals("true")) {
try { try {
emailService.sendVerificationEmail(authToken.getUser(), emailToken.getToken()); emailService.sendVerificationEmail(authToken.getUser(), emailToken.getToken());
} catch (Exception e) { } 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(); 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")) {