move getUserIdForVaulting from ViewConfig to Controller-Traits

OXID-eSales · Dec 13, 2024 · b20f652 · b20f652
1 parent 39b9bee
commit b20f652
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 53 deletions.
diff --git a/src/Controller/PayPalVaultingCardController.php b/src/Controller/PayPalVaultingCardController.php
@@ -3,21 +3,21 @@
 namespace OxidSolutionCatalysts\PayPal\Controller;
 
 use OxidEsales\Eshop\Application\Controller\AccountController;
-use OxidEsales\Eshop\Core\Registry;
-use OxidSolutionCatalysts\PayPal\Core\ServiceFactory;
 use OxidSolutionCatalysts\PayPal\Service\ModuleSettings;
+use OxidSolutionCatalysts\PayPal\Traits\AccountControllerTrait;
 use OxidSolutionCatalysts\PayPal\Traits\ServiceContainer;
 
 /**
- * user account menu for saving paypal for purchase later (vaulting without purchase)
+ * user account menu for saving paypal (acdc) for purchase later (vaulting without purchase)
  */
 class PayPalVaultingCardController extends AccountController
 {
     use ServiceContainer;
+    use AccountControllerTrait;
 
     public function render()
     {
-        $this->_aViewData['vaultingUserId'] = $this->getViewConfig()->getUserIdForVaulting();
+        $this->_aViewData['vaultingUserId'] = $this->getUserIdForVaulting();
         $moduleSettings = $this->getServiceFromContainer(ModuleSettings::class);
 
         if ($moduleSettings->isVaultingAllowedForACDC()) {
@@ -26,18 +26,4 @@ public function render()
 
         return parent::render();
     }
-
-    public function deleteVaultedPayment()
-    {
-        $paymentTokenId = Registry::getRequest()->getRequestEscapedParameter("paymentTokenId");
-        $vaultingService = Registry::get(ServiceFactory::class)->getVaultingService();
-
-        if (!$vaultingService->deleteVaultedPayment($paymentTokenId)) {
-            Registry::getUtilsView()->addErrorToDisplay(
-                Registry::getLang()->translateString('OSC_PAYPAL_DELETE_FAILED'),
-                false,
-                true
-            );
-        }
-    }
 }
diff --git a/src/Controller/PayPalVaultingController.php b/src/Controller/PayPalVaultingController.php
@@ -3,21 +3,21 @@
 namespace OxidSolutionCatalysts\PayPal\Controller;
 
 use OxidEsales\Eshop\Application\Controller\AccountController;
-use OxidSolutionCatalysts\PayPal\Core\ServiceFactory;
 use OxidSolutionCatalysts\PayPal\Service\ModuleSettings;
+use OxidSolutionCatalysts\PayPal\Traits\AccountControllerTrait;
 use OxidSolutionCatalysts\PayPal\Traits\ServiceContainer;
-use OxidEsales\Eshop\Core\Registry;
 
 /**
  * user account menu for saving paypal for purchase later (vaulting without purchase)
  */
 class PayPalVaultingController extends AccountController
 {
     use ServiceContainer;
+    use AccountControllerTrait;
 
     public function render()
     {
-        $this->_aViewData['vaultingUserId'] = $this->getViewConfig()->getUserIdForVaulting();
+        $this->_aViewData['vaultingUserId'] = $this->getUserIdForVaulting();
         $moduleSettings = $this->getServiceFromContainer(ModuleSettings::class);
 
         if ($moduleSettings->isVaultingAllowedForPayPal()) {
@@ -26,18 +26,4 @@ public function render()
 
         return parent::render();
     }
-
-    public function deleteVaultedPayment()
-    {
-        $paymentTokenId = Registry::getRequest()->getRequestEscapedParameter("paymentTokenId");
-        $vaultingService = Registry::get(ServiceFactory::class)->getVaultingService();
-
-        if (!$vaultingService->deleteVaultedPayment($paymentTokenId)) {
-            Registry::getUtilsView()->addErrorToDisplay(
-                Registry::getLang()->translateString('OSC_PAYPAL_DELETE_FAILED'),
-                false,
-                true
-            );
-        }
-    }
 }
diff --git a/src/Core/ViewConfig.php b/src/Core/ViewConfig.php
@@ -264,24 +264,6 @@ public function showPayPalExpressInMiniBasket(): bool
         return $showButton;
     }
 
-    public function getUserIdForVaulting(): string
-    {
-        if (!$this->getUser()) {
-            return "";
-        }
-
-        $payPalCustomerId = $this->getUser()->getFieldData("oscpaypalcustomerid");
-
-        if (!$payPalCustomerId) {
-            return "";
-        }
-
-        $vaultingService = Registry::get(ServiceFactory::class)->getVaultingService();
-        $response = $vaultingService->generateUserIdToken($payPalCustomerId);
-
-        return $response["id_token"] ?? "";
-    }
-
     /**
      * get Session Vault Success
      *

diff --git a/src/Traits/AccountControllerTrait.php b/src/Traits/AccountControllerTrait.php
@@ -0,0 +1,48 @@
+<?php
+
+/**
+ * Copyright © OXID eSales AG. All rights reserved.
+ * See LICENSE file for license details.
+ */
+
+declare(strict_types=1);
+
+namespace OxidSolutionCatalysts\PayPal\Traits;
+
+use OxidEsales\Eshop\Core\Registry;
+use OxidSolutionCatalysts\PayPal\Core\ServiceFactory;
+
+trait AccountControllerTrait
+{
+    public function deleteVaultedPayment()
+    {
+        $paymentTokenId = Registry::getRequest()->getRequestEscapedParameter("paymentTokenId");
+        $vaultingService = Registry::get(ServiceFactory::class)->getVaultingService();
+
+        if (!$vaultingService->deleteVaultedPayment($paymentTokenId)) {
+            Registry::getUtilsView()->addErrorToDisplay(
+                Registry::getLang()->translateString('OSC_PAYPAL_DELETE_FAILED'),
+                false,
+                true
+            );
+        }
+    }
+
+    public function getUserIdForVaulting(): string
+    {
+        if (!$this->getUser()) {
+            return "";
+        }
+
+        $payPalCustomerId = $this->getUser()->getFieldData("oscpaypalcustomerid");
+
+        if (!$payPalCustomerId) {
+            return "";
+        }
+
+        $vaultingService = Registry::get(ServiceFactory::class)->getVaultingService();
+        $response = $vaultingService->generateUserIdToken($payPalCustomerId);
+
+        return $response["id_token"] ?? "";
+    }
+}