Отрефакторены тесты

Удалено тестовое окружение acceptance
Удалена часть потенциально ненужных тестов
Добавлена логика для формы регистрации
Добавлена таблица для хранения ключей активации по E-mail
Добавлены тесты для формы регистрации
Реорганизован роутинг
Добавлен компонент для ReCaptcha2

api/models/LoginForm.php

@@ -5,46 +5,45 @@ use common\models\Account;
 use Yii;
 use yii\base\Model;
 
-/**
- * Login form
- */
-class LoginForm extends Model
-{
-    public $username;
+class LoginForm extends Model {
+
+    public $login;
     public $password;
     public $rememberMe = true;
 
-    private $_user;
+    private $_account;
 
+    public function formName() {
+        return '';
+    }
 
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
+    public function rules() {
         return [
-            // username and password are both required
-            [['username', 'password'], 'required'],
-            // rememberMe must be a boolean value
-            ['rememberMe', 'boolean'],
-            // password is validated by validatePassword()
+            ['login', 'required', 'message' => 'error.login_required'],
+            ['login', 'validateLogin'],
+
+            ['password', 'required', 'when' => function(self $model) {
+                return !$model->hasErrors();
+            }, 'message' => 'error.password_required'],
             ['password', 'validatePassword'],
+
+            ['rememberMe', 'boolean'],
         ];
     }
 
-    /**
-     * Validates the password.
-     * This method serves as the inline validation for password.
-     *
-     * @param string $attribute the attribute currently being validated
-     * @param array $params the additional name-value pairs given in the rule
-     */
-    public function validatePassword($attribute, $params)
-    {
+    public function validateLogin($attribute) {
         if (!$this->hasErrors()) {
-            $user = $this->getUser();
-            if (!$user || !$user->validatePassword($this->password)) {
-                $this->addError($attribute, 'Incorrect username or password.');
+            if (!$this->getAccount()) {
+                $this->addError($attribute, 'error.' . $attribute . '_not_exist');
+            }
+        }
+    }
+
+    public function validatePassword($attribute) {
+        if (!$this->hasErrors()) {
+            $account = $this->getAccount();
+            if (!$account || !$account->validatePassword($this->password)) {
+                $this->addError($attribute, 'error.' . $attribute . '_incorrect');
             }
         }
     }
@@ -54,26 +53,24 @@ class LoginForm extends Model
      *
      * @return boolean whether the user is logged in successfully
      */
-    public function login()
-    {
-        if ($this->validate()) {
-            return Yii::$app->user->login($this->getUser(), $this->rememberMe ? 3600 * 24 * 30 : 0);
-        } else {
+    public function login() {
+        if (!$this->validate()) {
             return false;
         }
+
+        return Yii::$app->user->login($this->getAccount(), $this->rememberMe ? 3600 * 24 * 30 : 0);
     }
 
     /**
-     * Finds user by [[username]]
-     *
      * @return Account|null
      */
-    protected function getUser()
-    {
-        if ($this->_user === null) {
-            $this->_user = Account::findByEmail($this->username);
+    protected function getAccount() {
+        if ($this->_account === NULL) {
+            $attribute = strpos($this->login, '@') ? 'email' : 'username';
+            $this->_account = Account::findOne([$attribute => $this->login]);
         }
 
-        return $this->_user;
+        return $this->_account;
     }
+
 }

api/models/RegistrationForm.php

@@ -0,0 +1,111 @@
+<?php
+namespace api\models;
+
+use api\components\ReCaptcha\Validator as ReCaptchaValidator;
+use common\components\UserFriendlyRandomKey;
+use common\models\Account;
+use common\models\EmailActivation;
+use Yii;
+use yii\base\ErrorException;
+use yii\base\Model;
+
+class RegistrationForm extends Model {
+
+    public $username;
+    public $email;
+    public $password;
+    public $rePassword;
+    public $rulesAgreement;
+
+    public function formName() {
+        return '';
+    }
+
+    public function rules() {
+        return [
+            ['rulesAgreement', 'required', 'message' => 'error.you_must_accept_rules'],
+            [[], ReCaptchaValidator::class, 'message' => 'error.captcha_invalid', 'when' => !YII_ENV_TEST],
+
+            ['username', 'filter', 'filter' => 'trim'],
+            ['username', 'required', 'message' => 'error.username_required'],
+            ['username', 'string', 'min' => 3, 'max' => 21,
+                'tooShort' => 'error.username_too_short',
+                'tooLong' => 'error.username_too_long',
+            ],
+            ['username', 'match', 'pattern' => '/^[\p{L}\d-_\.!?#$%^&*()\[\]:;]+$/u'],
+            ['username', 'unique', 'targetClass' => Account::class, 'message' => 'error.username_not_available'],
+
+            ['email', 'filter', 'filter' => 'trim'],
+            ['email', 'required', 'message' => 'error.email_required'],
+            ['email', 'string', 'max' => 255, 'tooLong' => 'error.email_too_long'],
+            ['email', 'email', 'checkDNS' => true, 'enableIDN' => true, 'message' => 'error.email_invalid'],
+            ['email', 'unique', 'targetClass' => Account::class, 'message' => 'error.email_not_available'],
+
+            ['password', 'required', 'message' => 'error.password_required'],
+            ['rePassword', 'required', 'message' => 'error.rePassword_required'],
+            ['password', 'string', 'min' => 8, 'tooShort' => 'error.password_too_short'],
+            ['rePassword', 'validatePasswordAndRePasswordMatch'],
+        ];
+    }
+
+    public function validatePasswordAndRePasswordMatch($attribute) {
+        if (!$this->hasErrors()) {
+            if ($this->password !== $this->rePassword) {
+                $this->addError($attribute, "error.rePassword_does_not_match");
+            }
+        }
+    }
+
+    /**
+     * @return Account|null the saved model or null if saving fails
+     */
+    public function signup() {
+        if (!$this->validate()) {
+            return null;
+        }
+
+        $transaction = Yii::$app->db->beginTransaction();
+        try {
+            $account = new Account();
+            $account->email = $this->email;
+            $account->username = $this->username;
+            $account->password = $this->password;
+            $account->status = Account::STATUS_REGISTERED;
+            $account->generateAuthKey();
+            if (!$account->save()) {
+                throw new ErrorException('Account not created.');
+            }
+
+            $emailActivation = new EmailActivation();
+            $emailActivation->account_id = $account->id;
+            $emailActivation->type = EmailActivation::TYPE_REGISTRATION_EMAIL_CONFIRMATION;
+            $emailActivation->key = UserFriendlyRandomKey::make();
+
+            if (!$emailActivation->save()) {
+                throw new ErrorException('Unable save email-activation model.');
+            }
+
+            /** @var \yii\swiftmailer\Mailer $mailer */
+            $mailer = Yii::$app->mailer;
+            /** @var \yii\swiftmailer\Message $message */
+            $message = $mailer->compose([
+                'html' => '@app/mails/registration-confirmation-html',
+                'text' => '@app/mails/registration-confirmation-text',
+            ], [
+                'key' => $emailActivation->key,
+            ])->setFrom(['account@ely.by' => 'Ely.by']);
+
+            if (!$message->send()) {
+                throw new ErrorException('Unable send email with activation code.');
+            }
+
+            $transaction->commit();
+        } catch (ErrorException $e) {
+            $transaction->rollBack();
+            throw $e;
+        }
+
+        return $account;
+    }
+
+}