Merge pull request #523 from fatchip-Stefan/SW-451

0110034: removed unneccessary Todo
PAYONE-GmbH · Jul 25, 2024 · 069c2dd · 069c2dd
2 parents 78fb0d9 + 970199c
commit 069c2dd
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 25 deletions.
diff --git a/Frontend/MoptPaymentPayone/Components/Classes/PayoneParamBuilder.php b/Frontend/MoptPaymentPayone/Components/Classes/PayoneParamBuilder.php
@@ -1921,25 +1921,6 @@ protected function getParamAmount($basket, $userData)
         }
     }
 
-    /**
-     * hash iframe parameters
-     *
-     * @param array $request
-     * @return string
-     */
-    protected function getParamHash($request)
-    {
-        $payoneConfig = Mopt_PayoneMain::getInstance()->getPayoneConfig();
-        ksort($request);
-
-        $hashString = '';
-        foreach ($request as $value) {
-            $hashString .= $value;
-        }
-
-        return md5($hashString .= $payoneConfig['apiKey']);
-    }
-
     /**
      * determine authorization method
      *

diff --git a/Frontend/MoptPaymentPayone/Components/Payone/Api/Request/Abstract.php b/Frontend/MoptPaymentPayone/Components/Payone/Api/Request/Abstract.php
@@ -252,7 +252,7 @@ public function getEncoding()
      */
     public function setKey($key)
     {
-        $this->key = md5($key);
+        $this->key = hash('sha384', $key);
     }
 
     /**

diff --git a/Frontend/MoptPaymentPayone/Components/Payone/ClientApi/Request/Abstract.php b/Frontend/MoptPaymentPayone/Components/Payone/ClientApi/Request/Abstract.php
@@ -228,7 +228,7 @@ public function getEncoding()
      */
     public function setKey($key)
     {
-        $this->key = md5($key);
+        $this->key = hash('sha384', $key);
     }
 
     /**

diff --git a/Frontend/MoptPaymentPayone/Controllers/Frontend/MoptAjaxPayone.php b/Frontend/MoptPaymentPayone/Controllers/Frontend/MoptAjaxPayone.php
@@ -339,9 +339,6 @@ public function downloadMandateAction()
         $params = $this->moptPayoneMain->getParamBuilder()->buildGetFile($this->getPaymentId(), Shopware()->Session()->moptMandateDataDownload);
         $service = $this->payoneServiceBuilder->buildServiceManagementGetFile();
         $request = new Payone_Api_Request_GetFile($params);
-        // TODO check why SHA-384 seems unsupported
-        // $generateHashService = $this->container->get('MoptPayoneBuilder')->buildServiceClientApiGenerateHash();
-        // $request->set('hash', $generateHashService->generate($request, $params['key']));
 
         try {
             $response = $service->getFile($request);

diff --git a/Frontend/MoptPaymentPayone/Subscribers/FrontendPostDispatch.php b/Frontend/MoptPaymentPayone/Subscribers/FrontendPostDispatch.php
@@ -771,7 +771,7 @@ protected function moptPayoneCheckEnvironment($controllerName = false)
 
         $payoneParams['mid'] = $creditCardConfig['merchant_id'];
         $payoneParams['portalid'] = $creditCardConfig['portal_id'];
-        $payoneParams['key'] = md5($creditCardConfig['api_key']);
+        $payoneParams['key'] = hash('sha384', $creditCardConfig['api_key']);
         $payoneParams['aid'] = $creditCardConfig['subaccount_id'];
 
         if ($creditCardConfig['live_mode']) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -252,7 +252,7 @@ public function getEncoding() @@
          */
         public function setKey($key)
         {
-            $this->key = md5($key);
+            $this->key = hash('sha384', $key);
         }
         /**
@@ Expand Down @@