From 24ea53bd2f98254424dee463f535e86a81ed1a8d Mon Sep 17 00:00:00 2001
From: kikootwo <folcards@yahoo.com>
Date: Wed, 7 Jan 2026 10:31:57 -0500
Subject: [PATCH] Improve SABnzbd API key handling and settings UI

Clear credentials when switching download client types in the admin settings page and update validation logic for enabling the test connection button. In SABnzbd service, trim API key input and add explicit validation and error handling for missing or invalid API keys during connection tests.
---
 src/app/admin/settings/page.tsx         | 14 ++++++++--
 src/lib/integrations/sabnzbd.service.ts | 36 ++++++++++++++++++++++++-
 2 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/src/app/admin/settings/page.tsx b/src/app/admin/settings/page.tsx
index 9460e5e..d695c4a 100644
--- a/src/app/admin/settings/page.tsx
+++ b/src/app/admin/settings/page.tsx
@@ -1532,9 +1532,15 @@ export default function AdminSettings() {
                   <select
                     value={settings.downloadClient.type}
                     onChange={(e) => {
+                      // Clear credentials when switching client types
                       setSettings({
                         ...settings,
-                        downloadClient: { ...settings.downloadClient, type: e.target.value },
+                        downloadClient: {
+                          ...settings.downloadClient,
+                          type: e.target.value,
+                          username: '', // Clear username (only used by qBittorrent)
+                          password: '', // Clear password/API key
+                        },
                       });
                       setValidated({ ...validated, download: false });
                     }}
@@ -1775,7 +1781,11 @@ export default function AdminSettings() {
                   <Button
                     onClick={testDownloadClientConnection}
                     loading={testing}
-                    disabled={!settings.downloadClient.url || !settings.downloadClient.username || !settings.downloadClient.password}
+                    disabled={
+                      !settings.downloadClient.url ||
+                      !settings.downloadClient.password ||
+                      (settings.downloadClient.type === 'qbittorrent' && !settings.downloadClient.username)
+                    }
                     variant="outline"
                     className="w-full"
                   >
diff --git a/src/lib/integrations/sabnzbd.service.ts b/src/lib/integrations/sabnzbd.service.ts
index 22fa265..4920d5f 100644
--- a/src/lib/integrations/sabnzbd.service.ts
+++ b/src/lib/integrations/sabnzbd.service.ts
@@ -91,7 +91,7 @@ export class SABnzbdService {
     disableSSLVerify: boolean = false
   ) {
     this.baseUrl = baseUrl.replace(/\/$/, '');
-    this.apiKey = apiKey;
+    this.apiKey = apiKey?.trim() || '';
     this.defaultCategory = defaultCategory;
     this.disableSSLVerify = disableSSLVerify;
 
@@ -114,6 +114,40 @@ export class SABnzbdService {
    */
   async testConnection(): Promise<{ success: boolean; version?: string; error?: string }> {
     try {
+      // Validate API key is not empty
+      if (!this.apiKey || this.apiKey.trim() === '') {
+        return {
+          success: false,
+          error: 'API key is required for SABnzbd',
+        };
+      }
+
+      // Use queue endpoint to test authentication (requires valid API key)
+      const response = await this.client.get('/api', {
+        params: {
+          mode: 'queue',
+          output: 'json',
+          apikey: this.apiKey,
+        },
+      });
+
+      // Check if SABnzbd returned an error (invalid API key)
+      // SABnzbd can return errors in different formats:
+      // - { status: false, error: "message" }
+      // - { error: "message" }
+      // - Plain text error
+      if (response.data?.status === false || response.data?.error) {
+        const errorMsg = response.data?.error || 'Authentication failed';
+        return {
+          success: false,
+          error: errorMsg.includes('API Key')
+            ? 'Invalid API key. Check your SABnzbd configuration (Config → General → API Key).'
+            : errorMsg,
+        };
+      }
+
+      // Queue endpoint requires auth - if we got here, API key is valid
+      // Now get the version
       const version = await this.getVersion();
       return { success: true, version };
     } catch (error) {