1e94848 cli: Make some UX improvements to `rad auth` — heartwood

Radicle Heartwood Protocol & Stack

cli: Make some UX improvements to `rad auth`

Alexis Sellier committed 2 years ago

commit 1e948485beaa216b2261d9d5fb58e8c43cdef078
parent 074b0e55c138231fed8777aad45689de882d72d6

2 files changed +19 -9

modified radicle-cli/src/commands/auth.rs

@@ -126,27 +126,23 @@ pub fn authenticate(options: Options, profile: &Profile) -> anyhow::Result<()> {

     match ssh::agent::Agent::connect() {
         Ok(mut agent) => {
             if agent.request_identities()?.contains(&profile.public_key) {
                 term::success!("Signing key already in ssh-agent");
                 term::success!("Radicle key already in ssh-agent");
                 return Ok(());
             }
             term::headline(format!(
                 "Authenticating as {}",
                 "Authenticating as 👾 {}",
                 term::format::Identity::new(profile).styled()
             ));
             // TODO: We should show the spinner on the passphrase prompt,
             // otherwise it seems like the passphrase is valid even if it isn't.
             term::warning("Adding your radicle key to ssh-agent...");
             let passphrase = if options.stdin {
                 term::passphrase_stdin()
             } else {
                 term::passphrase(RAD_PASSPHRASE)
             }?;
             let spinner = term::spinner("Unlocking...");
             register(&mut agent, profile, passphrase)?;
             spinner.finish();
             term::success!("Radicle key added to ssh-agent");
             term::success!("Radicle key added to {}", term::format::dim("ssh-agent"));
             return Ok(());
         }

@@ -173,7 +169,14 @@ pub fn register(

 ) -> anyhow::Result<()> {
     let secret = profile
         .keystore
         .secret_key(passphrase)?
         .secret_key(passphrase)
         .map_err(|e| {
             if e.is_crypto_err() {
                 anyhow!("could not decrypt secret key: invalid passphrase")
             } else {
                 e.into()
             }
         })?
         .ok_or_else(|| anyhow!("Key not found in {:?}", profile.keystore.path()))?;
     agent.register(&secret)?;

modified radicle-crypto/src/ssh/keystore.rs

@@ -25,6 +25,13 @@ pub enum Error {

     AlreadyInitialized,
 }
 impl Error {
     /// Check if it's a decryption error.
     pub fn is_crypto_err(&self) -> bool {
         matches!(self, Self::Ssh(ssh_key::Error::Crypto))
     }
 }
 /// Stores keys on disk, in OpenSSH format.
 #[derive(Debug, Clone)]
 pub struct Keystore {