Merge pull request #81 from unzerdev/fix/magento-98

Add client IP for all requests sent to Unzer API

Author: AleksandarBoljanovic

CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.1.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.2.7](https://github.com/unzerdev/magento2/compare/3.2.6..3.2.7)
+### Added
+* Client's IP address in every request sent to Unzer API
+
 ## [3.2.6](https://github.com/unzerdev/magento2/compare/3.2.5..3.2.6)
 ### Fixed
 * Discount amount when taxes are applied

Model/Config.php

@@ -8,6 +8,7 @@
 use Magento\Payment\Model\CcConfig;
 use Magento\Payment\Model\MethodInterface;
 use Magento\Store\Model\ScopeInterface;
+use Magento\Framework\HTTP\PhpEnvironment\Request;
 use Unzer\PAPI\Model\Logger\DebugHandler;
 use Unzer\PAPI\Model\Method\OverrideApiCredentialInterface;
 use UnzerSDK\Unzer;
@@ -75,17 +76,24 @@ class Config extends \Magento\Payment\Gateway\Config\Config
      */
     private ScopeConfigInterface $_scopeConfig;
 
+    /**
+     * @var Request
+     */
+    private Request $_request;
+
     /**
      * @var CcConfig
      */
     private CcConfig $ccConfig;
 
     /**
      * Config constructor.
+     *
      * @param Resolver $localeResolver
      * @param ScopeConfigInterface $scopeConfig
      * @param DebugHandler $debugHandler
      * @param CcConfig $ccConfig
+     * @param Request $request
      * @param string|null $methodCode
      * @param string $pathPattern
      */
@@ -94,15 +102,17 @@ public function __construct(
         ScopeConfigInterface $scopeConfig,
         DebugHandler $debugHandler,
         CcConfig $ccConfig,
-        $methodCode = null,
-        $pathPattern = self::DEFAULT_PATH_PATTERN
+        Request $request,
+        ?string $methodCode = null,
+        string $pathPattern = self::DEFAULT_PATH_PATTERN
     ) {
         parent::__construct($scopeConfig, $methodCode, $pathPattern);
 
         $this->_debugHandler = $debugHandler;
         $this->_localeResolver = $localeResolver;
         $this->_scopeConfig = $scopeConfig;
         $this->ccConfig = $ccConfig;
+        $this->_request = $request;
     }
 
     /**
@@ -178,6 +188,12 @@ public function getUnzerClient(string $storeId = null, MethodInterface $paymentM
             $this->_localeResolver->getLocale()
         );
 
+        $clientsIpAddress = $this->_request->getClientIp();
+
+        if (filter_var($clientsIpAddress, FILTER_VALIDATE_IP)) {
+            $client->setClientIp($clientsIpAddress);
+        }
+
         $client->setDebugMode($this->isDebugMode($storeId));
         $client->setDebugHandler($this->_debugHandler);
 

composer.json

@@ -2,7 +2,7 @@
     "name": "unzerdev/magento2",
     "description": "This extension for Magento 2 provides a direct integration of the Unzer payment types to your Magento 2 shop via the Unzer Payment API (PAPI).",
     "type": "magento2-module",
-    "version": "3.2.6",
+    "version": "3.2.7",
     "license": "Apache-2.0",
     "require": {
         "php": "~7.4.0|~8.1.0|~8.2.0|~8.3.0",

etc/module.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-    <module name="Unzer_PAPI" setup_version="3.2.6">
+    <module name="Unzer_PAPI" setup_version="3.2.7">
         <sequence>
             <module name="Magento_Checkout"/>
             <module name="Magento_Config" />