Merge pull request #147 from nextcloud/fix/138/api-key-image-retrieval

Fix: Use api key in image retrieval request

Author: julien-nc

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;