Switch to official launcher auth (#1118)

* Switch to official launcher auth

* add debug info

* Fix build

theseus/src/state/mod.rs

@@ -5,7 +5,6 @@ use std::path::PathBuf;
 use crate::event::LoadingBarType;
 use crate::loading_join;
 
-use crate::state::users::Users;
 use crate::util::fetch::{self, FetchSemaphore, IoSemaphore};
 use notify::RecommendedWatcher;
 use notify_debouncer_mini::{new_debouncer, DebounceEventResult, Debouncer};
@@ -32,14 +31,9 @@ pub use self::settings::*;
 mod projects;
 pub use self::projects::*;
 
-mod users;
-
 mod children;
 pub use self::children::*;
 
-mod auth_task;
-pub use self::auth_task::*;
-
 mod tags;
 pub use self::tags::*;
 
@@ -52,6 +46,9 @@ pub use self::safe_processes::*;
 mod discord;
 pub use self::discord::*;
 
+mod minecraft_auth;
+pub use self::minecraft_auth::*;
+
 mod mr_auth;
 pub use self::mr_auth::*;
 
@@ -87,9 +84,7 @@ pub struct State {
     /// Launcher processes that should be safely exited on shutdown
     pub(crate) safety_processes: RwLock<SafeProcesses>,
     /// Launcher user account info
-    pub(crate) users: RwLock<Users>,
-    /// Authentication flow
-    pub auth_flow: RwLock<AuthTask>,
+    pub(crate) users: RwLock<MinecraftAuthStore>,
     /// Modrinth Credentials Store
     pub credentials: RwLock<CredentialsStore>,
     /// Modrinth auth flow
@@ -172,7 +167,7 @@ impl State {
             &fetch_semaphore,
             &CredentialsStore(None),
         );
-        let users_fut = Users::init(&directories, &io_semaphore);
+        let users_fut = MinecraftAuthStore::init(&directories, &io_semaphore);
         let creds_fut = CredentialsStore::init(&directories, &io_semaphore);
         // Launcher data
         let (metadata, profiles, tags, users, creds) = loading_join! {
@@ -184,7 +179,6 @@ impl State {
             creds_fut,
         }?;
 
-        let auth_flow = AuthTask::new();
         let safety_processes = SafeProcesses::new();
 
         let discord_rpc = DiscordGuard::init(is_offline).await?;
@@ -217,7 +211,6 @@ impl State {
             profiles: RwLock::new(profiles),
             users: RwLock::new(users),
             children: RwLock::new(children),
-            auth_flow: RwLock::new(auth_flow),
             credentials: RwLock::new(creds),
             tags: RwLock::new(tags),
             discord_rpc,
@@ -253,9 +246,8 @@ impl State {
                     let res4 = Profiles::update_projects();
                     let res5 = Settings::update_java();
                     let res6 = CredentialsStore::update_creds();
-                    let res7 = Settings::update_default_user();
 
-                    let _ = join!(res1, res2, res3, res4, res5, res6, res7);
+                    let _ = join!(res1, res2, res3, res4, res5, res6);
                 }
             }
         });