Merge pull request #285 from mercadopago/fix/adjusting-set-access-token

[FIX] Adjusting set of access token
mercadopago · Apr 26, 2024 · 4facb9f · 4facb9f
2 parents 9e5d252 + bbfd8fa
commit 4facb9f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ already.
 <dependency>
     <groupId>com.mercadopago</groupId>
     <artifactId>sdk-java</artifactId>
-    <version>2.1.22</version>
+    <version>2.1.23</version>
 </dependency>
   ```
 

diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>com.mercadopago</groupId>
     <artifactId>sdk-java</artifactId>
-    <version>2.1.22</version>
+    <version>2.1.23</version>
     <packaging>jar</packaging>
 
     <name>Mercadopago SDK</name>

diff --git a/src/main/java/com/mercadopago/MercadoPagoConfig.java b/src/main/java/com/mercadopago/MercadoPagoConfig.java
@@ -15,7 +15,7 @@
 /** Mercado Pago configuration class. */
 public class MercadoPagoConfig {
 
-  public static final String CURRENT_VERSION = "2.1.22";
+  public static final String CURRENT_VERSION = "2.1.23";
 
   public static final String PRODUCT_ID = "BC32A7VTRPP001U8NHJ0";
 

diff --git a/src/main/java/com/mercadopago/client/MercadoPagoClient.java b/src/main/java/com/mercadopago/client/MercadoPagoClient.java
@@ -284,8 +284,8 @@ private Map<String, String> addDefaultHeaders(MPRequest request) {
       headers.put(Headers.IDEMPOTENCY_KEY, request.createIdempotencyKey());
     }
 
-    if (!request.getUri().contains(OAUTH_TOKEN) && !headers.containsKey(Headers.AUTHORIZATION)) {
-      headers.put(Headers.AUTHORIZATION, String.format(BEARER, getAccessToken(null)));
+    if (request!= null && !request.getUri().contains(OAUTH_TOKEN) && request.getAccessToken() != null) {
+      headers.put(Headers.AUTHORIZATION, String.format(BEARER, request.getAccessToken()));
     }
     return headers;
   }
@@ -298,7 +298,7 @@ private Map<String, String> addCustomHeaders(String uri, MPRequestOptions reques
       }
     }
 
-    if (!uri.contains(OAUTH_TOKEN)) {
+    if (requestOptions!= null && !uri.contains(OAUTH_TOKEN)) {
       headers.put(Headers.AUTHORIZATION, String.format(BEARER, getAccessToken(requestOptions)));
     }