Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions src/commands/approve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ use steamguard::approver::Challenge;
use steamguard::protobufs::enums::ESessionPersistence;
use steamguard::protobufs::steammessages_auth_steamclient::EAuthTokenPlatformType;
use steamguard::transport::Transport;
use steamguard::{LoginApprover, SteamGuardAccount};
use steamguard::{ApproverError, LoginApprover, SteamGuardAccount};

#[derive(Debug, Clone, Parser)]
#[clap(about = "Approve or deny pending login sessions")]
Expand Down Expand Up @@ -47,20 +47,30 @@ where
crate::do_login(transport.clone(), &mut account, args.password.clone())?;
}

let Some(tokens) = account.tokens.as_ref() else {
error!(
"No tokens found for {}. Can't approve login if we aren't logged in ourselves.",
account.account_name
);
return Err(anyhow!("No tokens found for {}", account.account_name));
};

let mut approver = LoginApprover::new(transport.clone(), tokens);
let mut did_relogin = false;
let (sessions, mut approver) = loop {
let Some(tokens) = account.tokens.as_ref() else {
error!(
"No tokens found for {}. Can't approve login if we aren't logged in ourselves.",
account.account_name
);
return Err(anyhow!("No tokens found for {}", account.account_name));
};

let sessions = approver.list_auth_sessions()?;
let approver = LoginApprover::new(transport.clone(), tokens);
match approver.list_auth_sessions() {
Ok(sessions) => break (sessions, approver),
Err(ApproverError::Unauthorized) if !did_relogin => {
info!("Access token expired, re-logging in...");
crate::do_login(transport.clone(), &mut account, args.password.clone())?;
did_relogin = true;
}
Err(err) => return Err(err.into()),
}
};
if sessions.is_empty() {
info!("No pending sessions to approve");
return Ok(());
continue;
}

info!("Found {} pending sessions", sessions.len());
Expand Down
Loading