Merge pull request #128 from faenir/master

Fix for #125

CHANGELOG.md

@@ -1,6 +1,7 @@
 # CHANGELOG
 
 ## 1.1.2 - Work in progress
+- Bug #125: Fix validation in non-ajax requests (faenir)
 - Bug #122: Fix wrong email message for email address change (liviuk2)
 
 ## 1.1.1 - November 27, 2017

src/User/Controller/AdminController.php

@@ -130,7 +130,7 @@ class AdminController extends Controller
 
         $this->make(AjaxRequestModelValidator::class, [$user])->validate();
 
-        if ($user->load(Yii::$app->request->post())) {
+        if ($user->load(Yii::$app->request->post()) && $user->validate()) {
             $this->trigger(UserEvent::EVENT_BEFORE_CREATE, $event);
 
             $mailService = MailFactory::makeWelcomeMailerService($user);

src/User/Controller/RecoveryController.php

@@ -94,7 +94,7 @@ class RecoveryController extends Controller
 
         $this->make(AjaxRequestModelValidator::class, [$form])->validate();
 
-        if ($form->load(Yii::$app->request->post())) {
+        if ($form->load(Yii::$app->request->post()) && $form->validate()) {
             $this->trigger(FormEvent::EVENT_BEFORE_REQUEST, $event);
 
             $mailService = MailFactory::makeRecoveryMailerService($form->email);

src/User/Controller/RegistrationController.php

@@ -145,7 +145,7 @@ class RegistrationController extends Controller
 
         $this->make(AjaxRequestModelValidator::class, [$user])->validate();
 
-        if ($user->load(Yii::$app->request->post())) {
+        if ($user->load(Yii::$app->request->post()) && $user->validate()) {
             $this->trigger(SocialNetworkConnectEvent::EVENT_BEFORE_CONNECT, $event);
 
             $mailService = MailFactory::makeWelcomeMailerService($user);

src/User/Service/PasswordRecoveryService.php

@@ -42,6 +42,10 @@ class PasswordRecoveryService implements ServiceInterface
             /** @var User $user */
             $user = $this->query->whereEmail($this->email)->one();
 
+            if ($user === null) {
+                throw new \RuntimeException('User not found.');
+            }
+
             $token = TokenFactory::makeRecoveryToken($user->id);
 
             if (!$token) {