Merge architecture_2024 again

rust/agama-cli/Cargo.toml

@@ -27,6 +27,7 @@ tokio = { version = "1.33.0", features = ["macros", "rt-multi-thread"] }
 async-trait = "0.1.77"
 reqwest = { version = "0.11", features = ["json"] }
 home = "0.5.9"
+rpassword = "7.3.1"
 
 [[bin]]
 name = "agama"

rust/agama-cli/src/auth.rs

@@ -9,6 +9,7 @@ use std::os::unix::fs::PermissionsExt;
 use std::path::{Path, PathBuf};
 
 const DEFAULT_JWT_FILE: &str = ".agama/agama-jwt";
+const DEFAULT_AGAMA_TOKEN_FILE: &str = "/run/agama/token";
 const DEFAULT_AUTH_URL: &str = "http://localhost:3000/api/auth";
 const DEFAULT_FILE_MODE: u32 = 0o600;
 
@@ -33,8 +34,19 @@ pub async fn run(subcommand: AuthCommands) -> anyhow::Result<()> {
     }
 }
 
+/// Returns the stored Agama token.
+pub fn agama_token() -> anyhow::Result<String> {
+    if let Some(file) = agama_token_file() {
+        if let Ok(token) = read_line_from_file(file.as_path()) {
+            return Ok(token);
+        }
+    }
+
+    Err(anyhow::anyhow!("Authentication token not available"))
+}
+
 /// Reads stored token and returns it
-fn jwt() -> anyhow::Result<String> {
+pub fn jwt() -> anyhow::Result<String> {
     if let Some(file) = jwt_file() {
         if let Ok(token) = read_line_from_file(file.as_path()) {
             return Ok(token);
@@ -109,6 +121,10 @@ impl Credentials for MissingCredentials {
 fn jwt_file() -> Option<PathBuf> {
     Some(home::home_dir()?.join(DEFAULT_JWT_FILE))
 }
+/// Path to agama-live token file.
+fn agama_token_file() -> Option<PathBuf> {
+    home::home_dir().map(|p| p.join(DEFAULT_AGAMA_TOKEN_FILE))
+}
 
 /// Reads first line from given file
 fn read_line_from_file(path: &Path) -> io::Result<String> {
@@ -137,12 +153,9 @@ fn read_line_from_file(path: &Path) -> io::Result<String> {
 
 /// Asks user to provide a line of input. Displays a prompt.
 fn read_credential(caption: String) -> io::Result<String> {
-    let mut cred = String::new();
-
-    println!("{}: ", caption);
-
-    io::stdin().read_line(&mut cred)?;
-    if cred.pop().is_none() || cred.is_empty() {
+    let caption = format!("{}: ", caption);
+    let cred = rpassword::prompt_password(caption.clone()).unwrap();
+    if cred.is_empty() {
         return Err(io::Error::new(
             io::ErrorKind::Other,
             format!("Failed to read {}", caption),