simono41/steamguard-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix how UserLogin handles access tokens for new api behavior, fixes #319 (#320)

Browse source 
fixes #319
This commit is contained in:
Carson McManus 2023-09-13 10:15:09 -04:00 committed by GitHub
parent f952ed5b1b
commit a9af82da13
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
steamguard/src/steamapi/authentication.rs
View file

@ -11,7 +11,7 @@ const SERVICE_NAME: &str = "IAuthenticationService";
use super::{ApiRequest, ApiResponse, BuildableRequest}; use super::{ApiRequest, ApiResponse, BuildableRequest};
#[derive(Debug)] #[derive(Debug, Clone)]
pub struct AuthenticationClient<T> pub struct AuthenticationClient<T>
where where
T: Transport, T: Transport,

34
steamguard/src/userlogin.rs
View file

@ -13,10 +13,12 @@ use crate::protobufs::steammessages_auth_steamclient::{
CAuthentication_UpdateAuthSessionWithSteamGuardCode_Request, CAuthentication_UpdateAuthSessionWithSteamGuardCode_Request,
CAuthentication_UpdateAuthSessionWithSteamGuardCode_Response, EAuthTokenPlatformType, CAuthentication_UpdateAuthSessionWithSteamGuardCode_Response, EAuthTokenPlatformType,
}; };
use crate::refresher::TokenRefresher;
use crate::steamapi::authentication::AuthenticationClient; use crate::steamapi::authentication::AuthenticationClient;
use crate::steamapi::EResult; use crate::steamapi::EResult;
use crate::token::Tokens; use crate::token::Tokens;
use crate::transport::Transport; use crate::transport::Transport;
use anyhow::Context;
use base64::Engine; use base64::Engine;
use log::*; use log::*;
use rsa::{Pkcs1v15Encrypt, RsaPublicKey}; use rsa::{Pkcs1v15Encrypt, RsaPublicKey};
@ -82,7 +84,7 @@ impl BeginQrLoginResponse {
#[derive(Debug)] #[derive(Debug)]
pub struct UserLogin<T> pub struct UserLogin<T>
where where
T: Transport, T: Transport + Clone,
{ {
client: AuthenticationClient<T>, client: AuthenticationClient<T>,
device_details: DeviceDetails, device_details: DeviceDetails,
@ -92,7 +94,7 @@ where
impl<T> UserLogin<T> impl<T> UserLogin<T>
where where
T: Transport, T: Transport + Clone,
{ {
pub fn new(transport: T, device_details: DeviceDetails) -> Self { pub fn new(transport: T, device_details: DeviceDetails) -> Self {
Self { Self {
@ -214,11 +216,29 @@ where
loop { loop {
let mut next_poll = self.poll_until_info()?; let mut next_poll = self.poll_until_info()?;
if next_poll.has_access_token() { if next_poll.has_access_token() || next_poll.has_refresh_token() {
return Ok(Tokens::new( // On 2023-09-12, Steam stopped issuing access tokens alongside refresh tokens for newly authenticated sessions.
next_poll.take_access_token(), // If they decide to revert this change, we'll accept the access token if it's present.
next_poll.take_refresh_token(),
)); let access_token = next_poll.take_access_token();
if access_token.is_empty() {
// Let's go ahead an fetch the access token, because we are going to need it anyway.
let mut refresher = TokenRefresher::new(self.client.clone());
let mut tokens = Tokens::new(
next_poll.take_access_token(),
next_poll.take_refresh_token(),
);
let steamid = tokens
.refresh_token()
.decode()
.context("decoding refresh token for steam id")?
.steam_id();
let access_token = refresher.refresh(steamid, &tokens)?;
tokens.set_access_token(access_token);
return Ok(tokens);
} else {
return Ok(Tokens::new(access_token, next_poll.take_refresh_token()));
};
} }
} }
} }