Merge pull request #562 from FatchipRobert/MAG2-324-HashFix

MAG2-324 - Fixed a problem with hash function
PAYONE-GmbH · Sep 24, 2024 · e960b85 · e960b85
2 parents 0124ca7 + ff5f44f
commit e960b85
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/Helper/Toolkit.php b/Helper/Toolkit.php
@@ -264,12 +264,14 @@ public function generateUUIDv4()
      * Returns a hashed string and defines a default through the sAlgorithm parameter
      *
      * @param  string $sString
+     * @param  string $sAlgorithm
+     * @param  string $sKey
      * @return string
      */
     public function hashString($sString, $sAlgorithm = 'sha384', $sKey = false)
     {
         if ($sAlgorithm == "sha384" && $sKey !== false) {
-            return hash_hmac($sAlgorithm, $sString, $sKey);
+            return hash_hmac($sAlgorithm, $sString, $sKey ?? '');
         }
         return hash($sAlgorithm, $sString);
     }

diff --git a/Test/Unit/Helper/RatepayTest.php b/Test/Unit/Helper/RatepayTest.php
@@ -140,11 +140,22 @@ public function testRefreshProfiles()
     {
         $aShopConfig = [['shop_id' => '12345', 'currency' => 'EUR']];
         $this->scopeConfig->method('getValue')->willReturn(json_encode($aShopConfig));
+        $this->profile->method('sendRequest')->willReturn(['status' => 'OK']);
 
         $result = $this->classToTest->refreshProfiles('payone_ratepay_invoice');
         $this->assertNull($result);
     }
 
+    public function testRefreshProfilesException()
+    {
+        $aShopConfig = [['shop_id' => '12345', 'currency' => 'EUR']];
+        $this->scopeConfig->method('getValue')->willReturn(json_encode($aShopConfig));
+        $this->profile->method('sendRequest')->willReturn(['status' => 'ERROR']);
+
+        $this->expectException(\Exception::class);
+        $this->classToTest->refreshProfiles('payone_ratepay_invoice');
+    }
+
     public function testGetRatepayDeviceFingerprintToken()
     {
         $this->checkoutSession->method('getPayoneRatepayDeviceFingerprintToken')->willReturn(null);