fix custom profile import for CF (#914)

* use minecraftinstance.json for CF

* fix fabric version

Cargo.lock

@@ -4685,7 +4685,7 @@ dependencies = [
 
 [[package]]
 name = "theseus"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "async-recursion",
  "async-tungstenite",
@@ -4733,7 +4733,7 @@ dependencies = [
 
 [[package]]
 name = "theseus_cli"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "argh",
  "color-eyre",
@@ -4760,7 +4760,7 @@ dependencies = [
 
 [[package]]
 name = "theseus_gui"
-version = "0.6.2"
+version = "0.6.3"
 dependencies = [
  "chrono",
  "cocoa",

theseus/Cargo.toml

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

theseus/src/api/hydra/complete.rs

@@ -41,7 +41,7 @@ pub async fn wait_finish(device_code: String) -> crate::Result<Credentials> {
         }
         xsts_token::XSTSResponse::Success { token: xsts_token } => {
             // Get xsts bearer token from xsts token
-            let bearer_token =
+            let (bearer_token, expires_in) =
                 bearer_token::fetch_bearer(&xsts_token, &xbl_token.uhs)
                     .await
                     .map_err(|err| {
@@ -63,8 +63,7 @@ pub async fn wait_finish(device_code: String) -> crate::Result<Credentials> {
                 player_info.name,
                 bearer_token,
                 oauth.refresh_token,
-                chrono::Utc::now()
-                    + chrono::Duration::seconds(oauth.expires_in),
+                chrono::Utc::now() + chrono::Duration::seconds(expires_in),
             );
 
             // Put credentials into state

theseus/src/api/hydra/init.rs

@@ -1,6 +1,4 @@
 //! Login route for Hydra, redirects to the Microsoft login page before going to the redirect route
-use std::collections::HashMap;
-
 use serde::{Deserialize, Serialize};
 
 use crate::{hydra::MicrosoftError, util::fetch::REQWEST_CLIENT};
@@ -19,17 +17,21 @@ pub struct DeviceLoginSuccess {
 
 pub async fn init() -> crate::Result<DeviceLoginSuccess> {
     // Get the initial URL
-    let client_id = MICROSOFT_CLIENT_ID;
-
     // Get device code
     // Define the parameters
-    let mut params = HashMap::new();
-    params.insert("client_id", client_id);
-    params.insert("scope", "XboxLive.signin offline_access");
 
     // urlencoding::encode("XboxLive.signin offline_access"));
-    let resp = auth_retry(|| REQWEST_CLIENT.post("https://login.microsoftonline.com/consumers/oauth2/v2.0/devicecode")
-    .header("Content-Type", "application/x-www-form-urlencoded").form(&params).send()).await?;
+    let resp = auth_retry(|| REQWEST_CLIENT.get("https://login.microsoftonline.com/consumers/oauth2/v2.0/devicecode")
+        .header("Content-Length", "0")
+        .query(&[
+            ("client_id", MICROSOFT_CLIENT_ID),
+            (
+                "scope",
+                "XboxLive.signin XboxLive.offline_access profile openid email",
+            ),
+        ])
+        .send()
+    ).await?;
 
     match resp.status() {
         reqwest::StatusCode::OK => Ok(resp.json().await?),

theseus/src/api/hydra/refresh.rs

@@ -24,6 +24,10 @@ pub async fn refresh(refresh_token: String) -> crate::Result<OauthSuccess> {
     params.insert("grant_type", "refresh_token");
     params.insert("client_id", MICROSOFT_CLIENT_ID);
     params.insert("refresh_token", &refresh_token);
+    params.insert(
+        "redirect_uri",
+        "https://login.microsoftonline.com/common/oauth2/nativeclient",
+    );
 
     // Poll the URL in a loop until we are successful.
     // On an authorization_pending response, wait 5 seconds and try again.

theseus/src/api/hydra/stages/bearer_token.rs

@@ -1,19 +1,29 @@
+use serde::Deserialize;
 use serde_json::json;
 
 use super::auth_retry;
 
 const MCSERVICES_AUTH_URL: &str =
-    "https://api.minecraftservices.com/launcher/login";
+    "https://api.minecraftservices.com/authentication/login_with_xbox";
+
+#[derive(Deserialize)]
+pub struct BearerTokenResponse {
+    access_token: String,
+    expires_in: i64,
+}
 
 #[tracing::instrument]
-pub async fn fetch_bearer(token: &str, uhs: &str) -> crate::Result<String> {
+pub async fn fetch_bearer(
+    token: &str,
+    uhs: &str,
+) -> crate::Result<(String, i64)> {
     let body = auth_retry(|| {
         let client = reqwest::Client::new();
         client
             .post(MCSERVICES_AUTH_URL)
+            .header("Accept", "application/json")
             .json(&json!({
-                "xtoken": format!("XBL3.0 x={};{}", uhs, token),
-                "platform": "PC_LAUNCHER"
+                "identityToken": format!("XBL3.0 x={};{}", uhs, token),
             }))
             .send()
     })
@@ -21,14 +31,12 @@ pub async fn fetch_bearer(token: &str, uhs: &str) -> crate::Result<String> {
     .text()
     .await?;
 
-    serde_json::from_str::<serde_json::Value>(&body)?
-        .get("access_token")
-        .and_then(serde_json::Value::as_str)
-        .map(String::from)
-        .ok_or(
+    serde_json::from_str::<BearerTokenResponse>(&body)
+        .map(|x| (x.access_token, x.expires_in))
+        .map_err(|_| {
             crate::ErrorKind::HydraError(format!(
                 "Response didn't contain valid bearer token. body: {body}"
             ))
-            .into(),
-        )
+            .into()
+        })
 }

theseus/src/api/hydra/stages/mod.rs

@@ -3,7 +3,7 @@
 use futures::Future;
 use reqwest::Response;
 
-const RETRY_COUNT: usize = 2; // Does command 3 times
+const RETRY_COUNT: usize = 9; // Does command 3 times
 const RETRY_WAIT: std::time::Duration = std::time::Duration::from_secs(2);
 
 pub mod bearer_token;

theseus/src/api/hydra/stages/player_info.rs

@@ -24,6 +24,14 @@ impl Default for PlayerInfo {
 
 #[tracing::instrument]
 pub async fn fetch_info(token: &str) -> crate::Result<PlayerInfo> {
+    auth_retry(|| {
+        REQWEST_CLIENT
+            .get("https://api.minecraftservices.com/entitlements/mcstore")
+            .bearer_auth(token)
+            .send()
+    })
+    .await?;
+
     let response = auth_retry(|| {
         REQWEST_CLIENT
             .get(PROFILE_URL)

theseus/src/api/hydra/stages/poll_response.rs

@@ -25,6 +25,10 @@ pub async fn poll_response(device_code: String) -> crate::Result<OauthSuccess> {
     params.insert("grant_type", "urn:ietf:params:oauth:grant-type:device_code");
     params.insert("client_id", MICROSOFT_CLIENT_ID);
     params.insert("device_code", &device_code);
+    params.insert(
+        "scope",
+        "XboxLive.signin XboxLive.offline_access profile openid email",
+    );
 
     // Poll the URL in a loop until we are successful.
     // On an authorization_pending response, wait 5 seconds and try again.
@@ -34,7 +38,6 @@ pub async fn poll_response(device_code: String) -> crate::Result<OauthSuccess> {
             .post(
                 "https://login.microsoftonline.com/consumers/oauth2/v2.0/token",
             )
-            .header("Content-Type", "application/x-www-form-urlencoded")
             .form(&params)
             .send()
         })

theseus/src/api/hydra/stages/xbl_signin.rs

@@ -19,7 +19,6 @@ pub async fn login_xbl(token: &str) -> crate::Result<XBLLogin> {
         REQWEST_CLIENT
             .post(XBL_AUTH_URL)
             .header(reqwest::header::ACCEPT, "application/json")
-            .header("x-xbl-contract-version", "1")
             .json(&json!({
                 "Properties": {
                     "AuthMethod": "RPS",

theseus/src/api/pack/import/curseforge.rs

@@ -16,37 +16,22 @@ use crate::{
 
 use super::{copy_dotminecraft, recache_icon};
 
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct FlameManifest {
-    pub manifest_version: u8,
-    pub name: String,
-    pub minecraft: FlameMinecraft,
-}
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct FlameMinecraft {
-    pub version: String,
-    pub mod_loaders: Vec<FlameModLoader>,
-}
-#[derive(Serialize, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct FlameModLoader {
-    pub id: String,
-    pub primary: bool,
-}
-
 #[derive(Serialize, Deserialize, Debug)]
 #[serde(rename_all = "camelCase")]
 pub struct MinecraftInstance {
     pub name: Option<String>,
+    pub base_mod_loader: Option<MinecraftInstanceModLoader>,
     pub profile_image_path: Option<PathBuf>,
     pub installed_modpack: Option<InstalledModpack>,
     pub game_version: String, // Minecraft game version. Non-prioritized, use this if Vanilla
 }
 #[derive(Serialize, Deserialize, Debug, Clone)]
 #[serde(rename_all = "camelCase")]
-
+pub struct MinecraftInstanceModLoader {
+    pub name: String,
+}
+#[derive(Serialize, Deserialize, Debug, Clone)]
+#[serde(rename_all = "camelCase")]
 pub struct InstalledModpack {
     pub thumbnail_url: Option<String>,
 }
@@ -113,35 +98,26 @@ pub async fn import_curseforge(
         }
     }
 
-    // Curseforge vanilla profile may not have a manifest.json, so we allow it to not exist
-    if curseforge_instance_folder.join("manifest.json").exists() {
-        // Load manifest.json
-        let cf_manifest: String = io::read_to_string(
-            &curseforge_instance_folder.join("manifest.json"),
-        )
-        .await?;
-
-        let cf_manifest: FlameManifest =
-            serde_json::from_str::<FlameManifest>(&cf_manifest)?;
-
-        let game_version = cf_manifest.minecraft.version;
+    // base mod loader is always None for vanilla
+    if let Some(instance_mod_loader) = minecraft_instance.base_mod_loader {
+        let game_version = minecraft_instance.game_version;
 
         // CF allows Forge, Fabric, and Vanilla
         let mut mod_loader = None;
         let mut loader_version = None;
-        for loader in cf_manifest.minecraft.mod_loaders {
-            match loader.id.split_once('-') {
-                Some(("forge", version)) => {
-                    mod_loader = Some(ModLoader::Forge);
-                    loader_version = Some(version.to_string());
-                }
-                Some(("fabric", version)) => {
-                    mod_loader = Some(ModLoader::Fabric);
-                    loader_version = Some(version.to_string());
-                }
-                _ => {}
+
+        match instance_mod_loader.name.split('-').collect::<Vec<&str>>()[..] {
+            ["forge", version] => {
+                mod_loader = Some(ModLoader::Forge);
+                loader_version = Some(version.to_string());
             }
+            ["fabric", version, _game_version] => {
+                mod_loader = Some(ModLoader::Fabric);
+                loader_version = Some(version.to_string());
+            }
+            _ => {}
         }
+
         let mod_loader = mod_loader.unwrap_or(ModLoader::Vanilla);
 
         let loader_version = if mod_loader != ModLoader::Vanilla {
@@ -170,7 +146,7 @@ pub async fn import_curseforge(
         })
         .await?;
     } else {
-        // If no manifest is found, it's a vanilla profile
+        // create a vanilla profile
         crate::api::profile::edit(&profile_path, |prof| {
             prof.metadata.name = override_title
                 .clone()

theseus/src/api/profile/create.rs

@@ -272,8 +272,8 @@ pub(crate) async fn get_loader_version_from_loader(
 
     let loader_version = loaders
         .iter()
+        .find(|&x| filter(x))
         .cloned()
-        .find(filter)
         .or(
             // If stable was searched for but not found, return latest by default
             if version == "stable" {

theseus/src/launcher/auth.rs

@@ -64,7 +64,7 @@ pub async fn refresh_credentials(
             .as_error())
         }
         xsts_token::XSTSResponse::Success { token: xsts_token } => {
-            let bearer_token =
+            let (bearer_token, expires_in) =
                 bearer_token::fetch_bearer(&xsts_token, &xbl_token.uhs)
                     .await
                     .map_err(|err| {
@@ -76,8 +76,7 @@ pub async fn refresh_credentials(
 
             credentials.access_token = bearer_token;
             credentials.refresh_token = oauth.refresh_token;
-            credentials.expires =
-                Utc::now() + Duration::seconds(oauth.expires_in);
+            credentials.expires = Utc::now() + Duration::seconds(expires_in);
         }
     }
 

theseus/src/launcher/mod.rs

@@ -177,7 +177,7 @@ pub async fn install_minecraft(
 
     let state = State::get().await?;
     let instance_path =
-        &io::canonicalize(&profile.get_profile_full_path().await?)?;
+        &io::canonicalize(profile.get_profile_full_path().await?)?;
     let metadata = state.metadata.read().await;
 
     let version_index = metadata

theseus_cli/Cargo.toml

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

theseus_cli/src/subcommands/profile.rs

@@ -175,12 +175,13 @@ impl ProfileInit {
                 .ok_or_else(|| eyre::eyre!("Modloader {loader} unsupported for Minecraft version {game_version}"))?
                 .loaders;
 
-            let loader_version =
-                loaders.iter().cloned().find(filter).ok_or_else(|| {
-                    eyre::eyre!(
-                        "Invalid version {version} for modloader {loader}"
-                    )
-                })?;
+            let loader_version = loaders
+                .iter()
+                .find(|&x| filter(x))
+                .cloned()
+                .ok_or_else(|| {
+                eyre::eyre!("Invalid version {version} for modloader {loader}")
+            })?;
 
             Some((loader_version, loader))
         } else {

theseus_gui/package.json

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

theseus_gui/src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "theseus_gui"
-version = "0.6.2"
+version = "0.6.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.6.2"
+    "version": "0.6.3"
   },
   "tauri": {
     "allowlist": {
@@ -83,7 +83,7 @@
       }
     },
     "security": {
-      "csp": "default-src 'self'; connect-src https://modrinth.com https://*.modrinth.com https://mixpanel.com https://*.mixpanel.com https://*.cloudflare.com https://api.mclo.gs; font-src https://cdn-raw.modrinth.com/fonts/inter/; img-src tauri: https: data: blob: 'unsafe-inline' asset: https://asset.localhost; script-src https://*.cloudflare.com 'self'; frame-src https://*.cloudflare.com https://www.youtube.com 'self'; style-src unsafe-inline 'self'"
+      "csp": "default-src 'self'; connect-src https://modrinth.com https://*.modrinth.com https://mixpanel.com https://*.mixpanel.com https://*.cloudflare.com https://api.mclo.gs; font-src https://cdn-raw.modrinth.com/fonts/inter/; img-src tauri: https: data: blob: 'unsafe-inline' asset: https://asset.localhost; script-src https://*.cloudflare.com 'self'; frame-src https://*.cloudflare.com https://www.youtube.com https://www.youtube-nocookie.com https://discord.com 'self'; style-src unsafe-inline 'self'"
     },
     "updater": {
       "active": true,

theseus_gui/src/components/ui/AccountsCard.vue

@@ -42,7 +42,7 @@
       <div v-if="displayAccounts.length > 0" class="account-group">
         <div v-for="account in displayAccounts" :key="account.id" class="account-row">
           <Button class="option account" @click="setAccount(account)">
-            <Avatar :src="`https://mc-heads.net/avatar/${selectedAccount.id}/128`" class="icon" />
+            <Avatar :src="`https://mc-heads.net/avatar/${account.id}/128`" class="icon" />
             <p>{{ account.username }}</p>
           </Button>
           <Button v-tooltip="'Log out'" icon-only @click="logout(account.id)">

theseus_gui/src/pages/project/Versions.vue

@@ -283,6 +283,7 @@ watch([filterVersions, filterLoader, filterGameVersions], () => {
   display: flex;
   flex-direction: column;
   gap: 0.25rem;
+  text-wrap: wrap;
 
   .version-badge {
     display: flex;

theseus_gui/src/store/theme.js

@@ -2,10 +2,9 @@ import { defineStore } from 'pinia'
 
 export const useTheming = defineStore('themeStore', {
   state: () => ({
-    themeOptions: ['dark'],
+    themeOptions: ['dark', 'light', 'oled'],
     advancedRendering: true,
     selectedTheme: 'dark',
-    darkTheme: true,
   }),
   actions: {
     setThemeState(newTheme) {
@@ -15,8 +14,9 @@ export const useTheming = defineStore('themeStore', {
       this.setThemeClass()
     },
     setThemeClass() {
-      document.getElementsByTagName('html')[0].classList.remove('dark-mode')
-      document.getElementsByTagName('html')[0].classList.remove('light-mode')
+      for (const theme of this.themeOptions) {
+        document.getElementsByTagName('html')[0].classList.remove(`${theme}-mode`)
+      }
       document.getElementsByTagName('html')[0].classList.add(`${this.selectedTheme}-mode`)
     },
   },