Merge pull request PAYONE-GmbH#545 from FatchipRobert/MAG2-312-247-pr…

…oblem

MAG2-312 - Fixed remote address problem in Mage 2.4.7

Helper/Environment.php

@@ -32,11 +32,9 @@
 class Environment extends \Payone\Core\Helper\Base
 {
     /**
-     * Extended remote address object
-     *
-     * @var \Payone\Core\Model\Environment\RemoteAddress
+     * @var \Magento\Framework\App\RequestInterface
      */
-    protected $remoteAddress;
+    protected $request;
 
     /**
      * Constructor
@@ -45,17 +43,17 @@ class Environment extends \Payone\Core\Helper\Base
      * @param \Magento\Store\Model\StoreManagerInterface   $storeManager
      * @param \Payone\Core\Helper\Shop                     $shopHelper
      * @param \Magento\Framework\App\State                 $state
-     * @param \Payone\Core\Model\Environment\RemoteAddress $remoteAddress
+     * @param \Magento\Framework\App\RequestInterface      $request
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
         \Magento\Store\Model\StoreManagerInterface $storeManager,
         \Payone\Core\Helper\Shop $shopHelper,
         \Magento\Framework\App\State $state,
-        \Payone\Core\Model\Environment\RemoteAddress $remoteAddress
+        \Magento\Framework\App\RequestInterface $request
     ) {
         parent::__construct($context, $storeManager, $shopHelper, $state);
-        $this->remoteAddress = $remoteAddress;
+        $this->request = $request;
     }
 
     /**
@@ -76,10 +74,7 @@ public function getEncoding()
     public function getRemoteIp()
     {
         $blProxyMode = (bool)$this->getConfigParam('proxy_mode', 'processing', 'payone_misc');
-        if ($blProxyMode === true) {
-            $this->remoteAddress->useHttpXForwarded();
-        }
-        return $this->remoteAddress->getRemoteAddress();
+        return $this->request->getClientIp($blProxyMode);
     }
 
     /**

Test/Unit/Helper/EnvironmentTest.php

@@ -33,7 +33,7 @@
 use Magento\Framework\App\Helper\Context;
 use Magento\Store\Model\ScopeInterface;
 use Magento\Framework\App\Config\ScopeConfigInterface;
-use Payone\Core\Model\Environment\RemoteAddress;
+use Magento\Framework\App\Request\Http;
 use Payone\Core\Test\Unit\BaseTestCase;
 use Payone\Core\Test\Unit\PayoneObjectManager;
 
@@ -58,11 +58,16 @@ protected function setUp(): void
     {
         $this->objectManager = $this->getObjectManager();
 
-        $remoteAddress = $this->getMockBuilder(RemoteAddress::class)->disableOriginalConstructor()->getMock();
-        $remoteAddress->method('getRemoteAddress')->willReturn('192.168.1.100');
+        $request = $this->getMockBuilder(Http::class)
+            ->disableOriginalConstructor()
+            ->setMethods([
+                'getClientIp'
+            ])
+            ->getMock();
+        $request->method('getClientIp')->willReturn('192.168.1.100');
 
         $this->scopeConfig = $this->getMockBuilder(ScopeConfigInterface::class)->disableOriginalConstructor()->getMock();
-        $context = $this->objectManager->getObject(Context::class, ['scopeConfig' => $this->scopeConfig, 'remoteAddress' => $remoteAddress]);
+        $context = $this->objectManager->getObject(Context::class, ['scopeConfig' => $this->scopeConfig]);
 
         $store = $this->getMockBuilder(StoreInterface::class)->disableOriginalConstructor()->getMock();
         $store->method('getCode')->willReturn(null);
@@ -73,7 +78,7 @@ protected function setUp(): void
         $this->environment = $this->objectManager->getObject(Environment::class, [
             'context' => $context,
             'storeManager' => $storeManager,
-            'remoteAddress' => $remoteAddress
+            'request' => $request
         ]);
     }
 

Test/Unit/Helper/ToolkitTest.php

@@ -139,7 +139,7 @@ public function testIsKeyValid()
                 ]
             );
 
-        $hash = $this->toolkit->hashString($key);
+        $hash = $this->toolkit->hashString($key, 'md5');
         $result = $this->toolkit->isKeyValid($hash);
         $this->assertTrue($result);