From be6da4a9d82467690e7388bc69db4d9facf7a6b8 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sat, 18 Apr 2020 16:13:17 -0400 Subject: refactor --- src/bin/rbw-agent/actions.rs | 2 +- src/bin/rbw/commands.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/bin') diff --git a/src/bin/rbw-agent/actions.rs b/src/bin/rbw-agent/actions.rs index 9875d5c..ac331ce 100644 --- a/src/bin/rbw-agent/actions.rs +++ b/src/bin/rbw-agent/actions.rs @@ -137,7 +137,7 @@ pub async fn sync(sock: &mut crate::sock::Sock) -> anyhow::Result<()> { } else { return Err(anyhow::anyhow!("failed to find refresh token in db")); }; - let (access_token, protected_key, entries) = + let (access_token, (protected_key, entries)) = rbw::actions::sync(&access_token, &refresh_token) .await .context("failed to sync database from server")?; diff --git a/src/bin/rbw/commands.rs b/src/bin/rbw/commands.rs index 42fb8ee..70f7ddf 100644 --- a/src/bin/rbw/commands.rs +++ b/src/bin/rbw/commands.rs @@ -135,7 +135,7 @@ pub fn add(name: &str, username: Option<&str>) -> anyhow::Result<()> { .map(|notes| crate::actions::encrypt(¬es)) .transpose()?; - if let Some(access_token) = rbw::actions::add( + if let (Some(access_token), ()) = rbw::actions::add( &access_token, &refresh_token, &name, @@ -177,7 +177,7 @@ pub fn generate( .transpose()?; let password = crate::actions::encrypt(&password)?; - if let Some(access_token) = rbw::actions::add( + if let (Some(access_token), ()) = rbw::actions::add( &access_token, &refresh_token, &name, @@ -231,7 +231,7 @@ pub fn edit(name: &str, username: Option<&str>) -> anyhow::Result<()> { .map(|notes| crate::actions::encrypt(¬es)) .transpose()?; - if let Some(access_token) = rbw::actions::edit( + if let (Some(access_token), ()) = rbw::actions::edit( &access_token, &refresh_token, &entry.id, @@ -268,7 +268,7 @@ pub fn remove(name: &str, username: Option<&str>) -> anyhow::Result<()> { let (entry, _) = find_entry(&db, name, username) .with_context(|| format!("couldn't find entry for '{}'", desc))?; - if let Some(access_token) = + if let (Some(access_token), ()) = rbw::actions::remove(&access_token, &refresh_token, &entry.id)? { db.access_token = Some(access_token); -- cgit v1.2.3-54-g00ecf