Merge pull request #3 from bryglen/master

add support to use payment method token aside from nonce

Author: barryvdh

src/Message/AbstractRequest.php

@@ -269,6 +269,26 @@ public function setTaxExempt($value)
         return $this->setParameter('taxExempt', (bool) $value);
     }
 
+    public function getPaymentMethodToken()
+    {
+        return $this->getParameter('paymentMethodToken');
+    }
+
+    public function setPaymentMethodToken($value)
+    {
+        return $this->setParameter('paymentMethodToken', $value);
+    }
+
+    public function getPaymentMethodNonce()
+    {
+        return $this->getToken();
+    }
+
+    public function setPaymentMethodNonce($value)
+    {
+        return $this->setToken($value);
+    }
+
     /**
      * @return array
      */

src/Message/AuthorizeRequest.php

@@ -1,6 +1,7 @@
 <?php
 namespace Omnipay\Braintree\Message;
 
+use Omnipay\Common\Exception\InvalidRequestException;
 use Omnipay\Common\Message\ResponseInterface;
 
 /**
@@ -12,7 +13,7 @@ class AuthorizeRequest extends AbstractRequest
 {
     public function getData()
     {
-        $this->validate('amount', 'token');
+        $this->validate('amount');
 
         $data = [
             'amount' => $this->getAmount(),
@@ -33,14 +34,22 @@ public function getData()
                 'submitForSettlement' => false,
             ],
             'orderId' => $this->getTransactionId(),
-            'paymentMethodNonce' => $this->getToken(),
             'purchaseOrderNumber' => $this->getPurchaseOrderNumber(),
             'recurring' => $this->getRecurring(),
             'shippingAddressId' => $this->getShippingAddressId(),
             'taxAmount' => $this->getTaxAmount(),
             'taxExempt' => $this->getTaxExempt(),
         ];
 
+        // special validation
+        if ($this->getPaymentMethodToken()) {
+            $data['paymentMethodToken'] = $this->getPaymentMethodToken();
+        } elseif($this->getToken()) {
+            $data['paymentMethodNonce'] = $this->getToken();
+        } else {
+            throw new InvalidRequestException("The token (payment nonce) or paymentMethodToken field should be set.");
+        }
+
         // Remove null values
         $data = array_filter($data, function($value){
             return ! is_null($value);

tests/Message/AuthorizeRequestTest.php

@@ -35,6 +35,7 @@ public function testGetData()
     {
         $data = $this->request->getData();
 
+        $this->assertArrayNotHasKey('paymentMethodToken', $data);
         $this->assertSame('abc123', $data['paymentMethodNonce']);
         $this->assertSame('10.00', $data['amount']);
         $this->assertSame('684', $data['orderId']);
@@ -50,6 +51,48 @@ public function testGetData()
         $this->assertSame('production', \Braintree_Configuration::environment());
     }
 
+    public function testPaymentMethodToken()
+    {
+        $this->request->initialize(
+            array(
+                'amount' => '10.00',
+                'transactionId' => '684',
+                'testMode' => false,
+                'taxExempt' => false,
+                'card' => [
+                    'firstName' => 'Kayla',
+                    'shippingCompany' => 'League',
+                ],
+                'paymentMethodToken' => 'fake-token-123'
+            )
+        );
+
+        $data = $this->request->getData();
+        $this->assertSame('fake-token-123', $data['paymentMethodToken']);
+        $this->assertArrayNotHasKey('paymentMethodNonce', $data);
+    }
+
+    public function testPaymentMethodNonce()
+    {
+        $this->request->initialize(
+            array(
+                'amount' => '10.00',
+                'transactionId' => '684',
+                'testMode' => false,
+                'taxExempt' => false,
+                'card' => [
+                    'firstName' => 'Kayla',
+                    'shippingCompany' => 'League',
+                ],
+                'paymentMethodNonce' => 'abc123'
+            )
+        );
+
+        $data = $this->request->getData();
+        $this->assertSame('abc123', $data['paymentMethodNonce']);
+        $this->assertArrayNotHasKey('paymentMethodToken', $data);
+    }
+
     public function testSandboxEnvironment()
     {
         $this->request->setTestMode(true);