Enter account token from stdin

1 files changed, 17 insertions, 3 deletions

diff --git a/mullvad-cli/src/cmds/account.rs b/mullvad-cli/src/cmds/account.rs
index dbe2d2d817..803cabde00 100644
--- a/mullvad-cli/src/cmds/account.rs
+++ b/mullvad-cli/src/cmds/account.rs
@@ -1,8 +1,9 @@
 use crate::{new_rpc_client, Command, Error, Result};
 use clap::value_t_or_exit;
+use itertools::Itertools;
 use mullvad_management_interface::{types::Timestamp, Code};
 use mullvad_types::account::AccountToken;
-use itertools::Itertools;
+use std::io::{self, Write};
 
 pub struct Account;
 
@@ -22,7 +23,7 @@ impl Command for Account {
                     .arg(
                         clap::Arg::with_name("token")
                             .help("The Mullvad account token to configure the client with")
-                            .required(true),
+                            .required(false),
                     ),
             )
             .subcommand(
@@ -54,7 +55,20 @@ impl Command for Account {
 
     async fn run(&self, matches: &clap::ArgMatches<'_>) -> Result<()> {
         if let Some(set_matches) = matches.subcommand_matches("set") {
-            let mut token = value_t_or_exit!(set_matches.value_of("token"), String);
+            let mut token = match set_matches.value_of("token") {
+                Some(token) => token.to_string(),
+                None => {
+                    let mut token = String::new();
+                    io::stdout()
+                        .write_all(b"Enter account token: ")
+                        .expect("Failed to write to STDOUT");
+                    let _ = io::stdout().flush();
+                    io::stdin()
+                        .read_line(&mut token)
+                        .expect("Failed to read from STDIN");
+                    token
+                }
+            };
             token = token.split_whitespace().join("").to_string();
             self.set(Some(token)).await
         } else if let Some(_matches) = matches.subcommand_matches("get") {