GET LibraryTypes Create and Test set url to lowercase

Set Komga to also require username and password
C9Glax · Oct 23, 2024 · 96b5921 · 96b5921
1 parent 9d47445
commit 96b5921
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 50 deletions.
diff --git a/Tranga/Server/v2LibraryConnectors.cs b/Tranga/Server/v2LibraryConnectors.cs
@@ -39,24 +39,22 @@ public partial class Server
             return new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.NotFound, $"LibraryType {groups[1].Value} does not exist.");
         }
 
-        if(!requestParameters.TryGetValue("URL", out string? url))
+        if(!requestParameters.TryGetValue("url", out string? url))
             return new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.NotAcceptable, "Parameter 'url' missing.");
+        if(!requestParameters.TryGetValue("username", out string? username))
+            return new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.NotAcceptable, "Parameter 'username' missing.");
+        if(!requestParameters.TryGetValue("password", out string? password))
+            return new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.NotAcceptable, "Parameter 'password' missing.");
 
         switch (libraryType)
         {
             case LibraryConnector.LibraryType.Kavita:
-                if(!requestParameters.TryGetValue("username", out string? username))
-                    return new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.NotAcceptable, "Parameter 'username' missing.");
-                if(!requestParameters.TryGetValue("password", out string? password))
-                    return new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.NotAcceptable, "Parameter 'password' missing.");
                 Kavita kavita = new (this, url, username, password);
                 libraryConnectors.RemoveWhere(lc => lc.libraryType == LibraryConnector.LibraryType.Kavita);
                 libraryConnectors.Add(kavita);
                 return new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.OK, kavita);
             case LibraryConnector.LibraryType.Komga:
-                if(!requestParameters.TryGetValue("auth", out string? auth))
-                    return new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.NotAcceptable, "Parameter 'auth' missing.");
-                Komga komga = new (this, url, auth);
+                Komga komga = new (this, url, username, password);
                 libraryConnectors.RemoveWhere(lc => lc.libraryType == LibraryConnector.LibraryType.Komga);
                 libraryConnectors.Add(komga);
                 return new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.OK, komga);
@@ -72,26 +70,24 @@ public partial class Server
             return new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.NotFound, $"LibraryType {groups[1].Value} does not exist.");
         }
 
-        if(!requestParameters.TryGetValue("URL", out string? url))
+        if(!requestParameters.TryGetValue("url", out string? url))
             return new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.NotAcceptable, "Parameter 'url' missing.");
+        if(!requestParameters.TryGetValue("username", out string? username))
+            return new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.NotAcceptable, "Parameter 'username' missing.");
+        if(!requestParameters.TryGetValue("password", out string? password))
+            return new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.NotAcceptable, "Parameter 'password' missing.");
 
         switch (libraryType)
         {
             case LibraryConnector.LibraryType.Kavita:
-                if(!requestParameters.TryGetValue("username", out string? username))
-                    return new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.NotAcceptable, "Parameter 'username' missing.");
-                if(!requestParameters.TryGetValue("password", out string? password))
-                    return new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.NotAcceptable, "Parameter 'password' missing.");
                 Kavita kavita = new (this, url, username, password);
                 return kavita.Test() switch
                 {
                     true => new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.OK, kavita),
                     _ => new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.FailedDependency, kavita)
                 };
             case LibraryConnector.LibraryType.Komga:
-                if(!requestParameters.TryGetValue("auth", out string? auth))
-                    return new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.NotAcceptable, "Parameter 'auth' missing.");
-                Komga komga = new (this, url, auth);
+                Komga komga = new (this, url, username, password);
                 return komga.Test() switch
                 {
                     true => new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.OK, komga),

diff --git a/docs/API_Calls_v2.md b/docs/API_Calls_v2.md
@@ -803,23 +803,11 @@ Creates a Library-Connector of the specified Type.
 
   `Type` is returned by [GET /v2/LibraryConnector/Types](#-v2libraryconnectortypes)
 
-  | Parameter   | Value              |
-  |-------------|--------------------|
-  | URL         | URL of the Library |
-
-  #### Type specific Parameters (must be included for each)
-  * Komga
-
-  | Parameter | Value                                                                                                             |
-  |-----------|-------------------------------------------------------------------------------------------------------------------|
-  | auth      | [Base64 encoded Basic-Authentication-String](https://datatracker.ietf.org/doc/html/rfc7617) (`username:password`) |
-
-  * Kavita
-
-  | Parameter | Value           |
-  |-----------|-----------------|
-  | username  | Kavita Username |
-  | password  | Kavita Password |
+  | Parameter | Value              |
+  |-----------|--------------------|
+  | url       | URL of the Library |
+  | username  | Username           |
+  | password  | Password           |
 </details>
 
 <details>
@@ -843,23 +831,11 @@ Tests a Library-Connector of the specified Type.
 
   `Type` is returned by [GET /v2/LibraryConnector/Types](#-v2libraryconnectortypes)
 
-  | Parameter   | Value              |
-  |-------------|--------------------|
-  | URL         | URL of the Library |
-
-  #### Type specific Parameters (must be included for each)
-  * Komga
-
-  | Parameter | Value                                                                                                             |
-  |-----------|-------------------------------------------------------------------------------------------------------------------|
-  | auth      | [Base64 encoded Basic-Authentication-String](https://datatracker.ietf.org/doc/html/rfc7617) (`username:password`) |
-
-  * Kavita
-
-  | Parameter | Value           |
-  |-----------|-----------------|
-  | username  | Kavita Username |
-  | password  | Kavita Password |
+  | Parameter | Value              |
+  |-----------|--------------------|
+  | url       | URL of the Library |
+  | username  | Username           |
+  | password  | Password           |
   </details>
 
   <details>