refactor(rust): replace rpassword with inquire

rust/agama-cli/Cargo.toml

@@ -25,8 +25,8 @@ zbus = { version = "3", default-features = false, features = ["tokio"] }
 tokio = { version = "1.33.0", features = ["macros", "rt-multi-thread"] }
 async-trait = "0.1.77"
 reqwest = { version = "0.11", features = ["json"] }
-rpassword = "7.3.1"
 url = "2.5.0"
+inquire = { version = "0.7.5", default-features = false, features = ["crossterm", "one-liners"] }
 
 [[bin]]
 name = "agama"

rust/agama-cli/src/auth.rs

@@ -2,6 +2,7 @@ use agama_lib::auth::AuthToken;
 use clap::Subcommand;
 
 use crate::error::CliError;
+use inquire::Password;
 use reqwest::header::{HeaderMap, HeaderValue, CONTENT_TYPE};
 use std::io::{self, IsTerminal};
 
@@ -37,15 +38,25 @@ pub async fn run(subcommand: AuthCommands) -> anyhow::Result<()> {
 fn read_password() -> Result<String, CliError> {
     let stdin = io::stdin();
     let password = if stdin.is_terminal() {
-        rpassword::prompt_password("Please, introduce the root password: ")?
+        ask_password()?
     } else {
         let mut buffer = String::new();
-        stdin.read_line(&mut buffer)?;
+        stdin
+            .read_line(&mut buffer)
+            .map_err(CliError::StdinPassword)?;
         buffer
     };
     Ok(password)
 }
 
+/// Asks interactively for the password. (For authentication, not for changing it)
+fn ask_password() -> Result<String, CliError> {
+    Password::new("Please enter the root password:")
+        .without_confirmation()
+        .prompt()
+        .map_err(CliError::InteractivePassword)
+}
+
 /// Necessary http request header for authenticate
 fn authenticate_headers() -> HeaderMap {
     let mut headers = HeaderMap::new();

rust/agama-cli/src/error.rs

@@ -1,11 +1,14 @@
+use inquire::InquireError;
 use thiserror::Error;
 
 #[derive(Error, Debug)]
 pub enum CliError {
     #[error("Cannot perform the installation as the settings are not valid")]
-    ValidationError,
+    Validation,
     #[error("Could not start the installation")]
-    InstallationError,
-    #[error("Could not read the password: {0}")]
-    MissingPassword(#[from] std::io::Error),
+    Installation,
+    #[error("Could not read the password")]
+    InteractivePassword(#[source] InquireError),
+    #[error("Could not read the password from the standard input")]
+    StdinPassword(#[source] std::io::Error),
 }

rust/agama-cli/src/main.rs

@@ -63,7 +63,7 @@ async fn install(manager: &ManagerClient<'_>, max_attempts: u8) -> anyhow::Resul
     manager.wait().await?;
 
     if !manager.can_install().await? {
-        return Err(CliError::ValidationError)?;
+        return Err(CliError::Validation)?;
     }
 
     let progress = tokio::spawn(async { show_progress().await });
@@ -81,7 +81,7 @@ async fn install(manager: &ManagerClient<'_>, max_attempts: u8) -> anyhow::Resul
         }
         if attempts == max_attempts {
             eprintln!("Giving up.");
-            return Err(CliError::InstallationError)?;
+            return Err(CliError::Installation)?;
         }
         attempts += 1;
         sleep(Duration::from_secs(1));

rust/package/agama.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jun 27 07:02:29 UTC 2024 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
+
+- Improve the prompt to introduce the password in the "auth login"
+  command (gh#openSUSE/agama#1271).
+
 -------------------------------------------------------------------
 Wed Jun 26 12:56:31 UTC 2024 - Knut Anderssen <kanderssen@suse.com>