Merge pull request #23 from Payum/api-useraction

Api useraction
Payum · Nov 18, 2013 · f4572b7 · f4572b7
2 parents bc52317 + 3aee1ee
commit f4572b7
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/src/Payum/Paypal/ExpressCheckout/Nvp/Api.php b/src/Payum/Paypal/ExpressCheckout/Nvp/Api.php
@@ -284,6 +284,7 @@ class Api
         'return_url' => null,
         'cancel_url' => null,
         'sandbox' => null,
+        'useraction' => null,
     );
 
     public function __construct(ClientInterface $client, array $options)
@@ -472,11 +473,13 @@ public function getAuthorizeTokenUrl($token)
     {
         $host = $this->options['sandbox'] ? 'www.sandbox.paypal.com' : 'www.paypal.com';
 
-        return sprintf(
-            'https://%s/cgi-bin/webscr?cmd=_express-checkout&token=%s',
-            $host,
-            $token
-        );
+        $query = array_filter(array(
+            'useraction' => $this->options['useraction'],
+            'cmd' => '_express-checkout',
+            'token' => $token,
+        ));
+
+        return sprintf('https://%s/cgi-bin/webscr?%s', $host, http_build_query($query));
     }
 
     /**

diff --git a/tests/Payum/Paypal/ExpressCheckout/Nvp/Tests/ApiTest.php b/tests/Payum/Paypal/ExpressCheckout/Nvp/Tests/ApiTest.php
@@ -294,6 +294,26 @@ public function shouldGetSandboxAuthorizeUrlIfSandboxTrue()
         );
     }
 
+    /**
+     * @test
+     */
+    public function shouldAllowGetAuthorizeUrlWithCustomUserAction()
+    {
+        $api = new Api($this->createClientMock(), array(
+            'username' => 'a_username',
+            'password' => 'a_password',
+            'signature' => 'a_signature',
+            'sandbox' => true,
+            'useraction' => 'commit',
+        ));
+
+        $this->assertEquals(
+            'https://www.sandbox.paypal.com/cgi-bin/webscr?useraction=commit&cmd=_express-checkout&token=theToken',
+            $api->getAuthorizeTokenUrl('theToken')
+        );
+    }
+
+
     /**
      * @test
      */