Launcher Auth (#450)

* Launcher Auth

* Finish auth

* final fixes

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

@@ -2,6 +2,7 @@ use std::path::PathBuf;
 
 use serde::{Deserialize, Serialize};
 
+use crate::state::CredentialsStore;
 use crate::{
     prelude::{ModLoader, ProfilePathId},
     state::ProfileInstallStage,
@@ -90,8 +91,13 @@ pub async fn import_curseforge(
         thumbnail_url: Some(thumbnail_url),
     }) = minecraft_instance.installed_modpack.clone()
     {
-        let icon_bytes =
-            fetch(&thumbnail_url, None, &state.fetch_semaphore).await?;
+        let icon_bytes = fetch(
+            &thumbnail_url,
+            None,
+            &state.fetch_semaphore,
+            &CredentialsStore(None),
+        )
+        .await?;
         let filename = thumbnail_url.rsplit('/').last();
         if let Some(filename) = filename {
             icon = Some(

theseus/src/api/pack/install_from.rs

@@ -192,12 +192,14 @@ pub async fn generate_pack_from_version_id(
     .await?;
 
     emit_loading(&loading_bar, 0.0, Some("Fetching version")).await?;
+    let creds = state.credentials.read().await;
     let version: ModrinthVersion = fetch_json(
         Method::GET,
         &format!("{}version/{}", MODRINTH_API_URL, version_id),
         None,
         None,
         &state.fetch_semaphore,
+        &creds,
     )
     .await?;
     emit_loading(&loading_bar, 10.0, None).await?;
@@ -225,6 +227,7 @@ pub async fn generate_pack_from_version_id(
         None,
         Some((&loading_bar, 70.0)),
         &state.fetch_semaphore,
+        &creds,
     )
     .await?;
     emit_loading(&loading_bar, 0.0, Some("Fetching project metadata")).await?;
@@ -235,13 +238,16 @@ pub async fn generate_pack_from_version_id(
         None,
         None,
         &state.fetch_semaphore,
+        &creds,
     )
     .await?;
 
     emit_loading(&loading_bar, 10.0, Some("Retrieving icon")).await?;
     let icon = if let Some(icon_url) = project.icon_url {
         let state = State::get().await?;
-        let icon_bytes = fetch(&icon_url, None, &state.fetch_semaphore).await?;
+        let icon_bytes =
+            fetch(&icon_url, None, &state.fetch_semaphore, &creds).await?;
+        drop(creds);
 
         let filename = icon_url.rsplit('/').next();
 

theseus/src/api/pack/install_mrpack.rs

@@ -168,6 +168,7 @@ pub async fn install_zipped_mrpack_files(
                         }
                     }
 
+                    let creds = state.credentials.read().await;
                     let file = fetch_mirrors(
                         &project
                             .downloads
@@ -176,8 +177,10 @@ pub async fn install_zipped_mrpack_files(
                             .collect::<Vec<&str>>(),
                         project.hashes.get(&PackFileHash::Sha1).map(|x| &**x),
                         &state.fetch_semaphore,
+                        &creds,
                     )
                     .await?;
+                    drop(creds);
 
                     let path =
                         std::path::Path::new(&project.path).components().next();