Rework email_activation model, get rid of behaviors, use json column to store additional data

This commit is contained in:
ErickSkrauch
2019-12-21 01:23:58 +03:00
parent 22e8158581
commit 666213afc7
26 changed files with 254 additions and 454 deletions
@@ -50,7 +50,7 @@ class RepeatAccountActivationForm extends ApiForm {
public function validateExistsActivation(string $attribute): void {
if (!$this->hasErrors()) {
$activation = $this->getActivation();
if ($activation !== null && !$activation->canRepeat()) {
if ($activation !== null && !$activation->canResend()) {
$this->addError($attribute, E::RECENTLY_SENT_MESSAGE);
}
}
@@ -94,7 +94,7 @@ class RepeatAccountActivationForm extends ApiForm {
->one();
}
public function getActivation(): ?EmailActivation {
public function getActivation(): ?RegistrationConfirmation {
return $this->getAccount()
->getEmailActivations()
->withType(EmailActivation::TYPE_REGISTRATION_EMAIL_CONFIRMATION)