Skip to content

Commit

Permalink
feat(app): update profile every time token is refreshed (modrinth#2328)
Browse files Browse the repository at this point in the history
Co-authored-by: Geometrically <18202329+Geometrically@users.noreply.github.com>
Co-authored-by: Prospector <6166773+Prospector@users.noreply.github.com>
  • Loading branch information
3 people authored Jan 9, 2025
1 parent 021fee6 commit c52d5e9
Showing 1 changed file with 15 additions and 7 deletions.
22 changes: 15 additions & 7 deletions packages/app-lib/src/state/minecraft_auth.rs
Original file line number Diff line number Diff line change
Expand Up @@ -178,19 +178,16 @@ pub async fn login_finish(

minecraft_entitlements(&minecraft_token.access_token).await?;

let profile = minecraft_profile(&minecraft_token.access_token).await?;

let profile_id = profile.id.unwrap_or_default();

let credentials = Credentials {
id: profile_id,
username: profile.name,
let mut credentials = Credentials {
id: Uuid::default(),
username: String::default(),
access_token: minecraft_token.access_token,
refresh_token: oauth_token.value.refresh_token,
expires: oauth_token.date
+ Duration::seconds(oauth_token.value.expires_in as i64),
active: true,
};
credentials.get_profile().await?;

credentials.upsert(exec).await?;

Expand Down Expand Up @@ -245,11 +242,22 @@ impl Credentials {
self.expires = oauth_token.date
+ Duration::seconds(oauth_token.value.expires_in as i64);

self.get_profile().await?;

self.upsert(exec).await?;

Ok(())
}

async fn get_profile(&mut self) -> crate::Result<()> {
let profile = minecraft_profile(&self.access_token).await?;

self.id = profile.id.unwrap_or_default();
self.username = profile.name;

Ok(())
}

#[tracing::instrument]
pub async fn get_default_credential(
exec: impl sqlx::Executor<'_, Database = sqlx::Sqlite> + Copy,
Expand Down

0 comments on commit c52d5e9

Please sign in to comment.