From a199d4a80b2b6763175b6d589bf7451223d979bd Mon Sep 17 00:00:00 2001
From: LynithDev <61880709+LynithDev@users.noreply.github.com>
Date: Wed, 7 Aug 2024 11:52:12 +0200
Subject: [PATCH] chore: Some small things

---
 Cargo.lock                                 |  1 +
 apps/desktop/Cargo.toml                    |  1 +
 apps/desktop/src/api/commands/users.rs     | 22 ++++++++++++++++------
 apps/frontend/src/ui/hooks/useSettings.tsx |  1 -
 4 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ba73d8c8..a584bb6d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3493,6 +3493,7 @@ dependencies = [
  "objc",
  "once_cell",
  "onelauncher",
+ "onelauncher_macros",
  "serde",
  "serde_json",
  "specta",
diff --git a/apps/desktop/Cargo.toml b/apps/desktop/Cargo.toml
index 77753868..07606842 100644
--- a/apps/desktop/Cargo.toml
+++ b/apps/desktop/Cargo.toml
@@ -24,6 +24,7 @@ tauri-build = { workspace = true, features = [ "isolation" ] }
 
 [dependencies]
 onelauncher = { workspace = true, features = [ "tauri" ] }
+onelauncher_macros = { workspace = true }
 
 tauri-plugin-shell = { workspace = true }
 tauri-plugin-window-state = { workspace = true }
diff --git a/apps/desktop/src/api/commands/users.rs b/apps/desktop/src/api/commands/users.rs
index 995ef896..bd950522 100644
--- a/apps/desktop/src/api/commands/users.rs
+++ b/apps/desktop/src/api/commands/users.rs
@@ -1,4 +1,4 @@
-use onelauncher::data::MinecraftCredentials;
+use onelauncher::{data::MinecraftCredentials, store::MinecraftLogin};
 use onelauncher::minecraft;
 use tauri::{AppHandle, Manager};
 use uuid::Uuid;
@@ -43,6 +43,16 @@ pub async fn set_default_user(uuid: Uuid) -> Result<(), String> {
 #[tauri::command]
 pub async fn auth_login(handle: AppHandle) -> Result<Option<MinecraftCredentials>, String> {
 	let flow = minecraft::begin().await?;
+
+	// let result = (*(tokio::spawn(async {
+	// 	Box::pin(spawn_webview(handle, flow).await)
+	// }).await.map_err(|err| err.to_string())?)).clone()?;
+	let result = spawn_webview(handle, flow).await?;
+
+	Ok(result)
+}
+
+async fn spawn_webview(handle: AppHandle, flow: MinecraftLogin) -> Result<Option<MinecraftCredentials>, String> {
 	let now = chrono::Utc::now();
 
 	if let Some(win) = handle.get_webview_window("login") {
@@ -59,11 +69,11 @@ pub async fn auth_login(handle: AppHandle) -> Result<Option<MinecraftCredentials
 				.map_err(|err| err.to_string())?,
 		),
 	)
-	.title("Log into OneLauncher")
-	.always_on_top(true)
-	.center()
-	.build()
-	.map_err(|err| err.to_string())?;
+		.title("Log into OneLauncher")
+		.always_on_top(true)
+		.center()
+		.build()
+		.map_err(|err| err.to_string())?;
 
 	win.request_user_attention(Some(tauri::UserAttentionType::Critical))
 		.map_err(|err| err.to_string())?;
diff --git a/apps/frontend/src/ui/hooks/useSettings.tsx b/apps/frontend/src/ui/hooks/useSettings.tsx
index d5bf4de4..e7fe81ae 100644
--- a/apps/frontend/src/ui/hooks/useSettings.tsx
+++ b/apps/frontend/src/ui/hooks/useSettings.tsx
@@ -38,7 +38,6 @@ export function SettingsProvider(props: ParentProps) {
 			});
 		},
 		save: (settings) => {
-			console.log('saving settings');
 			bridge.commands.setSettings(settings).then(() => {
 				syncSettings(settings);
 				refetch();