diff --git a/Tranga-CLI/Tranga_Cli.cs b/Tranga-CLI/Tranga_Cli.cs index fdaa42f..106a59c 100644 --- a/Tranga-CLI/Tranga_Cli.cs +++ b/Tranga-CLI/Tranga_Cli.cs @@ -82,32 +82,12 @@ public static class Tranga_Cli if (tmpUrlKavita.Length > 0) { Console.WriteLine("Username:"); - string? tmpUser = Console.ReadLine(); - while (tmpUser is null || tmpUser.Length < 1) - tmpUser = Console.ReadLine(); - - Console.WriteLine("Password:"); - string tmpPass = string.Empty; - ConsoleKey key; - do - { - var keyInfo = Console.ReadKey(intercept: true); - key = keyInfo.Key; - - if (key == ConsoleKey.Backspace && tmpPass.Length > 0) - { - Console.Write("\b \b"); - tmpPass = tmpPass[0..^1]; - } - else if (!char.IsControl(keyInfo.KeyChar)) - { - Console.Write("*"); - tmpPass += keyInfo.KeyChar; - } - } while (key != ConsoleKey.Enter); + string? tmpApiKey = Console.ReadLine(); + while (tmpApiKey is null || tmpApiKey.Length < 1) + tmpApiKey = Console.ReadLine(); settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Kavita)); - settings.libraryManagers.Add(new Kavita(tmpUrlKavita, tmpUser, tmpPass, logger)); + settings.libraryManagers.Add(new Kavita(tmpUrlKavita, tmpApiKey, logger)); } logger.WriteLine("Tranga_CLI", "Loaded."); diff --git a/Tranga/LibraryManagers/Kavita.cs b/Tranga/LibraryManagers/Kavita.cs index 8e63c03..647d20c 100644 --- a/Tranga/LibraryManagers/Kavita.cs +++ b/Tranga/LibraryManagers/Kavita.cs @@ -6,13 +6,7 @@ namespace Tranga.LibraryManagers; public class Kavita : LibraryManager { - public Kavita(string baseUrl, string username, string password, Logger? logger) - : base(baseUrl, Convert.ToBase64String(System.Text.Encoding.ASCII.GetBytes($"{username}:{password}")), logger) - { - this.libraryType = LibraryType.Kavita; - } - - public Kavita(string baseUrl, string auth, Logger? logger) : base(baseUrl, auth, logger) + public Kavita(string baseUrl, string apiKey, Logger? logger) : base(baseUrl, apiKey, logger) { this.libraryType = LibraryType.Kavita; }