Improve device data handling

ampeco · Oct 16, 2024 · 154d16d · 154d16d
1 parent e872abb
commit 154d16d
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 15 deletions.
diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "ampeco/omnipay-wl-valina",
     "description": "Omnipay plugin for Worldline Valina",
-    "version": "1.3.5",
+    "version": "1.3.6",
     "type": "library",
     "license": "MIT",
     "autoload": {

diff --git a/src/Message/InitialPurchaseRequest.php b/src/Message/InitialPurchaseRequest.php
@@ -29,22 +29,28 @@ public function getData(): array
 
     public function getCustomerData(): array
     {
+        $deviceData = [
+            'acceptHeader' => $this->getAcceptHeader(),
+            'browserData' => array_filter([
+                'colorDepth' => $this->getColorDepth(),
+                'javaEnabled' => true,
+                'javaScriptEnabled' => true,
+                'screenHeight' => $this->getScreenHeight(),
+                'screenWidth' => $this->getScreenWidth(),
+            ], fn ($value) => true),
+            'ipAddress' => $this->getIpAddress(),
+            'locale' => $this->getLocale(),
+            'timezoneOffsetUtcMinutes' => $this->getTimezoneOffsetUtcMinutes(),
+            'userAgent' => $this->getUserAgent(),
+        ];
+
+        if ($deviceData['ipAddress'] === null) {
+            unset($deviceData['ipAddress']);
+        }
+
         return [
             'customer' => [
-                'device' => [
-                    'acceptHeader' => $this->getAcceptHeader(),
-                    'browserData' => [
-                        'colorDepth' => $this->getColorDepth(),
-                        'javaEnabled' => true,
-                        'javaScriptEnabled' => true,
-                        'screenHeight' => $this->getScreenHeight(),
-                        'screenWidth' => $this->getScreenWidth(),
-                    ],
-                    'ipAddress' => $this->getIpAddress(),
-                    'locale' => $this->getLocale(),
-                    'timezoneOffsetUtcMinutes' => $this->getTimezoneOffsetUtcMinutes(),
-                    'userAgent' => $this->getUserAgent(),
-                ],
+                'device' => $deviceData,
                 'contactDetails' => [
                     'emailAddress' => $this->getEmail(),
                 ],