- allow extracting the http client from web api transport - refactor most commands so that they can accept an external transport - update confirmer to use transport's http client - update remove command - update TwoFactorClient so it doesn't need to be mutable - update get_server_time so it requires a transport - update remove_authenticator - update login proceedure to use given transport - update usages of do_login - update setup - update trade - update code command - update qr-login command - make borrowcheck happy - make WebApiTransport Clone and remove Default impl - remove dead code - fix lints closes #177
49 lines
1.1 KiB
Rust
49 lines
1.1 KiB
Rust
use std::{
|
|
sync::{Arc, Mutex},
|
|
time::{SystemTime, UNIX_EPOCH},
|
|
};
|
|
|
|
use log::*;
|
|
use steamguard::{steamapi, SteamGuardAccount};
|
|
|
|
use crate::AccountManager;
|
|
|
|
use super::*;
|
|
|
|
#[derive(Debug, Clone, Parser)]
|
|
#[clap(about = "Generate 2FA codes")]
|
|
pub struct CodeCommand {
|
|
#[clap(
|
|
long,
|
|
help = "Assume the computer's time is correct. Don't ask Steam for the time when generating codes."
|
|
)]
|
|
pub offline: bool,
|
|
}
|
|
|
|
impl<T> AccountCommand<T> for CodeCommand
|
|
where
|
|
T: Transport,
|
|
{
|
|
fn execute(
|
|
&self,
|
|
transport: T,
|
|
_manager: &mut AccountManager,
|
|
accounts: Vec<Arc<Mutex<SteamGuardAccount>>>,
|
|
) -> anyhow::Result<()> {
|
|
let server_time = if self.offline {
|
|
SystemTime::now().duration_since(UNIX_EPOCH)?.as_secs()
|
|
} else {
|
|
steamapi::get_server_time(transport)?.server_time()
|
|
};
|
|
debug!("Time used to generate codes: {}", server_time);
|
|
|
|
for account in accounts {
|
|
let account = account.lock().unwrap();
|
|
info!("Generating code for {}", account.account_name);
|
|
trace!("{:?}", account);
|
|
let code = account.generate_code(server_time);
|
|
println!("{}", code);
|
|
}
|
|
Ok(())
|
|
}
|
|
}
|