Possible fix for issue #2218, allowing to disable setting the Authorization header.

Signed-off-by: pbakker <[email protected]>

Author: paulbakker

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiApi.java

@@ -34,6 +34,7 @@
 import org.springframework.ai.model.ApiKey;
 import org.springframework.ai.model.ChatModelDescription;
 import org.springframework.ai.model.ModelOptionsUtils;
+import org.springframework.ai.model.NoopApiKey;
 import org.springframework.ai.model.SimpleApiKey;
 import org.springframework.ai.openai.api.common.OpenAiApiConstants;
 import org.springframework.ai.retry.RetryUtils;
@@ -200,7 +201,10 @@ public OpenAiApi(String baseUrl, ApiKey apiKey, MultiValueMap<String, String> he
 		this.embeddingsPath = embeddingsPath;
 		// @formatter:off
 		Consumer<HttpHeaders> finalHeaders = h -> {
-			h.setBearerAuth(apiKey.getValue());
+			if(!(apiKey instanceof NoopApiKey)) {
+				h.setBearerAuth(apiKey.getValue());
+			}
+
 			h.setContentType(MediaType.APPLICATION_JSON);
 			h.addAll(headers);
 		};

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiAudioApi.java

@@ -72,7 +72,14 @@ public OpenAiAudioApi(String openAiToken) {
 	public OpenAiAudioApi(String baseUrl, String openAiToken, RestClient.Builder restClientBuilder,
 			ResponseErrorHandler responseErrorHandler) {
 
-		Consumer<HttpHeaders> authHeaders = h -> h.setBearerAuth(openAiToken);
+		Consumer<HttpHeaders> authHeaders;
+		if (openAiToken != null && !openAiToken.isEmpty()) {
+			authHeaders = h -> h.setBearerAuth(openAiToken);
+		}
+		else {
+			authHeaders = h -> {
+			};
+		}
 
 		this.restClient = restClientBuilder.baseUrl(baseUrl)
 			.defaultHeaders(authHeaders)
@@ -111,7 +118,9 @@ public OpenAiAudioApi(String baseUrl, String apiKey, MultiValueMap<String, Strin
 			ResponseErrorHandler responseErrorHandler) {
 
 		Consumer<HttpHeaders> authHeaders = h -> {
-			h.setBearerAuth(apiKey);
+			if (apiKey != null && !apiKey.isEmpty()) {
+				h.setBearerAuth(apiKey);
+			}
 			h.addAll(headers);
 			// h.setContentType(MediaType.APPLICATION_JSON);
 		};
@@ -135,7 +144,7 @@ public ResponseEntity<byte[]> createSpeech(SpeechRequest requestBody) {
 
 	/**
 	 * Streams audio generated from the input text.
-	 *
+	 * <p>
 	 * This method sends a POST request to the OpenAI API to generate audio from the
 	 * provided text. The audio is streamed back as a Flux of ResponseEntity objects, each
 	 * containing a byte array of the audio data.

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiImageApi.java

@@ -87,7 +87,9 @@ public OpenAiImageApi(String baseUrl, String apiKey, MultiValueMap<String, Strin
 		// @formatter:off
 		this.restClient = restClientBuilder.baseUrl(baseUrl)
 			.defaultHeaders(h -> {
-				h.setBearerAuth(apiKey);
+				if(apiKey != null && !apiKey.isEmpty()) {
+					h.setBearerAuth(apiKey);
+				}
 				h.setContentType(MediaType.APPLICATION_JSON);
 				h.addAll(headers);
 			})

models/spring-ai-openai/src/main/java/org/springframework/ai/openai/api/OpenAiModerationApi.java

@@ -20,7 +20,6 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
-
 import org.springframework.ai.retry.RetryUtils;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -59,7 +58,9 @@ public OpenAiModerationApi(String baseUrl, String openAiToken, RestClient.Builde
 		this.objectMapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 
 		this.restClient = restClientBuilder.baseUrl(baseUrl).defaultHeaders(h -> {
-			h.setBearerAuth(openAiToken);
+			if (openAiToken != null && !openAiToken.isEmpty()) {
+				h.setBearerAuth(openAiToken);
+			}
 			h.setContentType(MediaType.APPLICATION_JSON);
 		}).defaultStatusHandler(responseErrorHandler).build();
 	}

spring-ai-core/src/main/java/org/springframework/ai/model/NoopApiKey.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright 2025-2025 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.ai.model;
+
+/**
+ * This implementation of ApiKey indicates that no API key should be used, e.g. no HTTP
+ * headers should be set.
+ *
+ * @author Paul Bakker
+ */
+public class NoopApiKey implements ApiKey {
+
+	@Override
+	public String getValue() {
+		return "";
+	}
+
+}