diff --git a/README.md b/README.md
index 38af948e..f8a6237b 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,7 @@ already.
com.mercadopago
sdk-java
- 2.1.23
+ 2.1.24
```
diff --git a/pom.xml b/pom.xml
index 478eab59..c27cf1f5 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.mercadopago
sdk-java
- 2.1.23
+ 2.1.24
jar
Mercadopago SDK
diff --git a/src/main/java/com/mercadopago/MercadoPagoConfig.java b/src/main/java/com/mercadopago/MercadoPagoConfig.java
index 7644d413..9dcde678 100644
--- 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.23";
+ public static final String CURRENT_VERSION = "2.1.24";
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
index 1f8d5b44..855cc1e0 100644
--- a/src/main/java/com/mercadopago/client/MercadoPagoClient.java
+++ b/src/main/java/com/mercadopago/client/MercadoPagoClient.java
@@ -284,12 +284,17 @@ private Map addDefaultHeaders(MPRequest request) {
headers.put(Headers.IDEMPOTENCY_KEY, request.createIdempotencyKey());
}
- if (request!= null && !request.getUri().contains(OAUTH_TOKEN) && request.getAccessToken() != null) {
- headers.put(Headers.AUTHORIZATION, String.format(BEARER, request.getAccessToken()));
+ if (nonNull(request) && !request.getUri().contains(OAUTH_TOKEN) && !headers.containsKey(Headers.AUTHORIZATION)) {
+ headers.put(Headers.AUTHORIZATION, String.format(BEARER, chooseAccessToken(request)));
}
+
return headers;
}
+ private String chooseAccessToken(MPRequest request) {
+ return request.getAccessToken() != null ? request.getAccessToken() : MercadoPagoConfig.getAccessToken();
+ }
+
private Map addCustomHeaders(String uri, MPRequestOptions requestOptions) {
Map headers = new HashMap<>();
if (nonNull(requestOptions) && nonNull(requestOptions.getCustomHeaders())) {