Authentication

flake.nix

@@ -38,8 +38,7 @@
           gtk4 gdk-pixbuf atk webkitgtk dbus
         ];
         shell = [
-          toolchain
-          (with fenix; combine [toolchain default.clippy rust-analyzer])
+          (with fenix; combine [toolchain default.clippy complete.rust-src rust-analyzer])
           git
           jdk17 jdk8
         ];
@@ -58,19 +57,10 @@
         cli = utils.mkApp {
           drv = self.packages.${system}.theseus-cli;
         };
-        cli-test = utils.mkApp {
-          drv = pkgs.writeShellApplication {
-            name = "theseus-test-cli";
-            runtimeInputs = [
-              (self.packages.${system}.theseus-cli.overrideAttrs (old: old // {
-                release = false;
-              }))
-            ];
-            text = ''
-              DUMMY_ID="$(printf '%0.sa' {1..32})"
-              theseus_cli profile run -t "" -n "Test" -i "$DUMMY_ID" "$@"
-            '';
-          };
+        cli-dev = utils.mkApp {
+          drv = self.packages.${system}.theseus-cli.overrideAttrs (old: old // {
+            release = false;
+          });
         };
       };
 

theseus/Cargo.toml

@@ -7,38 +7,32 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-thiserror = "1.0"
-async-trait = "0.1.51"
-
-daedalus = { version = "0.1.16", features = ["bincode"] }
-
+bytes = "1"
 bincode = { version = "2.0.0-rc.1", features = ["serde"] }
-sled = { version = "0.34.7", features = ["compression"] }
-
-reqwest = { version = "0.11", features = ["json"] }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-json5 = "0.4.1"
-chrono = { version = "0.4", features = ["serde"] }
-uuid = { version = "0.8", features = ["serde", "v4"] }
-bytes = "1"
-zip = "0.5"
-zip-extensions = "0.6"
 sha1 = { version = "0.6.0", features = ["std"]}
-path-clean = "0.1.0"
-fs_extra = "1.2.0"
-dirs = "4.0"
+sled = { version = "0.34.7", features = ["compression"] }
+url = "2.2"
+uuid = { version = "1.1", features = ["serde", "v4"] }
+zip = "0.5"
 
+chrono = { version = "0.4.19", features = ["serde"] }
+daedalus = { version = "0.1.16", features = ["bincode"] }
+dirs = "4.0"
+# TODO: possibly replace with tracing to have structured logging
+log = "0.4.14"
 regex = "1.5"
-
-tokio = { version = "1", features = ["full"] }
-futures = "0.3"
-
 sys-info = "0.9.0"
+thiserror = "1.0"
+tracing = "0.1"
+tracing-error = "0.2"
 
-log = "0.4.14"
-const_format = "0.2.22"
+async-tungstenite = { version = "0.17", features = ["tokio-runtime", "tokio-native-tls"] }
+futures = "0.3"
 once_cell = "1.9.0"
+reqwest = { version = "0.11", features = ["json"] }
+tokio = { version = "1", features = ["full"] }
 
 [dev-dependencies]
 argh = "0.1.6"

theseus/src/api/auth.rs

@@ -0,0 +1,100 @@
+//! Authentication flow interface
+use crate::{launcher::auth as inner, State};
+use futures::prelude::*;
+use tokio::sync::oneshot;
+
+pub use inner::Credentials;
+
+/// Authenticate a user with Hydra
+/// To run this, you need to first spawn this function as a task, then
+/// open a browser to the given URL and finally wait on the spawned future
+/// with the ability to cancel in case the browser is closed before finishing
+#[tracing::instrument]
+pub async fn authenticate(
+    browser_url: oneshot::Sender<url::Url>,
+) -> crate::Result<Credentials> {
+    let mut flow = inner::HydraAuthFlow::new().await?;
+    let state = State::get().await?;
+    let mut users = state.users.write().await;
+
+    let url = flow.prepare_login_url().await?;
+    browser_url.send(url).map_err(|url| {
+        crate::ErrorKind::OtherError(format!(
+            "Error sending browser url to parent: {url}"
+        ))
+    })?;
+
+    let credentials = flow.extract_credentials().await?;
+    users.insert(&credentials)?;
+
+    if state.settings.read().await.default_user.is_none() {
+        let mut settings = state.settings.write().await;
+        settings.default_user = Some(credentials.id);
+    }
+
+    Ok(credentials)
+}
+
+/// Refresh some credentials using Hydra, if needed
+#[tracing::instrument]
+pub async fn refresh(
+    user: uuid::Uuid,
+    update_name: bool,
+) -> crate::Result<Credentials> {
+    let state = State::get().await?;
+    let mut users = state.users.write().await;
+
+    futures::future::ready(users.get(user)?.ok_or_else(|| {
+        crate::ErrorKind::OtherError(format!(
+            "Tried to refresh nonexistent user with ID {user}"
+        ))
+        .as_error()
+    }))
+    .and_then(|mut credentials| async move {
+        if chrono::offset::Utc::now() > credentials.expires {
+            inner::refresh_credentials(&mut credentials).await?;
+            if update_name {
+                inner::refresh_username(&mut credentials).await?;
+            }
+        }
+        users.insert(&credentials)?;
+        Ok(credentials)
+    })
+    .await
+}
+
+/// Remove a user account from the database
+#[tracing::instrument]
+pub async fn remove_user(user: uuid::Uuid) -> crate::Result<()> {
+    let state = State::get().await?;
+    let mut users = state.users.write().await;
+
+    if state.settings.read().await.default_user == Some(user) {
+        let mut settings = state.settings.write().await;
+        settings.default_user = users
+            .0
+            .first()?
+            .map(|it| uuid::Uuid::from_slice(&it.0))
+            .transpose()?;
+    }
+
+    users.remove(user)?;
+    Ok(())
+}
+
+/// Check if a user exists in Theseus
+#[tracing::instrument]
+pub async fn has_user(user: uuid::Uuid) -> crate::Result<bool> {
+    let state = State::get().await?;
+    let users = state.users.read().await;
+
+    Ok(users.contains(user)?)
+}
+
+/// Get a copy of the list of all user credentials
+#[tracing::instrument]
+pub async fn users() -> crate::Result<Box<[Credentials]>> {
+    let state = State::get().await?;
+    let users = state.users.read().await;
+    users.iter().collect()
+}

theseus/src/api/mod.rs

@@ -1,18 +1,17 @@
 //! API for interacting with Theseus
+pub mod auth;
 pub mod profile;
 
 pub mod data {
-    pub use crate::{
-        launcher::Credentials,
-        state::{
-            DirectoryInfo, Hooks, JavaSettings, MemorySettings, ModLoader,
-            ProfileMetadata, Settings, WindowSize,
-        },
+    pub use crate::state::{
+        DirectoryInfo, Hooks, JavaSettings, MemorySettings, ModLoader,
+        ProfileMetadata, Settings, WindowSize,
     };
 }
 
 pub mod prelude {
     pub use crate::{
+        auth::{self, Credentials},
         data::*,
         profile::{self, Profile},
         State,