From 336e4c7fea2b37b7b920129dab12bd65a4222ea0 Mon Sep 17 00:00:00 2001
From: Marianne Bianca De Melo Bezerra <marianne.bezerra@mercadolivre.com>
Date: Wed, 24 Apr 2024 18:38:29 -0300
Subject: [PATCH 1/3] adjusting set of access token

---
 src/main/java/com/mercadopago/client/MercadoPagoClient.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/main/java/com/mercadopago/client/MercadoPagoClient.java b/src/main/java/com/mercadopago/client/MercadoPagoClient.java
index 03470cb1..876c3bf5 100644
--- a/src/main/java/com/mercadopago/client/MercadoPagoClient.java
+++ b/src/main/java/com/mercadopago/client/MercadoPagoClient.java
@@ -285,7 +285,7 @@ private Map<String, String> addDefaultHeaders(MPRequest request) {
     }
 
     if (!request.getUri().contains(OAUTH_TOKEN) && !headers.containsKey(Headers.AUTHORIZATION)) {
-      headers.put(Headers.AUTHORIZATION, String.format(BEARER, getAccessToken(null)));
+      headers.put(Headers.AUTHORIZATION, String.format(BEARER, request.getAccessToken()));
     }
     return headers;
   }
@@ -298,10 +298,6 @@ private Map<String, String> addCustomHeaders(String uri, MPRequestOptions reques
       }
     }
 
-    if (!uri.contains(OAUTH_TOKEN)) {
-      headers.put(Headers.AUTHORIZATION, String.format(BEARER, getAccessToken(requestOptions)));
-    }
-
     return headers;
   }
 

From 2a38af1d83cc989265582325e0fc5bc7531d2eed Mon Sep 17 00:00:00 2001
From: Marianne Bianca De Melo Bezerra <marianne.bezerra@mercadolivre.com>
Date: Thu, 25 Apr 2024 17:01:25 -0300
Subject: [PATCH 2/3] adjusting set of access token

---
 src/main/java/com/mercadopago/client/MercadoPagoClient.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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

From bbfd8fa5439d86e812a6530ca52f351272c621fc Mon Sep 17 00:00:00 2001
From: Marianne Bianca De Melo Bezerra <marianne.bezerra@mercadolivre.com>
Date: Fri, 26 Apr 2024 09:48:04 -0300
Subject: [PATCH 3/3] adjust version

---
 README.md                                            | 2 +-
 pom.xml                                              | 2 +-
 src/main/java/com/mercadopago/MercadoPagoConfig.java | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index a5df5791..38af948e 100644
--- 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
index fdac1cdb..478eab59 100644
--- 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
index 673e510c..7644d413 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.22";
+  public static final String CURRENT_VERSION = "2.1.23";
 
   public static final String PRODUCT_ID = "BC32A7VTRPP001U8NHJ0";