Tranga/LibraryConnectors/Kavita.cs

@@ -37,19 +37,12 @@ public class Kavita : LibraryConnector
             RequestUri = new Uri($"{baseUrl}/api/Account/login"),
             Content = new StringContent($"{{\"username\":\"{username}\",\"password\":\"{password}\"}}", System.Text.Encoding.UTF8, "application/json")
         };
-        try
+        
-        {
+        HttpResponseMessage response = client.Send(requestMessage);
-            HttpResponseMessage response = client.Send(requestMessage);
+        JsonObject? result = JsonSerializer.Deserialize<JsonObject>(response.Content.ReadAsStream());
-            JsonObject? result = JsonSerializer.Deserialize<JsonObject>(response.Content.ReadAsStream());
+        if (result is not null)
-            if (result is not null)
+            return result["token"]!.GetValue<string>();
-                return result["token"]!.GetValue<string>();
+        else throw new Exception("Did not receive token.");
-        }
-        catch (HttpRequestException e)
-        {
-            Console.WriteLine($"Unable to retrieve token:\n\r{e}");
-        }
-        Console.WriteLine("Kavita: Did not receive token.");
-        throw new Exception("Kavita: Did not receive token.");
     }
 
     public override void UpdateLibrary()

Tranga/Server.cs

@@ -401,7 +401,8 @@ public class Server : GlobalBase
                 break;
             case "LibraryConnectors/Update":
                 if (!requestVariables.TryGetValue("libraryConnector", out string? libraryConnectorStr) ||
-                    !Enum.TryParse(libraryConnectorStr, out LibraryConnector.LibraryType libraryConnectorType))
+                    !Enum.TryParse(libraryConnectorStr,
+                        out LibraryConnector.LibraryType libraryConnectorType))
                 {
                     SendResponse(HttpStatusCode.BadRequest, response);
                     break;
@@ -418,7 +419,10 @@ public class Server : GlobalBase
                     }
                     AddLibraryConnector(new Kavita(this, kavitaUrl, kavitaUsername, kavitaPassword));
                     SendResponse(HttpStatusCode.Accepted, response);
-                }else if (libraryConnectorType is LibraryConnector.LibraryType.Komga)
+                    break;
+                }
+
+                if (libraryConnectorType is LibraryConnector.LibraryType.Komga)
                 {
                     if (!requestVariables.TryGetValue("komgaUrl", out string? komgaUrl) ||
                         !requestVariables.TryGetValue("komgaAuth", out string? komgaAuth))
@@ -428,10 +432,7 @@ public class Server : GlobalBase
                     }
                     AddLibraryConnector(new Komga(this, komgaUrl, komgaAuth));
                     SendResponse(HttpStatusCode.Accepted, response);
-                }
+                    break;
-                else
-                {
-                    SendResponse(HttpStatusCode.BadRequest, response);
                 }
                 break;
             case "LogMessages":