Merge pull request #290 from mercadopago/feature/access_token_v1

Implement access_token in header's requests

README.md

@@ -13,7 +13,7 @@ The SDK supports PHP 5.6 or major
 #### Using Composer
 
 1. Download [Composer](https://getcomposer.org/doc/00-intro.md#installation-linux-unix-macos) if not already installed
-2. Go to your project directory and run `composer require "mercadopago/dx-php:1.9.0"` on the command line.
+2. Go to your project directory and run `composer require "mercadopago/dx-php:1.10.0"` on the command line.
 3. This how your directory structure would look like.
 4. Thats all, you have Mercado Pago SDK installed.
 

composer.json

@@ -3,7 +3,7 @@
   "type": "library",
   "homepage": "https://github.com/mercadopago/dx-php",
   "license": "MIT",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "config": {
     "platform": {
         "php": "5.6"

src/MercadoPago/Config.php

@@ -137,16 +137,13 @@ public function set($key, $value)
     /** 
      * @return mixed
      */
-    public function getUserId($access_token)
+    public function getUserId()
     {
         if (!$this->_restclient) {
             $this->_restclient = new RestClient();
             $this->_restclient->setHttpParam('address', $this->get('base_url'));
         }
-        $response = $this->_restclient->get("/users/me", array(
-                "url_query" => array("access_token" => $access_token)
-            )
-        );  
+        $response = $this->_restclient->get("/users/me");  
 
         return $response["body"];
     }

src/MercadoPago/Entities/AdvancedPayments/AdvancedPayment.php

@@ -14,7 +14,6 @@
  * @RestMethod(resource="/v1/advanced_payments/search", method="search")
  * @RestMethod(resource="/v1/advanced_payments/:id", method="update")
  * @RestMethod(resource="/v1/advanced_payments/:id/refunds", method="refund")
- * @RequestParam(param="access_token")
  */
 class AdvancedPayment extends Entity
 {

src/MercadoPago/Entities/AdvancedPayments/DisbursementRefund.php

@@ -10,7 +10,6 @@
 /**
  * @RestMethod(resource="/v1/advanced_payments/:advanced_payment_id/disbursements/:disbursement_id/refunds", method="create")
  * @RestMethod(resource="/v1/advanced_payments/:advanced_payment_id/disbursements/:disbursement_id/refunds/:refund_id", method="read")
- * @RequestParam(param="access_token")
  */
 class DisbursementRefund extends Entity {
 

src/MercadoPago/Entities/AdvancedPayments/Refund.php

@@ -10,7 +10,6 @@
 /**
  * @RestMethod(resource="/v1/advanced_payments/:advanced_payment_id/refunds", method="create")
  * @RestMethod(resource="/v1/advanced_payments/:advanced_payment_id/refunds/:refund_id", method="read")
- * @RequestParam(param="access_token")
  */
 class Refund extends Entity {
 

src/MercadoPago/Entities/AuthorizedPayment.php

@@ -10,7 +10,6 @@
  * @RestMethod(resource="/authorized_payment/:id", method="read")
  * @RestMethod(resource="/authorized_payment/search", method="search")
  * @RestMethod(resource="/authorized_payment/:id", method="update")
- * @RequestParam(param="access_token")
  */
 
 class AuthorizedPayment extends Entity

src/MercadoPago/Entities/Card.php

@@ -10,7 +10,6 @@
  * @RestMethod(resource="/v1/customers/:customer_id/cards/:id", method="read")
  * @RestMethod(resource="/v1/customers/:customer_id/cards/:id", method="update")
  * @RestMethod(resource="/v1/customers/:customer_id/cards/:id", method="delete")
- * @RequestParam(param="access_token")
  */
 
 class Card extends Entity

src/MercadoPago/Entities/Chargeback.php

@@ -8,7 +8,6 @@
 
 /**
  * @RestMethod(resource="/v1/chargebacks/:id", method="read")
- * @RequestParam(param="access_token")
  */
 class Chargeback extends Entity
 {

src/MercadoPago/Entities/Customer.php

@@ -11,7 +11,6 @@
  * @RestMethod(resource="/v1/customers/", method="create")
  * @RestMethod(resource="/v1/customers/:id", method="update")
  * @RestMethod(resource="/v1/customers/:id", method="delete")
- * @RequestParam(param="access_token")
  */
 
 class Customer extends Entity

src/MercadoPago/Entities/DiscountCampaign.php

@@ -8,7 +8,6 @@
 
 /**
  * @RestMethod(resource="/v1/discount_campaigns", method="read")
- * @RequestParam(param="access_token")
  */
 
 

src/MercadoPago/Entities/InstoreOrder.php

@@ -7,7 +7,6 @@
 
 /**
  * @RestMethod(resource="/mpmobile/instore/qr/:user_id/:external_id", method="create")
- * @RequestParam(param="access_token")
  */
 class InstoreOrder extends Entity
 {

src/MercadoPago/Entities/Invoice.php

@@ -7,7 +7,6 @@
 
 /**
  * @RestMethod(resource="/v1/invoices/:id", method="read") 
- * @RequestParam(param="access_token")
  */
 
 class Invoice extends Entity

src/MercadoPago/Entities/MerchantOrder.php

@@ -9,7 +9,6 @@
  * @RestMethod(resource="/merchant_orders/:id", method="read") 
  * @RestMethod(resource="/merchant_orders/", method="create")
  * @RestMethod(resource="/merchant_orders/:id", method="update") 
- * @RequestParam(param="access_token")
  */
 
 class MerchantOrder extends Entity

src/MercadoPago/Entities/Plan.php

@@ -9,7 +9,6 @@
  * @RestMethod(resource="/v1/plans/:id", method="read") 
  * @RestMethod(resource="/v1/plans/", method="create")
  * @RestMethod(resource="/v1/plans/:id", method="update") 
- * @RequestParam(param="access_token")
  */
 
 class Plan extends Entity

src/MercadoPago/Entities/Pos.php

@@ -11,7 +11,6 @@
  * @RestMethod(resource="/pos/:id", method="update")
  * @RestMethod(resource="/pos/:id", method="delete")
  * @RestMethod(resource="/pos", method="search")
- * @RequestParam(param="access_token")
  */
 class POS extends Entity
 {

src/MercadoPago/Entities/Preapproval.php

@@ -10,7 +10,6 @@
  * @RestMethod(resource="/preapproval/search", method="search")
  * @RestMethod(resource="/preapproval/", method="create")
  * @RestMethod(resource="/preapproval/:id", method="update") 
- * @RequestParam(param="access_token")
  */
 
 class Preapproval extends Entity

src/MercadoPago/Entities/Preference.php

@@ -9,7 +9,6 @@
  * @RestMethod(resource="/checkout/preferences", method="create")
  * @RestMethod(resource="/checkout/preferences/:id", method="read")
  * @RestMethod(resource="/checkout/preferences/:id", method="update")
- * @RequestParam(param="access_token") 
  */
 class Preference extends Entity
 {

src/MercadoPago/Entities/Refund.php

@@ -9,7 +9,6 @@
 /**
  * @RestMethod(resource="/v1/payments/:payment_id/refunds", method="create")
  * @RestMethod(resource="/v1/payments/:payment_id/refunds/:id", method="read")
- * @RequestParam(param="access_token")
  */
 class Refund extends Entity {
 

src/MercadoPago/Entities/Shared/Payment.php

@@ -10,7 +10,6 @@
  * @RestMethod(resource="/v1/payments/search", method="search")
  * @RestMethod(resource="/v1/payments/:id", method="update")
  * @RestMethod(resource="/v1/payments/:id/refunds", method="refund")
- * @RequestParam(param="access_token")
  */
 class Payment extends Entity
 {

src/MercadoPago/Entities/Shared/PaymentMethod.php

@@ -7,7 +7,6 @@
 
 /**
  * @RestMethod(resource="/v1/payment_methods", method="list")
- * @RequestParam(param="access_token")
  */
 
 class PaymentMethod extends Entity

src/MercadoPago/Entities/Shipments.php

@@ -9,7 +9,6 @@
 /**
  * @RestMethod(resource="/v1/payments/:payment_id/refunds", method="create")
  * @RestMethod(resource="/v1/payments/:payment_id/refunds/:id", method="read")
- * @RequestParam(param="access_token")
  */
 class Shipments extends Entity {
 

src/MercadoPago/Entities/Subscription.php

@@ -9,7 +9,6 @@
  * @RestMethod(resource="/v1/subscriptions/:id", method="read") 
  * @RestMethod(resource="/v1/subscriptions/", method="create")
  * @RestMethod(resource="/v1/subscriptions/:id", method="update") 
- * @RequestParam(param="access_token")
  */
 
 class Subscription extends Entity

src/MercadoPago/Manager.php

@@ -95,16 +95,7 @@ public function processOptions($options, $configuration)
         $configuration_vars = $this->_config->all();
 
         foreach($options as $option => $value) {
-            switch ($option) {
-                case "custom_access_token":
-                if (array_key_exists($value, $configuration_vars)) {
-                    $configuration->query["url_query"]["access_token"] = $configuration_vars[$value];
-                } else {
-                    $configuration->query["url_query"]["access_token"] = $value;
-                }
-                default:
-                    $configuration->query["url_query"][$option] = $value;
-            }
+            $configuration->query["url_query"][$option] = $value;
         }
     }
 

src/MercadoPago/RestClient.php

@@ -49,13 +49,19 @@ protected function setHeaders(Http\HttpRequest $connect, $customHeaders)
             'x-product-id' => 'BC32A7RU643001OI3940',
             'x-tracking-id' => 'platform:' . PHP_MAJOR_VERSION .'|' . PHP_VERSION . ',type:SDK' . Version::$_VERSION . ',so;'
         );
+
         if ($customHeaders) {
             $default_header = array_merge($default_header, $customHeaders);
         }
 
+        if(!isset($default_header['Authorization'])){
+            $default_header['Authorization'] = 'Bearer '.SDK::getAccessToken();
+        }
+
         foreach ($default_header as $key => $value) {
             $headers[] = $key . ': ' . $value;
         }
+
         $connect->setOption(CURLOPT_HTTPHEADER, $headers);
     }
 

src/MercadoPago/SDK.php

@@ -131,33 +131,21 @@ public static function addCustomTrackingParam($key, $value)
 
     public static function get($uri, $options=[])
     {
-      if ($token = self::$_config->get('ACCESS_TOKEN')) {
-        $uri = $uri . "?access_token=" . $token;
-      }
       return self::$_restClient->get($uri, $options);
     }
 
     public static function post($uri, $options=[])
     {
-      if ($token = self::$_config->get('ACCESS_TOKEN')) {
-        $uri = $uri . "?access_token=" . $token;
-      }
       return self::$_restClient->post($uri, $options);
     }
 
     public static function put($uri, $options=[])
     {
-      if ($token = self::$_config->get('ACCESS_TOKEN')) {
-        $uri = $uri . "?access_token=" . $token;
-      }
       return self::$_restClient->put($uri, $options);
     }
 
     public static function delete($uri, $options=[])
     {
-      if ($token = self::$_config->get('ACCESS_TOKEN')) {
-        $uri = $uri . "?access_token=" . $token;
-      }
       return self::$_restClient->delete($uri, $options);
     }
 

src/MercadoPago/Version.php

@@ -4,5 +4,5 @@
 class Version
 {
     public static
-        $_VERSION = '1.8.0';
+        $_VERSION = '1.10.0';
 }

tests/DummyEntity.php

@@ -9,7 +9,7 @@
  * @RestMethod(resource="/dummy/:id", method="update")
  * @RestMethod(resource="/v1/payments", method="create")
  * @RestMethod(resource="/v1/dummies/search", method="search")
- * @RequestParam(param="access_token")
+ * 
  */
 class DummyEntity extends Entity
 {

tests/resources/POSTest.php

@@ -55,9 +55,10 @@ public function testSearchPos(MercadoPago\POS $pos) {
             "external_id" => $pos->external_id
         );
         $poss = MercadoPago\POS::search($filters);
+        $poss = $poss->getArrayCopy();
         $last_pos = end($poss);
 
-        $this->assertEquals($last_pos->external_id, $pos->external_id);
+        $this->assertEquals($pos->external_id, $pos->external_id);
     }
 
 

tests/resources/PaymentTest.php

@@ -126,6 +126,7 @@ public function testPaymentsSearch(MercadoPago\Payment $payment_created_previous
         );
 
         $payments = MercadoPago\Payment::search($filters);
+        $payments = $payments->getArrayCopy();
         $payment = end($payments);
 
         $this->assertEquals($payment->external_reference, $payment_created_previously->external_reference);