From f6c8281c9e65d1f2d21997f21dad295556ce206b Mon Sep 17 00:00:00 2001
From: Yuri Kuznetsov <yurikuzn@users.noreply.github.com>
Date: Sat, 11 Sep 2021 16:52:42 +0300
Subject: [PATCH] remove hook

---
 .../Core/Authentication/Authentication.php    | 10 +--------
 .../Espo/Core/Authentication/Hook/Manager.php | 21 -------------------
 .../metadata/app/authentication.json          |  1 -
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/application/Espo/Core/Authentication/Authentication.php b/application/Espo/Core/Authentication/Authentication.php
index dfe45032d0..b0c0f47be1 100644
--- a/application/Espo/Core/Authentication/Authentication.php
+++ b/application/Espo/Core/Authentication/Authentication.php
@@ -266,7 +266,7 @@ class Authentication
             $result = $this->processTwoFactor($result, $request);
 
             if ($result->isFail()) {
-                return $this->processFailSecondStep(
+                return $this->processFail(
                     $result,
                     $data,
                     $request
@@ -617,14 +617,6 @@ class Authentication
         return $result;
     }
 
-    private function processFailSecondStep(Result $result, AuthenticationData $data, Request $request): Result
-    {
-        $this->hookManager->processOnFailSecondStep($result, $data, $request);
-        $this->hookManager->processOnFail($result, $data, $request);
-
-        return $result;
-    }
-
     private function processSuccess(
         Result $result,
         AuthenticationData $data,
diff --git a/application/Espo/Core/Authentication/Hook/Manager.php b/application/Espo/Core/Authentication/Hook/Manager.php
index 70dc4c713b..a51943df72 100644
--- a/application/Espo/Core/Authentication/Hook/Manager.php
+++ b/application/Espo/Core/Authentication/Hook/Manager.php
@@ -62,13 +62,6 @@ class Manager
         }
     }
 
-    public function processOnFailSecondStep(Result $result, AuthenticationData $data, Request $request): void
-    {
-        foreach ($this->getOnFailSecondStepHookList() as $hook) {
-            $hook->process($result, $data, $request);
-        }
-    }
-
     public function processOnSuccess(Result $result, AuthenticationData $data, Request $request): void
     {
         foreach ($this->getOnSuccessHookList() as $hook) {
@@ -128,20 +121,6 @@ class Manager
         return $list;
     }
 
-    /**
-     * @return OnResult[]
-     */
-    private function getOnFailSecondStepHookList(): array
-    {
-        $list = [];
-
-        foreach ($this->getHookClassNameList('onFailSecondStep') as $className) {
-            $list[] = $this->injectableFactory->create($className);
-        }
-
-        return $list;
-    }
-
     /**
      * @return OnResult[]
      */
diff --git a/application/Espo/Resources/metadata/app/authentication.json b/application/Espo/Resources/metadata/app/authentication.json
index 92e0a1bad3..8d0dcebb83 100644
--- a/application/Espo/Resources/metadata/app/authentication.json
+++ b/application/Espo/Resources/metadata/app/authentication.json
@@ -3,7 +3,6 @@
         "Espo\\Core\\Authentication\\Hook\\Hooks\\FailedAttemptsLimit"
     ],
     "onFailHookClassNameList": [],
-    "onFailSecondStepHookClassNameList": [],
     "onSuccessHookClassNameList": [],
     "onSuccessByTokenHookClassNameList": [],
     "onSecondStepRequiredHookClassNameList": []