aboutsummaryrefslogtreecommitdiffstats
path: root/src/bin
diff options
context:
space:
mode:
authorJesse Luehrs <doy@tozt.net>2023-03-25 16:46:12 -0400
committerJesse Luehrs <doy@tozt.net>2023-03-25 23:14:16 -0400
commitad0a078a5a2c4c9efd16b20ff47cc4e1ef922dab (patch)
treebcbd549f81c389e8307155251af8fddbc0f73e71 /src/bin
parentc12c7643779bc495ff5f26cfe0e924586ced3f2c (diff)
downloadrbw-ad0a078a5a2c4c9efd16b20ff47cc4e1ef922dab.tar.gz
rbw-ad0a078a5a2c4c9efd16b20ff47cc4e1ef922dab.zip
clippy, fmt, etc
Diffstat (limited to 'src/bin')
-rw-r--r--src/bin/rbw-agent/actions.rs27
1 files changed, 21 insertions, 6 deletions
diff --git a/src/bin/rbw-agent/actions.rs b/src/bin/rbw-agent/actions.rs
index 361009b..e857a1e 100644
--- a/src/bin/rbw-agent/actions.rs
+++ b/src/bin/rbw-agent/actions.rs
@@ -1,5 +1,4 @@
use anyhow::Context as _;
-use rbw::api::KdfType;
pub async fn register(
sock: &mut crate::sock::Sock,
@@ -153,7 +152,7 @@ pub async fn login(
rbw::api::TwoFactorProviderType::Email,
];
- for provider in supported_types.into_iter() {
+ for provider in supported_types {
if providers.contains(&provider) {
let (
access_token,
@@ -218,7 +217,15 @@ async fn two_factor(
email: &str,
password: rbw::locked::Password,
provider: rbw::api::TwoFactorProviderType,
-) -> anyhow::Result<(String, String, KdfType, u32, Option<u32>, Option<u32>, String)> {
+) -> anyhow::Result<(
+ String,
+ String,
+ rbw::api::KdfType,
+ u32,
+ Option<u32>,
+ Option<u32>,
+ String,
+)> {
let mut err_msg = None;
for i in 1_u8..=3 {
let err = if i > 1 {
@@ -248,7 +255,15 @@ async fn two_factor(
)
.await
{
- Ok((access_token, refresh_token, kdf, iterations, memory, parallelism, protected_key)) => {
+ Ok((
+ access_token,
+ refresh_token,
+ kdf,
+ iterations,
+ memory,
+ parallelism,
+ protected_key,
+ )) => {
return Ok((
access_token,
refresh_token,
@@ -296,7 +311,7 @@ async fn login_success(
state: std::sync::Arc<tokio::sync::RwLock<crate::agent::State>>,
access_token: String,
refresh_token: String,
- kdf: KdfType,
+ kdf: rbw::api::KdfType,
iterations: u32,
memory: Option<u32>,
parallelism: Option<u32>,
@@ -370,7 +385,7 @@ pub async fn unlock(
));
};
- let memory= db.memory;
+ let memory = db.memory;
let parallelism = db.parallelism;
let Some(protected_key) = db.protected_key