diff options
author | Conrad Ludgate <conradludgate@gmail.com> | 2021-12-08 13:37:49 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-08 13:37:49 +0000 |
commit | 4bdf4c40c292b681452c9499b9072b759073bf32 (patch) | |
tree | 1eddc50584485efbec2c1ab8e470844d25de12df | |
parent | 9e6746a4d1251870d4495f7b5fae626ed5d19f01 (diff) |
feat: login/register no longer blocking (#216)
-rw-r--r-- | atuin-client/src/api_client.rs | 18 | ||||
-rw-r--r-- | src/command/login.rs | 17 | ||||
-rw-r--r-- | src/command/mod.rs | 4 | ||||
-rw-r--r-- | src/command/register.rs | 12 |
4 files changed, 26 insertions, 25 deletions
diff --git a/atuin-client/src/api_client.rs b/atuin-client/src/api_client.rs index 24922836..3a4c859b 100644 --- a/atuin-client/src/api_client.rs +++ b/atuin-client/src/api_client.rs @@ -26,7 +26,7 @@ pub struct Client<'a> { client: reqwest::Client, } -pub fn register( +pub async fn register( address: &str, username: &str, email: &str, @@ -45,36 +45,38 @@ pub fn register( } let url = format!("{}/register", address); - let client = reqwest::blocking::Client::new(); + let client = reqwest::Client::new(); let resp = client .post(url) .header(USER_AGENT, APP_USER_AGENT) .json(&map) - .send()?; + .send() + .await?; if !resp.status().is_success() { return Err(eyre!("failed to register user")); } - let session = resp.json::<RegisterResponse>()?; + let session = resp.json::<RegisterResponse>().await?; Ok(session) } -pub fn login(address: &str, req: LoginRequest) -> Result<LoginResponse<'static>> { +pub async fn login(address: &str, req: LoginRequest<'_>) -> Result<LoginResponse<'static>> { let url = format!("{}/login", address); - let client = reqwest::blocking::Client::new(); + let client = reqwest::Client::new(); let resp = client .post(url) .header(USER_AGENT, APP_USER_AGENT) .json(&req) - .send()?; + .send() + .await?; if resp.status() != reqwest::StatusCode::OK { return Err(eyre!("invalid login details")); } - let session = resp.json::<LoginResponse>()?; + let session = resp.json::<LoginResponse>().await?; Ok(session) } diff --git a/src/command/login.rs b/src/command/login.rs index c4817a5f..63a3e0ec 100644 --- a/src/command/login.rs +++ b/src/command/login.rs @@ -1,10 +1,10 @@ +use std::borrow::Cow; use std::io; -use std::io::prelude::*; -use std::{borrow::Cow, fs::File}; use atuin_common::api::LoginRequest; use eyre::Result; use structopt::StructOpt; +use tokio::{fs::File, io::AsyncWriteExt}; use atuin_client::api_client; use atuin_client::settings::Settings; @@ -29,7 +29,7 @@ fn get_input() -> Result<String> { } impl Cmd { - pub fn run(&self, settings: &Settings) -> Result<()> { + pub async fn run(&self, settings: &Settings) -> Result<()> { let session_path = atuin_common::utils::data_dir().join("session"); if session_path.exists() { @@ -47,15 +47,16 @@ impl Cmd { let session = api_client::login( settings.sync_address.as_str(), LoginRequest { username, password }, - )?; + ) + .await?; let session_path = settings.session_path.as_str(); - let mut file = File::create(session_path)?; - file.write_all(session.session.as_bytes())?; + let mut file = File::create(session_path).await?; + file.write_all(session.session.as_bytes()).await?; let key_path = settings.key_path.as_str(); - let mut file = File::create(key_path)?; - file.write_all(key.as_bytes())?; + let mut file = File::create(key_path).await?; + file.write_all(key.as_bytes()).await?; println!("Logged in!"); diff --git a/src/command/mod.rs b/src/command/mod.rs index 02950365..dc1f01fb 100644 --- a/src/command/mod.rs +++ b/src/command/mod.rs @@ -142,13 +142,13 @@ impl AtuinCmd { } Self::Sync { force } => sync::run(&client_settings, force, &mut db).await, - Self::Login(l) => l.run(&client_settings), + Self::Login(l) => l.run(&client_settings).await, Self::Logout => { logout::run(); Ok(()) } Self::Register(r) => { - register::run(&client_settings, &r.username, &r.email, &r.password) + register::run(&client_settings, &r.username, &r.email, &r.password).await } Self::Key => { use atuin_client::encryption::{encode_key, load_key}; diff --git a/src/command/register.rs b/src/command/register.rs index 13177463..20ad1327 100644 --- a/src/command/register.rs +++ b/src/command/register.rs @@ -1,8 +1,6 @@ -use std::fs::File; -use std::io::prelude::*; - use eyre::Result; use structopt::StructOpt; +use tokio::{fs::File, io::AsyncWriteExt}; use atuin_client::api_client; use atuin_client::settings::Settings; @@ -20,7 +18,7 @@ pub struct Cmd { pub password: Option<String>, } -pub fn run( +pub async fn run( settings: &Settings, username: &Option<String>, email: &Option<String>, @@ -32,11 +30,11 @@ pub fn run( let password = or_user_input(password, "password"); let session = - api_client::register(settings.sync_address.as_str(), &username, &email, &password)?; + api_client::register(settings.sync_address.as_str(), &username, &email, &password).await?; let path = settings.session_path.as_str(); - let mut file = File::create(path)?; - file.write_all(session.session.as_bytes())?; + let mut file = File::create(path).await?; + file.write_all(session.session.as_bytes()).await?; // Create a new key, and save it to disk let _key = atuin_client::encryption::new_key(settings)?; |