Auth "refactor"

...aka just move it into its own module. Also update copyright and tidy random stuff or whatever
andre4ik3 · Mar 4, 2024 · c4f262e · c4f262e
1 parent eda23bd
commit c4f262e
Show file tree

Hide file tree

Showing 95 changed files with 1,255 additions and 318 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,3 +1,3 @@
 [workspace]
-members = ["core", "macros", "modules/*", "silo"]
+members = ["core", "modules/macros", "modules/*", "silo"]
 resolver = "2"
diff --git a/apps/cli/src/cli.rs b/apps/cli/src/cli.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/cli/src/main.rs b/apps/cli/src/main.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/linux/build.rs b/apps/linux/build.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/linux/src/main.rs b/apps/linux/src/main.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/macos/Launcher/Resources/Info.plist b/apps/macos/Launcher/Resources/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright © 2023 andre4ik3</string>
+	<string>Copyright © 2023-2024 andre4ik3</string>
 	<key>NSMicrophoneUsageDescription</key>
 	<string>A mod is requesting access to the microphone.</string>
 	<key>SUEnableInstallerLauncherService</key>

diff --git a/apps/macos/Launcher/Sources/BridgingHeader.h b/apps/macos/Launcher/Sources/BridgingHeader.h
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/macos/Launcher/Sources/LauncherApp.swift b/apps/macos/Launcher/Sources/LauncherApp.swift
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/macos/Launcher/Sources/Models/Instance.swift b/apps/macos/Launcher/Sources/Models/Instance.swift
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/macos/Launcher/Sources/Models/SettingsContainer.swift b/apps/macos/Launcher/Sources/Models/SettingsContainer.swift
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/macos/Launcher/Sources/Views/ContentView.swift b/apps/macos/Launcher/Sources/Views/ContentView.swift
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/macos/Launcher/Sources/Views/InstancesView.swift b/apps/macos/Launcher/Sources/Views/InstancesView.swift
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/macos/Launcher/Sources/Views/Settings/JavaInstallationsView.swift b/apps/macos/Launcher/Sources/Views/Settings/JavaInstallationsView.swift
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/macos/Launcher/Sources/Views/SettingsView.swift b/apps/macos/Launcher/Sources/Views/SettingsView.swift
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/macos/build.rs b/apps/macos/build.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/macos/src/lib.rs b/apps/macos/src/lib.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/main.rs b/apps/metagen/src/main.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/models/game/assets.rs b/apps/metagen/src/models/game/assets.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/models/game/common.rs b/apps/metagen/src/models/game/common.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/models/game/manifest/legacy.rs b/apps/metagen/src/models/game/manifest/legacy.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/models/game/manifest/mod.rs b/apps/metagen/src/models/game/manifest/mod.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/models/game/manifest/v17w43a.rs b/apps/metagen/src/models/game/manifest/v17w43a.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/models/game/mod.rs b/apps/metagen/src/models/game/mod.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/models/game/version.rs b/apps/metagen/src/models/game/version.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/models/java/adoptium.rs b/apps/metagen/src/models/java/adoptium.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/models/java/mod.rs b/apps/metagen/src/models/java/mod.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/models/java/zulu.rs b/apps/metagen/src/models/java/zulu.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/models/mod.rs b/apps/metagen/src/models/mod.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/tasks/assets.rs b/apps/metagen/src/tasks/assets.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/tasks/game.rs b/apps/metagen/src/tasks/game.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/tasks/index.rs b/apps/metagen/src/tasks/index.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/tasks/java/adoptium.rs b/apps/metagen/src/tasks/java/adoptium.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/tasks/java/mod.rs b/apps/metagen/src/tasks/java/mod.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/tasks/java/zulu.rs b/apps/metagen/src/tasks/java/zulu.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/tasks/loaders/fabric.rs b/apps/metagen/src/tasks/loaders/fabric.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/tasks/loaders/forge.rs b/apps/metagen/src/tasks/loaders/forge.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/tasks/loaders/mod.rs b/apps/metagen/src/tasks/loaders/mod.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/tasks/mod.rs b/apps/metagen/src/tasks/mod.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/apps/metagen/src/utils.rs b/apps/metagen/src/utils.rs
@@ -1,4 +1,4 @@
-// Copyright © 2023 andre4ik3
+// Copyright © 2023-2024 andre4ik3
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by

diff --git a/modules/auth/Cargo.toml b/modules/auth/Cargo.toml
@@ -0,0 +1,18 @@
+[package]
+name = "launcher-auth"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]
+data = { path = "../data", version = "*", package = "launcher-data" }
+fetch = { path = "../fetch", version = "*", package = "launcher-fetch" }
+net = { path = "../net", version = "*", package = "launcher-net" }
+persistence = { path = "../persistence", version = "*", package = "launcher-persistence" }
+utils = { path = "../utils", version = "*", package = "launcher-utils" }
+
+async-trait = "0.1"
+chrono = { version = "0.4", default-features = false, features = ["clock", "serde"] }
+thiserror = "1"
+tracing = "0.1"
+url = { version = "2", features = ["serde"] }
+uuid = { version = "1", features = ["v4"] }
diff --git a/modules/auth/src/lib.rs b/modules/auth/src/lib.rs
@@ -0,0 +1,58 @@
+// Copyright © 2023-2024 andre4ik3
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+//! Launcher Authentication Module
+//! ==============================
+//!
+//! This module deals with everything to do with online account authentication. Each authentication
+//! service is divided
+
+use async_trait::async_trait;
+use thiserror::Error;
+
+use data::auth::Account;
+pub use microsoft::MicrosoftAuthenticationService;
+use net::Client;
+pub use offline::OfflineAuthenticationService;
+
+pub(crate) mod microsoft;
+pub(crate) mod offline;
+
+#[derive(Debug, Error)]
+pub enum Error {
+    #[error("wrong account type in authentication service: expected {0} but got {1}")]
+    WrongAccountType(&'static str, &'static str),
+    #[error("reauthentication is required")]
+    ReauthenticationRequired,
+    #[error("network error: {0}")]
+    NetworkError(#[from] net::Error),
+    #[error("failed decoding response from xbox api")]
+    DecodingError,
+}
+
+pub type Result<T> = core::result::Result<T, Error>;
+
+/// A generic interface for interacting with an authentication service.
+#[async_trait]
+pub trait AuthenticationMethod {
+    /// The type of credentials that this authentication service accepts.
+    type Credentials;
+
+    /// Authenticates with the service, returning an authenticated account ready to be persisted.
+    async fn authenticate(client: &Client, credentials: Self::Credentials) -> Result<Account>;
+
+    /// Refreshes an expired account so that it is ready to be used again.
+    async fn refresh(client: &Client, account: Account) -> Result<Account>;
+}