Add error handling

theseus/src/launcher/auth.rs

@@ -1,162 +1,178 @@
-use serde::{Deserialize, Serialize};
-use uuid::Uuid;
+pub mod api {
+    use serde::{Deserialize, Serialize};
+    use uuid::Uuid;
 
-#[derive(Debug, Serialize, Deserialize)]
-pub struct GameProfile {
-    pub id: Uuid,
-    pub name: String,
-}
+    #[derive(Debug, Serialize, Deserialize)]
+    pub struct GameProfile {
+        pub id: Uuid,
+        pub name: String,
+    }
 
-#[derive(Debug, Deserialize)]
-pub struct UserProperty {
-    pub name: String,
-    pub value: String,
-}
+    #[derive(Debug, Deserialize)]
+    pub struct UserProperty {
+        pub name: String,
+        pub value: String,
+    }
 
-#[derive(Debug, Deserialize)]
-pub struct User {
-    pub id: String,
-    pub username: String,
-    pub properties: Option<Vec<UserProperty>>,
-}
+    #[derive(Debug, Deserialize)]
+    pub struct User {
+        pub id: String,
+        pub username: String,
+        pub properties: Option<Vec<UserProperty>>,
+    }
 
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct AuthenticateResponse {
-    pub user: Option<User>,
-    pub client_token: Uuid,
-    pub access_token: String,
-    pub available_profiles: Vec<GameProfile>,
-    pub selected_profile: Option<GameProfile>,
-}
+    #[derive(Debug, Deserialize)]
+    #[serde(rename_all = "camelCase")]
+    pub struct AuthenticateResponse {
+        pub user: Option<User>,
+        pub client_token: Uuid,
+        pub access_token: String,
+        pub available_profiles: Vec<GameProfile>,
+        pub selected_profile: Option<GameProfile>,
+    }
 
-pub async fn login(username: &str, password: &str, request_user: bool) -> AuthenticateResponse {
-    let client = reqwest::Client::new();
+    pub async fn login(
+        username: &str,
+        password: &str,
+        request_user: bool,
+    ) -> Result<AuthenticateResponse, reqwest::Error> {
+        let client = reqwest::Client::new();
 
-    client
-        .post("https://authserver.mojang.com/authenticate")
-        .header(reqwest::header::CONTENT_TYPE, "application/json")
-        .body(
-            serde_json::json!(
-                {
-                    "agent": {
-                        "name": "Minecraft",
-                        "version": 1
-                    },
-                    "username": username,
-                    "password": password,
-                    "clientToken": Uuid::new_v4(),
-                    "requestUser": request_user
-                }
+        client
+            .post("https://authserver.mojang.com/authenticate")
+            .header(reqwest::header::CONTENT_TYPE, "application/json")
+            .body(
+                serde_json::json!(
+                    {
+                        "agent": {
+                            "name": "Minecraft",
+                            "version": 1
+                        },
+                        "username": username,
+                        "password": password,
+                        "clientToken": Uuid::new_v4(),
+                        "requestUser": request_user
+                    }
+                )
+                .to_string(),
             )
-            .to_string(),
-        )
-        .send()
-        .await
-        .unwrap()
-        .json()
-        .await
-        .unwrap()
-}
+            .send()
+            .await?
+            .json()
+            .await
+    }
 
-pub async fn sign_out(username: &str, password: &str) {
-    let client = reqwest::Client::new();
+    pub async fn sign_out(username: &str, password: &str) -> Result<(), reqwest::Error> {
+        let client = reqwest::Client::new();
 
-    client
-        .post("https://authserver.mojang.com/signout")
-        .header(reqwest::header::CONTENT_TYPE, "application/json")
-        .body(
-            serde_json::json!(
-                {
-                    "username": username,
-                    "password": password
-                }
+        client
+            .post("https://authserver.mojang.com/signout")
+            .header(reqwest::header::CONTENT_TYPE, "application/json")
+            .body(
+                serde_json::json!(
+                    {
+                        "username": username,
+                        "password": password
+                    }
+                )
+                .to_string(),
             )
-            .to_string(),
-        )
-        .send()
-        .await
-        .unwrap();
-}
+            .send()
+            .await?;
 
-pub async fn validate(access_token: &str, client_token: &str) {
-    let client = reqwest::Client::new();
+        Ok(())
+    }
 
-    client
-        .post("https://authserver.mojang.com/validate")
-        .header(reqwest::header::CONTENT_TYPE, "application/json")
-        .body(
-            serde_json::json!(
-                {
-                    "accessToken": access_token,
-                    "clientToken": client_token
-                }
+    pub async fn validate(access_token: &str, client_token: &str) -> Result<(), reqwest::Error> {
+        let client = reqwest::Client::new();
+
+        client
+            .post("https://authserver.mojang.com/validate")
+            .header(reqwest::header::CONTENT_TYPE, "application/json")
+            .body(
+                serde_json::json!(
+                    {
+                        "accessToken": access_token,
+                        "clientToken": client_token
+                    }
+                )
+                .to_string(),
             )
-            .to_string(),
-        )
-        .send()
-        .await
-        .unwrap();
-}
+            .send()
+            .await?;
 
-pub async fn invalidate(access_token: &str, client_token: &str) {
-    let client = reqwest::Client::new();
+        Ok(())
+    }
 
-    client
-        .post("https://authserver.mojang.com/invalidate")
-        .header(reqwest::header::CONTENT_TYPE, "application/json")
-        .body(
-            serde_json::json!(
-                {
-                    "accessToken": access_token,
-                    "clientToken": client_token
-                }
+    pub async fn invalidate(access_token: &str, client_token: &str) -> Result<(), reqwest::Error> {
+        let client = reqwest::Client::new();
+
+        client
+            .post("https://authserver.mojang.com/invalidate")
+            .header(reqwest::header::CONTENT_TYPE, "application/json")
+            .body(
+                serde_json::json!(
+                    {
+                        "accessToken": access_token,
+                        "clientToken": client_token
+                    }
+                )
+                .to_string(),
             )
-            .to_string(),
-        )
-        .send()
-        .await
-        .unwrap();
-}
+            .send()
+            .await?;
 
-#[derive(Debug, Deserialize)]
-#[serde(rename_all = "camelCase")]
-pub struct RefreshResponse {
-    pub user: Option<User>,
-    pub client_token: Uuid,
-    pub access_token: String,
-    pub selected_profile: Option<GameProfile>,
-}
+        Ok(())
+    }
 
-pub async fn refresh(
-    access_token: &str,
-    client_token: &str,
-    selected_profile: &GameProfile,
-    request_user: bool,
-) -> RefreshResponse {
-    let client = reqwest::Client::new();
+    #[derive(Debug, Deserialize)]
+    #[serde(rename_all = "camelCase")]
+    pub struct RefreshResponse {
+        pub user: Option<User>,
+        pub client_token: Uuid,
+        pub access_token: String,
+        pub selected_profile: Option<GameProfile>,
+    }
 
-    client
-        .post("https://authserver.mojang.com/refresh")
-        .header(reqwest::header::CONTENT_TYPE, "application/json")
-        .body(
-            serde_json::json!(
-                {
-                    "accessToken": access_token,
-                    "clientToken": client_token,
-                    "selectedProfile": {
-                        "id": selected_profile.id,
-                        "name": selected_profile.name,
-                    },
-                    "requestUser": request_user,
-                }
+    pub async fn refresh(
+        access_token: &str,
+        client_token: &str,
+        selected_profile: &GameProfile,
+        request_user: bool,
+    ) -> Result<RefreshResponse, reqwest::Error> {
+        let client = reqwest::Client::new();
+
+        client
+            .post("https://authserver.mojang.com/refresh")
+            .header(reqwest::header::CONTENT_TYPE, "application/json")
+            .body(
+                serde_json::json!(
+                    {
+                        "accessToken": access_token,
+                        "clientToken": client_token,
+                        "selectedProfile": {
+                            "id": selected_profile.id,
+                            "name": selected_profile.name,
+                        },
+                        "requestUser": request_user,
+                    }
+                )
+                .to_string(),
             )
-            .to_string(),
-        )
-        .send()
-        .await
-        .unwrap()
-        .json()
-        .await
-        .unwrap()
+            .send()
+            .await?
+            .json()
+            .await
+    }
+}
+
+pub mod provider {
+    use uuid::Uuid;
+
+    #[derive(Debug)]
+    pub struct Credentials {
+        pub id: Uuid,
+        pub username: String,
+        pub access_token: String,
+    }
 }