adjusting set of access token

mercadopago · Apr 25, 2024 · 2a38af1 · 2a38af1
1 parent 336e4c7
commit 2a38af1
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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;
   }