update option in token to match existing options

Author: iampersistent

src/Message/AbstractRequest.php

@@ -259,16 +259,6 @@ public function setPurchaseOrderNumber($value)
         return $this->setParameter('purchaseOrderNumber', $value);
     }
 
-    public function getOptions()
-    {
-        return $this->getParameter('options');
-    }
-
-    public function setOptions($value)
-    {
-        return $this->setParameter('options', $value);
-    }
-
     public function getTaxAmount()
     {
         return $this->getParameter('taxAmount');
@@ -309,6 +299,16 @@ public function setPaymentMethodNonce($value)
         return $this->setToken($value);
     }
 
+    public function getFailOnDuplicatePaymentMethod()
+    {
+        return $this->getParameter('failOnDuplicatePaymentMethod');
+    }
+
+    public function setFailOnDuplicatePaymentMethod($value)
+    {
+        return $this->setParameter('failOnDuplicatePaymentMethod', (bool) $value);
+    }
+
     /**
      * @return array
      */
@@ -346,6 +346,32 @@ public function getCardData()
         );
     }
 
+    /**
+     * @return array
+     */
+    public function getOptionData()
+    {
+        $data = array(
+            'addBillingAddressToPaymentMethod' => $this->getAddBillingAddressToPaymentMethod(),
+            'failOnDuplicatePaymentMethod' => $this->getFailOnDuplicatePaymentMethod(),
+            'holdInEscrow' => $this->getHoldInEscrow(),
+            'storeInVault' => $this->getStoreInVault(),
+            'storeInVaultOnSuccess' => $this->getStoreInVaultOnSuccess(),
+            'storeShippingAddressInVault' => $this->getStoreShippingAddressInVault(),
+        );
+
+        // Remove null values
+        $data = array_filter($data, function($value){
+            return ! is_null($value);
+        });
+
+        if (empty($data)) {
+            return $data;
+        } else {
+            return array('options' => $data);
+        }
+    }
+
     protected function createResponse($data)
     {
         return $this->response = new Response($this, $data);

src/Message/AuthorizeRequest.php

@@ -25,14 +25,6 @@ public function getData()
             'deviceData' => $this->getDeviceData(),
             'deviceSessionId' => $this->getDeviceSessionId(),
             'merchantAccountId' => $this->getMerchantAccountId(),
-            'options' => [
-                'addBillingAddressToPaymentMethod' => $this->getAddBillingAddressToPaymentMethod(),
-                'holdInEscrow' => $this->getHoldInEscrow(),
-                'storeInVault' => $this->getStoreInVault(),
-                'storeInVaultOnSuccess' => $this->getStoreInVaultOnSuccess(),
-                'storeShippingAddressInVault' => $this->getStoreShippingAddressInVault(),
-                'submitForSettlement' => false,
-            ],
             'orderId' => $this->getTransactionId(),
             'purchaseOrderNumber' => $this->getPurchaseOrderNumber(),
             'recurring' => $this->getRecurring(),
@@ -55,7 +47,9 @@ public function getData()
             return ! is_null($value);
         });
 
+        $data += $this->getOptionData();
         $data += $this->getCardData();
+        $data['options']['submitForSettlement'] = false;
 
         return $data;
     }

src/Message/ClientTokenRequest.php

@@ -16,9 +16,7 @@ public function getData()
         if ($customerId = $this->getCustomerId()) {
             $data['customerId'] = $customerId;
         }
-        if ($options = $this->getOptions()) {
-            $data['options'] = $options;
-        }
+        $data += $this->getOptionData();
 
         return $data;
     }

tests/Message/AbstractRequestTest.php

@@ -126,4 +126,25 @@ public function testCardData()
         $this->assertSame($card['shippingCountry'], $data['shipping']['countryName']);
 
     }
+
+    public function testOptionData()
+    {
+        $options = [
+            'addBillingAddressToPaymentMethod' => false,
+            'failOnDuplicatePaymentMethod'     => true,
+            'holdInEscrow'                     => false,
+            'storeInVault'                     => true,
+            'storeInVaultOnSuccess'            => false,
+            'storeShippingAddressInVault'      => true,
+        ];
+        $this->request->initialize($options);
+        $data = $this->request->getOptionData();
+
+        $this->assertSame($options['addBillingAddressToPaymentMethod'], $data['options']['addBillingAddressToPaymentMethod']);
+        $this->assertSame($options['failOnDuplicatePaymentMethod'], $data['options']['failOnDuplicatePaymentMethod']);
+        $this->assertSame($options['holdInEscrow'], $data['options']['holdInEscrow']);
+        $this->assertSame($options['storeInVault'], $data['options']['storeInVault']);
+        $this->assertSame($options['storeInVaultOnSuccess'], $data['options']['storeInVaultOnSuccess']);
+        $this->assertSame($options['storeShippingAddressInVault'], $data['options']['storeShippingAddressInVault']);
+    }
 }

tests/Message/ClientTokenRequestTest.php

@@ -27,15 +27,19 @@ public function testGetData()
 
     public function testGetDataWithCustomer()
     {
-        $data = array(
+        $setData = array(
+            'customerId' => '4815162342',
+            'failOnDuplicatePaymentMethod' => true,
+        );
+        $expectedData = array(
             'customerId' => '4815162342',
             'options' => array(
                 'failOnDuplicatePaymentMethod' => true,
             ),
         );
-        $this->request->initialize($data);
+        $this->request->initialize($setData);
         $this->assertSame('4815162342', $this->request->getCustomerId());
-        $this->assertSame($data, $this->request->getData());
+        $this->assertSame($expectedData, $this->request->getData());
     }
 
 }