From a9af82da1337585fe360ec6c8f0ee6e88571964a Mon Sep 17 00:00:00 2001
From: Carson McManus <dyc3@users.noreply.github.com>
Date: Wed, 13 Sep 2023 10:15:09 -0400
Subject: [PATCH] fix how UserLogin handles access tokens for new api behavior,
 fixes #319 (#320)

fixes #319
---
 steamguard/src/steamapi/authentication.rs |  2 +-
 steamguard/src/userlogin.rs               | 34 ++++++++++++++++++-----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/steamguard/src/steamapi/authentication.rs b/steamguard/src/steamapi/authentication.rs
index 2f2fbbe..8d72397 100644
--- a/steamguard/src/steamapi/authentication.rs
+++ b/steamguard/src/steamapi/authentication.rs
@@ -11,7 +11,7 @@ const SERVICE_NAME: &str = "IAuthenticationService";
 
 use super::{ApiRequest, ApiResponse, BuildableRequest};
 
-#[derive(Debug)]
+#[derive(Debug, Clone)]
 pub struct AuthenticationClient<T>
 where
 	T: Transport,
diff --git a/steamguard/src/userlogin.rs b/steamguard/src/userlogin.rs
index 9f24b47..38df371 100644
--- a/steamguard/src/userlogin.rs
+++ b/steamguard/src/userlogin.rs
@@ -13,10 +13,12 @@ use crate::protobufs::steammessages_auth_steamclient::{
 	CAuthentication_UpdateAuthSessionWithSteamGuardCode_Request,
 	CAuthentication_UpdateAuthSessionWithSteamGuardCode_Response, EAuthTokenPlatformType,
 };
+use crate::refresher::TokenRefresher;
 use crate::steamapi::authentication::AuthenticationClient;
 use crate::steamapi::EResult;
 use crate::token::Tokens;
 use crate::transport::Transport;
+use anyhow::Context;
 use base64::Engine;
 use log::*;
 use rsa::{Pkcs1v15Encrypt, RsaPublicKey};
@@ -82,7 +84,7 @@ impl BeginQrLoginResponse {
 #[derive(Debug)]
 pub struct UserLogin<T>
 where
-	T: Transport,
+	T: Transport + Clone,
 {
 	client: AuthenticationClient<T>,
 	device_details: DeviceDetails,
@@ -92,7 +94,7 @@ where
 
 impl<T> UserLogin<T>
 where
-	T: Transport,
+	T: Transport + Clone,
 {
 	pub fn new(transport: T, device_details: DeviceDetails) -> Self {
 		Self {
@@ -214,11 +216,29 @@ where
 		loop {
 			let mut next_poll = self.poll_until_info()?;
 
-			if next_poll.has_access_token() {
-				return Ok(Tokens::new(
-					next_poll.take_access_token(),
-					next_poll.take_refresh_token(),
-				));
+			if next_poll.has_access_token() || next_poll.has_refresh_token() {
+				// On 2023-09-12, Steam stopped issuing access tokens alongside refresh tokens for newly authenticated sessions.
+				// If they decide to revert this change, we'll accept the access token if it's present.
+
+				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()));
+				};
 			}
 		}
 	}