Fix auth refresh (#631)

theseus/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "theseus"
-version = "0.5.2"
+version = "0.5.3"
 authors = ["Jai A <jaiagr+gpg@pm.me>"]
 edition = "2018"
 

theseus/src/api/hydra/mod.rs

@@ -1,7 +1,7 @@
 pub mod complete;
 pub mod init;
 pub mod refresh;
-mod stages;
+pub(crate) mod stages;
 
 use serde::Deserialize;
 

theseus/src/launcher/auth.rs

@@ -7,6 +7,8 @@ use chrono::{prelude::*, Duration};
 
 use serde::{Deserialize, Serialize};
 
+use crate::api::hydra::stages::{bearer_token, xbl_signin, xsts_token};
+
 // Login information
 #[derive(Serialize, Deserialize, Clone, Debug)]
 pub struct Credentials {
@@ -45,12 +47,39 @@ pub async fn refresh_credentials(
     credentials: &mut Credentials,
     _semaphore: &FetchSemaphore,
 ) -> crate::Result<()> {
-    let res =
+    let oauth =
         hydra::refresh::refresh(credentials.refresh_token.clone()).await?;
 
-    credentials.access_token = res.access_token;
+    let xbl_token = xbl_signin::login_xbl(&oauth.access_token).await?;
-    credentials.refresh_token = res.refresh_token;
+
-    credentials.expires = Utc::now() + Duration::seconds(res.expires_in);
+    // Get xsts token from xbl token
+    let xsts_response = xsts_token::fetch_token(&xbl_token.token).await?;
+
+    match xsts_response {
+        xsts_token::XSTSResponse::Unauthorized(err) => {
+            return Err(crate::ErrorKind::HydraError(format!(
+                "Error getting XBox Live token: {}",
+                err
+            ))
+            .as_error())
+        }
+        xsts_token::XSTSResponse::Success { token: xsts_token } => {
+            let bearer_token =
+                bearer_token::fetch_bearer(&xsts_token, &xbl_token.uhs)
+                    .await
+                    .map_err(|err| {
+                        crate::ErrorKind::HydraError(format!(
+                            "Error getting bearer token: {}",
+                            err
+                        ))
+                    })?;
+
+            credentials.access_token = bearer_token;
+            credentials.refresh_token = oauth.refresh_token;
+            credentials.expires =
+                Utc::now() + Duration::seconds(oauth.expires_in);
+        }
+    }
 
     Ok(())
 }

theseus_cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "theseus_cli"
-version = "0.5.2"
+version = "0.5.3"
 authors = ["Jai A <jaiagr+gpg@pm.me>"]
 edition = "2018"
 

theseus_gui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "theseus_gui",
   "private": true,
-  "version": "0.5.2",
+  "version": "0.5.3",
   "type": "module",
   "scripts": {
     "dev": "vite",

theseus_gui/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "theseus_gui"
-version = "0.5.2"
+version = "0.5.3"
 description = "A Tauri App"
 authors = ["you"]
 license = ""

theseus_gui/src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Modrinth App",
-    "version": "0.5.2"
+    "version": "0.5.3"
   },
   "tauri": {
     "allowlist": {