Fix errors caused by sync locks crossing `await` in `cli::authenticate`
This commit is contained in:
parent
9084c1fcaa
commit
2301fda307
|
@ -7,18 +7,38 @@ use crate::{errors::Result, registration::Registered, Mastodon};
|
||||||
pub async fn authenticate(registration: Registered) -> Result<Mastodon> {
|
pub async fn authenticate(registration: Registered) -> Result<Mastodon> {
|
||||||
let url = registration.authorize_url()?;
|
let url = registration.authorize_url()?;
|
||||||
|
|
||||||
let stdout = io::stdout();
|
let code = {
|
||||||
let stdin = io::stdin();
|
let stdout = io::stdout();
|
||||||
|
let stdin = io::stdin();
|
||||||
|
|
||||||
let mut stdout = stdout.lock();
|
let mut stdout = stdout.lock();
|
||||||
let mut stdin = stdin.lock();
|
let mut stdin = stdin.lock();
|
||||||
|
|
||||||
writeln!(&mut stdout, "Click this link to authorize: {}", url)?;
|
writeln!(&mut stdout, "Click this link to authorize: {}", url)?;
|
||||||
write!(&mut stdout, "Paste the returned authorization code: ")?;
|
write!(&mut stdout, "Paste the returned authorization code: ")?;
|
||||||
stdout.flush()?;
|
stdout.flush()?;
|
||||||
|
|
||||||
|
let mut input = String::new();
|
||||||
|
stdin.read_line(&mut input)?;
|
||||||
|
input
|
||||||
|
};
|
||||||
|
let code = code.trim();
|
||||||
|
|
||||||
let mut input = String::new();
|
|
||||||
stdin.read_line(&mut input)?;
|
|
||||||
let code = input.trim();
|
|
||||||
registration.complete(code).await
|
registration.complete(code).await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[cfg(test)]
|
||||||
|
mod tests {
|
||||||
|
use super::*;
|
||||||
|
|
||||||
|
#[test]
|
||||||
|
fn send_sync() {
|
||||||
|
fn assert_send_sync(_: impl Send + Sync) {}
|
||||||
|
|
||||||
|
let mock_reg = || -> Registered { unimplemented!() };
|
||||||
|
let no_run = || async move {
|
||||||
|
let _ = authenticate(mock_reg()).await;
|
||||||
|
};
|
||||||
|
assert_send_sync(no_run());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in New Issue