Adjust the rule that sets the access token

mercadopago · May 20, 2024 · ecbc41b · ecbc41b
1 parent 4facb9f
commit ecbc41b
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/main/java/com/mercadopago/client/MercadoPagoClient.java b/src/main/java/com/mercadopago/client/MercadoPagoClient.java
@@ -284,12 +284,17 @@ private Map<String, String> 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<String, String> addCustomHeaders(String uri, MPRequestOptions requestOptions) {
     Map<String, String> headers = new HashMap<>();
     if (nonNull(requestOptions) && nonNull(requestOptions.getCustomHeaders())) {