From 056276d6268f57a4317be53dc3a0006f7d1f1f85 Mon Sep 17 00:00:00 2001
From: PhilKes <phil.kessler@gmx.de>
Date: Thu, 8 Feb 2024 13:34:29 +0100
Subject: [PATCH] fix: Skip AbstractCredentialsManager.setCredential if
 credential is null

---
 .../codegpt/credentials/AbstractCredentialsManager.java     | 3 +++
 .../codegpt/settings/service/azure/AzureSettingsForm.java   | 5 +----
 .../service/llama/form/LlamaServerPreferencesForm.java      | 5 +----
 .../codegpt/settings/service/openai/OpenAISettingsForm.java | 6 ++++--
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/main/java/ee/carlrobert/codegpt/credentials/AbstractCredentialsManager.java b/src/main/java/ee/carlrobert/codegpt/credentials/AbstractCredentialsManager.java
index 937c3d6e..1e597497 100644
--- a/src/main/java/ee/carlrobert/codegpt/credentials/AbstractCredentialsManager.java
+++ b/src/main/java/ee/carlrobert/codegpt/credentials/AbstractCredentialsManager.java
@@ -46,6 +46,9 @@ abstract class AbstractCredentialsManager {
   }
 
   protected void setCredential(String key, String credential) {
+    if (credential == null) {
+      return;
+    }
     passwordSafe.setPassword(credentialMapping.get(key), credential);
     credentialCache.put(key, credential);
   }
diff --git a/src/main/java/ee/carlrobert/codegpt/settings/service/azure/AzureSettingsForm.java b/src/main/java/ee/carlrobert/codegpt/settings/service/azure/AzureSettingsForm.java
index 4c867366..04332473 100644
--- a/src/main/java/ee/carlrobert/codegpt/settings/service/azure/AzureSettingsForm.java
+++ b/src/main/java/ee/carlrobert/codegpt/settings/service/azure/AzureSettingsForm.java
@@ -152,10 +152,7 @@ public class AzureSettingsForm {
 
   public @Nullable String getApiKey() {
     var apiKey = new String(azureApiKeyField.getPassword());
-    if (apiKey.isEmpty()) {
-      return null;
-    }
-    return apiKey;
+    return apiKey.isEmpty() ? null : apiKey;
   }
 
   private void registerPanelsVisibility(AzureSettingsState azureSettings) {
diff --git a/src/main/java/ee/carlrobert/codegpt/settings/service/llama/form/LlamaServerPreferencesForm.java b/src/main/java/ee/carlrobert/codegpt/settings/service/llama/form/LlamaServerPreferencesForm.java
index 15806804..c3f86f18 100644
--- a/src/main/java/ee/carlrobert/codegpt/settings/service/llama/form/LlamaServerPreferencesForm.java
+++ b/src/main/java/ee/carlrobert/codegpt/settings/service/llama/form/LlamaServerPreferencesForm.java
@@ -349,10 +349,7 @@ public class LlamaServerPreferencesForm {
 
   public @Nullable String getApiKey() {
     var apiKey = new String(apiKeyField.getPassword());
-    if (apiKey.isEmpty()) {
-      return null;
-    }
-    return new String(apiKeyField.getPassword());
+    return apiKey.isEmpty() ? null : apiKey;
   }
 
   public InfillPromptTemplate getInfillPromptTemplate() {
diff --git a/src/main/java/ee/carlrobert/codegpt/settings/service/openai/OpenAISettingsForm.java b/src/main/java/ee/carlrobert/codegpt/settings/service/openai/OpenAISettingsForm.java
index bf160b9d..c9860bb0 100644
--- a/src/main/java/ee/carlrobert/codegpt/settings/service/openai/OpenAISettingsForm.java
+++ b/src/main/java/ee/carlrobert/codegpt/settings/service/openai/OpenAISettingsForm.java
@@ -13,6 +13,7 @@ import ee.carlrobert.codegpt.CodeGPTBundle;
 import ee.carlrobert.codegpt.credentials.OpenAICredentialManager;
 import ee.carlrobert.codegpt.ui.UIUtil;
 import ee.carlrobert.llm.client.openai.completion.OpenAIChatCompletionModel;
+import javax.annotation.Nullable;
 import javax.swing.JPanel;
 
 public class OpenAISettingsForm {
@@ -77,8 +78,9 @@ public class OpenAISettingsForm {
         .getPanel();
   }
 
-  public String getApiKey() {
-    return new String(openAIApiKeyField.getPassword());
+  public @Nullable String getApiKey() {
+    var apiKey = new String(openAIApiKeyField.getPassword());
+    return apiKey.isEmpty() ? null : apiKey;
   }
 
   public String getModel() {