Merge pull request #446 from TonisOrmisson/use-login-ajax-events

fixed issue: user login events not triggered on ajax requests
2amigos · Feb 16, 2022 · c32a2ca · c32a2ca
2 parents a99f05a + 60feeaf
commit c32a2ca
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # CHANGELOG
 
 ## work in progress
+ - Fix user login events not triggered on ajax requests (TonisOrmisson)
  - Enh: Added minimum requirements when a new password is automatically generated (MatteoF96)
  - Fix #380: Avoid rewriting AccessRule::matchRole (maxxer)
  - Fix #378: Add module attribute 'disableIpLogging' (jkmssoft)

diff --git a/src/User/Controller/SecurityController.php b/src/User/Controller/SecurityController.php
@@ -125,7 +125,14 @@ public function actionLogin()
         if (Yii::$app->request->isAjax && $form->load(Yii::$app->request->post())) {
             Yii::$app->response->format = Response::FORMAT_JSON;
 
-            return ActiveForm::validate($form);
+            $this->trigger(FormEvent::EVENT_BEFORE_LOGIN, $event);
+            $errors = ActiveForm::validate($form);
+            if(empty($errors)) {
+                $this->trigger(FormEvent::EVENT_AFTER_LOGIN, $event);
+                return $errors;
+            }
+            $this->trigger(FormEvent::EVENT_FAILED_LOGIN, $event);
+            return $errors;
         }
 
         if ($form->load(Yii::$app->request->post())) {
@@ -150,7 +157,7 @@ public function actionLogin()
             }
             else
             {
-                $this->trigger(FormEvent::EVENT_FAILED_LOGIN, $event);    
+                $this->trigger(FormEvent::EVENT_FAILED_LOGIN, $event);
             }
         }