バージョンで分岐

EC-CUBE · Mar 19, 2024 · 58956a6 · 58956a6
1 parent 903938b
commit 58956a6
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Controller/CustomerPersonalValidationController.php b/Controller/CustomerPersonalValidationController.php
@@ -13,6 +13,7 @@
 
 namespace Plugin\TwoFactorAuthCustomer42\Controller;
 
+use Eccube\Common\Constant;
 use Eccube\Controller\AbstractController;
 use Eccube\Entity\Customer;
 use Eccube\Repository\CustomerRepository;
@@ -237,10 +238,16 @@ private function checkDeviceToken($Customer, $token): bool
         $now = new \DateTime();
 
         // フォームからのハッシュしたワンタイムパスワードとDBに保存しているワンタイムパスワードのハッシュは一致しているかどうか
-        if (
+        if (version_compare(Constant::VERSION, '4.3', '>=') &&
             !$this->customerTwoFactorAuthService->veriyOneTimeToken($Customer->getDeviceAuthOneTimeToken(), $token) ||
             $Customer->getDeviceAuthOneTimeTokenExpire() < $now) {
             return false;
+        } else {
+            if (
+                $Customer->getDeviceAuthOneTimeToken() !== $this->customerTwoFactorAuthService->hashOneTimeToken($token) ||
+                $Customer->getDeviceAuthOneTimeTokenExpire() < $now) {
+                return false;
+            }
         }
 
         return true;