xtex/azalea
1
0
Fork 0
mirror of https://github.com/mat-1/azalea.git synced 2024-09-19 14:42:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

force user to reauth when refresh fails

Browse source
This commit is contained in:
mat 2023-12-16 13:54:57 -06:00
parent a960dba87d
commit 92d33ad0a3
1 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
azalea-auth/src/auth.rs
View file

@ -10,6 +10,7 @@ use std::{
time::{Instant, SystemTime, UNIX_EPOCH}, time::{Instant, SystemTime, UNIX_EPOCH},
}; };
use thiserror::Error; use thiserror::Error;
use tracing::trace;
use uuid::Uuid; use uuid::Uuid;
#[derive(Default)] #[derive(Default)]
@ -84,7 +85,14 @@ pub async fn auth(email: &str, opts: AuthOpts) -> Result<AuthResult, AuthError>
}; };
if msa.is_expired() { if msa.is_expired() {
tracing::trace!("refreshing Microsoft auth token"); tracing::trace!("refreshing Microsoft auth token");
msa = refresh_ms_auth_token(&client, &msa.data.refresh_token).await?; match refresh_ms_auth_token(&client, &msa.data.refresh_token).await {
Ok(new_msa) => msa = new_msa,
Err(e) => {
// can't refresh, ask the user to auth again
tracing::error!("Error refreshing Microsoft auth token: {}", e);
msa = interactive_get_ms_auth_token(&client, email).await?;
}
}
} }
let msa_token = &msa.data.access_token; let msa_token = &msa.data.access_token;
@ -361,13 +369,15 @@ pub async fn interactive_get_ms_auth_token(
pub enum RefreshMicrosoftAuthTokenError { pub enum RefreshMicrosoftAuthTokenError {
#[error("Http error: {0}")] #[error("Http error: {0}")]
Http(#[from] reqwest::Error), Http(#[from] reqwest::Error),
#[error("Error parsing JSON: {0}")]
Json(#[from] serde_json::Error),
} }
pub async fn refresh_ms_auth_token( pub async fn refresh_ms_auth_token(
client: &reqwest::Client, client: &reqwest::Client,
refresh_token: &str, refresh_token: &str,
) -> Result<ExpiringValue<AccessTokenResponse>, RefreshMicrosoftAuthTokenError> { ) -> Result<ExpiringValue<AccessTokenResponse>, RefreshMicrosoftAuthTokenError> {
let access_token_response = client let access_token_response_text = client
.post("https://login.live.com/oauth20_token.srf") .post("https://login.live.com/oauth20_token.srf")
.form(&vec![ .form(&vec![
("scope", "service::user.auth.xboxlive.com::MBI_SSL"), ("scope", "service::user.auth.xboxlive.com::MBI_SSL"),
@ -377,8 +387,10 @@ pub async fn refresh_ms_auth_token(
]) ])
.send() .send()
.await? .await?
.json::<AccessTokenResponse>() .text()
.await?; .await?;
let access_token_response: AccessTokenResponse =
serde_json::from_str(&access_token_response_text)?;
let expires_at = let expires_at =
SystemTime::now() + std::time::Duration::from_secs(access_token_response.expires_in); SystemTime::now() + std::time::Duration::from_secs(access_token_response.expires_in);