fix: dedupe,interrupexception handle

Author: SoulPancake

src/main/java/dev/openfga/sdk/api/BaseStreamingApi.java

@@ -168,18 +168,19 @@ protected HttpRequest buildHttpRequest(String method, String path, Object body,
             byte[] bodyBytes = objectMapper.writeValueAsBytes(body);
             HttpRequest.Builder requestBuilder = ApiClient.requestBuilder(method, path, bodyBytes, configuration);
 
-            // Attach authorization header if credentials are configured
-            String accessToken = apiClient.getAccessToken(configuration);
-            if (accessToken != null) {
-                requestBuilder.header("Authorization", "Bearer " + accessToken);
-            }
-
             // Apply request interceptors if any
             var interceptor = apiClient.getRequestInterceptor();
             if (interceptor != null) {
                 interceptor.accept(requestBuilder);
             }
 
+            // Attach authorization header if credentials are configured
+            // Applied after interceptors to avoid duplicate headers
+            String accessToken = apiClient.getAccessToken(configuration);
+            if (accessToken != null) {
+                requestBuilder.setHeader("Authorization", "Bearer " + accessToken);
+            }
+
             return requestBuilder.build();
         } catch (ApiException e) {
             throw e;

src/main/java/dev/openfga/sdk/api/OpenFgaApi.java

@@ -1347,20 +1347,6 @@ private String pathWithParams(String basePath, Object... params) {
      * @throws IllegalStateException when the configuration is invalid
      */
     private String getAccessToken(Configuration configuration) throws ApiException {
-        CredentialsMethod credentialsMethod = configuration.getCredentials().getCredentialsMethod();
-
-        if (credentialsMethod == CredentialsMethod.API_TOKEN) {
-            return configuration.getCredentials().getApiToken().getToken();
-        }
-
-        if (credentialsMethod == CredentialsMethod.CLIENT_CREDENTIALS) {
-            try {
-                return oAuth2Client.getAccessToken().get();
-            } catch (Exception e) {
-                throw new ApiException(e);
-            }
-        }
-
-        throw new IllegalStateException("Configuration is invalid.");
+        return apiClient.getAccessToken(configuration);
     }
 }

src/main/java/dev/openfga/sdk/api/client/ApiClient.java

@@ -376,6 +376,9 @@ public String getAccessToken(Configuration configuration) throws ApiException {
                 return oAuth2Client.getAccessToken().get();
             } catch (ApiException e) {
                 throw e;
+            } catch (InterruptedException e) {
+                Thread.currentThread().interrupt();
+                throw new ApiException(e);
             } catch (Exception e) {
                 throw new ApiException(e);
             }

src/main/java/dev/openfga/sdk/api/client/ApiExecutorRequestBuilder.java

@@ -206,13 +206,17 @@ HttpRequest buildHttpRequest(Configuration configuration, ApiClient apiClient)
             httpRequestBuilder = ApiClient.requestBuilder(method.name(), resolvedPath, configuration);
         }
 
-        // Attach authorization header if credentials are configured
+        headers.forEach(httpRequestBuilder::header);
+
+        // Attach authorization header if credentials are configured and the caller
+        // has not already provided one.
+        boolean hasAuthorizationHeader =
+                headers.keySet().stream().anyMatch("Authorization"::equalsIgnoreCase);
         String accessToken = apiClient.getAccessToken(configuration);
-        if (accessToken != null) {
+        if (!hasAuthorizationHeader && accessToken != null) {
             httpRequestBuilder.header("Authorization", "Bearer " + accessToken);
         }
 
-        headers.forEach(httpRequestBuilder::header);
 
         if (apiClient.getRequestInterceptor() != null) {
             apiClient.getRequestInterceptor().accept(httpRequestBuilder);

src/test/java/dev/openfga/sdk/api/client/OpenFgaClientTest.java

@@ -13,6 +13,7 @@
 import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo;
 import com.github.tomakehurst.wiremock.junit5.WireMockTest;
 import com.pgssoft.httpclient.HttpClientMock;
+import dev.openfga.sdk.api.auth.OAuth2Client;
 import dev.openfga.sdk.api.client.model.*;
 import dev.openfga.sdk.api.configuration.*;
 import dev.openfga.sdk.api.model.*;
@@ -88,6 +89,27 @@ public void beforeEachTest() throws Exception {
         when(mockApiClient.getObjectMapper()).thenReturn(new ObjectMapper());
         when(mockApiClient.getHttpClientBuilder()).thenReturn(mockHttpClientBuilder);
 
+        // Allow setOAuth2Client to store the value and getAccessToken to use real logic
+        final OAuth2Client[] oAuth2ClientHolder = new OAuth2Client[1];
+        doAnswer(invocation -> {
+            oAuth2ClientHolder[0] = invocation.getArgument(0);
+            return null;
+        }).when(mockApiClient).setOAuth2Client(any());
+        when(mockApiClient.getAccessToken(any())).thenAnswer(invocation -> {
+            Configuration config = invocation.getArgument(0);
+            var credentialsMethod = config.getCredentials().getCredentialsMethod();
+            if (credentialsMethod == dev.openfga.sdk.api.configuration.CredentialsMethod.NONE) {
+                return null;
+            }
+            if (credentialsMethod == dev.openfga.sdk.api.configuration.CredentialsMethod.API_TOKEN) {
+                return config.getCredentials().getApiToken().getToken();
+            }
+            if (credentialsMethod == dev.openfga.sdk.api.configuration.CredentialsMethod.CLIENT_CREDENTIALS) {
+                return oAuth2ClientHolder[0].getAccessToken().get();
+            }
+            return null;
+        });
+
         fga = new OpenFgaClient(clientConfiguration, mockApiClient);
     }