From 1f06ee6f2e32129fe798362c5997b5765a15a35d Mon Sep 17 00:00:00 2001 From: Julien Veyssier Date: Tue, 22 Oct 2024 17:13:13 +0200 Subject: [PATCH] use api key in image retrieval request Signed-off-by: Julien Veyssier --- lib/Service/OpenAiAPIService.php | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/lib/Service/OpenAiAPIService.php b/lib/Service/OpenAiAPIService.php index 69136540..0904c323 100644 --- a/lib/Service/OpenAiAPIService.php +++ b/lib/Service/OpenAiAPIService.php @@ -593,12 +593,17 @@ public function getImageRequestOptions(?string $userId): array { ], ]; - $useBasicAuth = $this->openAiSettingsService->getUseBasicAuth(); - if ($useBasicAuth && !$this->isUsingOpenAi()) { - $basicUser = $this->openAiSettingsService->getUserBasicUser($userId, true); - $basicPassword = $this->openAiSettingsService->getUserBasicPassword($userId, true); - if ($basicUser !== '' && $basicPassword !== '') { - $requestOptions['headers']['Authorization'] = 'Basic ' . base64_encode($basicUser . ':' . $basicPassword); + if (!$this->isUsingOpenAi()) { + $useBasicAuth = $this->openAiSettingsService->getUseBasicAuth(); + if ($useBasicAuth) { + $basicUser = $this->openAiSettingsService->getUserBasicUser($userId, true); + $basicPassword = $this->openAiSettingsService->getUserBasicPassword($userId, true); + if ($basicUser !== '' && $basicPassword !== '') { + $requestOptions['headers']['Authorization'] = 'Basic ' . base64_encode($basicUser . ':' . $basicPassword); + } + } else { + $apiKey = $this->openAiSettingsService->getUserApiKey($userId, true); + $requestOptions['headers']['Authorization'] = 'Bearer ' . $apiKey; } } return $requestOptions;