Merge MFA into dev

Cargo.toml

@@ -89,5 +89,8 @@ wasm-bindgen-test = "0.3.43"
 wasm-bindgen = "0.2.93"
 simple_logger = { version = "5.0.0", default-features = false }
 
+[target.'cfg(not(target_arch = "wasm32"))'.dev-dependencies]
+httptest = "0.16.1"
+
 [lints.rust]
 unexpected_cfgs = { level = "allow", check-cfg = ['cfg(tarpaulin_include)'] }

src/api/auth/login.rs

@@ -11,7 +11,10 @@ use crate::errors::ChorusResult;
 use crate::gateway::Gateway;
 use crate::instance::{ChorusUser, Instance};
 use crate::ratelimiter::ChorusRequest;
-use crate::types::{GatewayIdentifyPayload, LimitType, LoginResult, LoginSchema, User};
+use crate::types::{
+    MfaAuthenticationType, GatewayIdentifyPayload, LimitType, LoginResult, LoginSchema,
+    SendMfaSmsResponse, SendMfaSmsSchema, User, VerifyMFALoginResponse, VerifyMFALoginSchema,
+};
 
 impl Instance {
     /// Logs into an existing account on the spacebar server.
@@ -27,6 +30,7 @@ impl Instance {
                 .header("Content-Type", "application/json"),
             limit_type: LimitType::AuthLogin,
         };
+
         // We do not have a user yet, and the UserRateLimits will not be affected by a login
         // request (since login is an instance wide limit), which is why we are just cloning the
         // instances' limits to pass them on as user_rate_limits later.
@@ -35,16 +39,82 @@ impl Instance {
         let login_result = chorus_request
             .deserialize_response::<LoginResult>(&mut user)
             .await?;
-        user.set_token(&login_result.token);
-        user.settings = login_result.settings;
 
-        let object = User::get_current(&mut user).await?;
-        *user.object.write().unwrap() = object;
+        user.update_with_login_data(login_result.token, Some(login_result.settings))
+            .await?;
+
+        Ok(user)
+    }
+
+    /// Verifies a multi-factor authentication login
+    ///
+    /// # Reference
+    /// See <https://docs.discord.sex/authentication#verify-mfa-login>
+    pub async fn verify_mfa_login(
+        &mut self,
+        authenticator: MfaAuthenticationType,
+        schema: VerifyMFALoginSchema,
+    ) -> ChorusResult<ChorusUser> {
+        let endpoint_url = self.urls.api.clone() + "/auth/mfa/" + &authenticator.to_string();
+
+        let chorus_request = ChorusRequest {
+            request: Client::new()
+                .post(endpoint_url)
+                .header("Content-Type", "application/json")
+                .json(&schema),
+            limit_type: LimitType::AuthLogin,
+        };
+
+        let mut user = ChorusUser::shell(Arc::new(RwLock::new(self.clone())), "None").await;
 
-        let mut identify = GatewayIdentifyPayload::common();
-        identify.token = user.token();
-        user.gateway.send_identify(identify).await;
+        match chorus_request
+            .deserialize_response::<VerifyMFALoginResponse>(&mut user)
+            .await?
+        {
+            VerifyMFALoginResponse::Success {
+                token,
+                user_settings,
+            } => {
+                user.update_with_login_data(token, Some(user_settings))
+                    .await?;
+            }
+            VerifyMFALoginResponse::UserSuspended {
+                suspended_user_token,
+            } => {
+                return Err(crate::errors::ChorusError::SuspendUser {
+                    token: suspended_user_token,
+                })
+            }
+        }
 
         Ok(user)
     }
+
+    /// Sends a multi-factor authentication code to the user's phone number
+    ///
+    /// # Reference
+    /// See <https://docs.discord.sex/authentication#send-mfa-sms>
+    // FIXME: This uses ChorusUser::shell, when it *really* shoudln't, but
+    // there is no other way to send a ratelimited request
+    pub async fn send_mfa_sms(
+        &mut self,
+        schema: SendMfaSmsSchema,
+    ) -> ChorusResult<SendMfaSmsResponse> {
+        let endpoint_url = self.urls.api.clone() + "/auth/mfa/sms/send";
+        let chorus_request = ChorusRequest {
+            request: Client::new()
+                .post(endpoint_url)
+                .header("Content-Type", "application/json")
+                .json(&schema),
+            limit_type: LimitType::Ip,
+        };
+
+        let mut chorus_user = ChorusUser::shell(Arc::new(RwLock::new(self.clone())), "None").await;
+
+        let send_mfa_sms_response = chorus_request
+            .deserialize_response::<SendMfaSmsResponse>(&mut chorus_user)
+            .await?;
+
+        Ok(send_mfa_sms_response)
+    }
 }

src/api/auth/mod.rs

@@ -25,15 +25,7 @@ impl Instance {
     pub async fn login_with_token(&mut self, token: &str) -> ChorusResult<ChorusUser> {
         let mut user = ChorusUser::shell(Arc::new(RwLock::new(self.clone())), token).await;
 
-        let object = User::get_current(&mut user).await?;
-        let settings = User::get_settings(&mut user).await?;
-
-        *user.object.write().unwrap() = object;
-        *user.settings.write().unwrap() = settings;
-
-        let mut identify = GatewayIdentifyPayload::common();
-        identify.token = user.token();
-        user.gateway.send_identify(identify).await;
+		  user.update_with_login_data(token.to_string(), None).await?;
 
         Ok(user)
     }

src/api/auth/register.rs

@@ -43,18 +43,8 @@ impl Instance {
             .deserialize_response::<Token>(&mut user)
             .await?
             .token;
-
-        user.set_token(&token);
 
-        let object = User::get_current(&mut user).await?;
-        let settings = User::get_settings(&mut user).await?;
-
-        *user.object.write().unwrap() = object;
-        *user.settings.write().unwrap() = settings;
-
-        let mut identify = GatewayIdentifyPayload::common();
-        identify.token = user.token();
-        user.gateway.send_identify(identify).await;
+        user.update_with_login_data(token, None).await?;
 
         Ok(user)
     }

src/api/channels/channels.rs

@@ -30,7 +30,6 @@ impl Channel {
             ),
             None,
             None,
-            None,
             Some(user),
             LimitType::Channel(channel_id),
         );
@@ -61,7 +60,6 @@ impl Channel {
             &url,
             None,
             audit_log_reason.as_deref(),
-            None,
             Some(user),
             LimitType::Channel(self.id),
         );
@@ -101,7 +99,6 @@ impl Channel {
             &url,
             Some(to_string(&modify_data).unwrap()),
             audit_log_reason.as_deref(),
-            None,
             Some(user),
             LimitType::Channel(channel_id),
         );
@@ -134,7 +131,6 @@ impl Channel {
             &url,
             None,
             None,
-            None,
             Some(user),
             Default::default(),
         );
@@ -196,7 +192,6 @@ impl Channel {
             &url,
             None,
             None,
-            None,
             Some(user),
             LimitType::Channel(self.id),
         );
@@ -225,7 +220,6 @@ impl Channel {
             &url,
             Some(to_string(&schema).unwrap()),
             None,
-            None,
             Some(user),
             LimitType::Guild(guild_id),
         );

src/api/channels/messages.rs

@@ -152,7 +152,6 @@ impl Message {
             .as_str(),
             None,
             None,
-            None,
             Some(user),
             LimitType::Channel(channel_id),
         );
@@ -183,7 +182,6 @@ impl Message {
             .as_str(),
             None,
             audit_log_reason,
-            None,
             Some(user),
             LimitType::Channel(channel_id),
         );
@@ -210,7 +208,6 @@ impl Message {
             .as_str(),
             None,
             audit_log_reason,
-            None,
             Some(user),
             LimitType::Channel(channel_id),
         );
@@ -259,7 +256,6 @@ impl Message {
             .as_str(),
             Some(to_string(&schema).unwrap()),
             None,
-            None,
             Some(user),
             LimitType::Channel(channel_id),
         );
@@ -293,7 +289,6 @@ impl Message {
             .as_str(),
             Some(to_string(&schema).unwrap()),
             None,
-            None,
             Some(user),
             LimitType::Channel(channel_id),
         );
@@ -322,7 +317,6 @@ impl Message {
             .as_str(),
             None,
             None,
-            None,
             Some(user),
             LimitType::Channel(channel_id),
         );
@@ -349,7 +343,6 @@ impl Message {
             &url,
             None,
             None,
-            None,
             Some(user),
             LimitType::Channel(channel_id),
         );
@@ -383,7 +376,6 @@ impl Message {
             &url,
             Some(to_string(&schema).unwrap()),
             None,
-            None,
             Some(user),
             LimitType::Channel(channel_id),
         );
@@ -410,7 +402,6 @@ impl Message {
             &url,
             None,
             audit_log_reason.as_deref(),
-            None,
             Some(user),
             LimitType::Channel(channel_id),
         );
@@ -448,7 +439,6 @@ impl Message {
             .as_str(),
             Some(to_string(&messages).unwrap()),
             audit_log_reason.as_deref(),
-            None,
             Some(user),
             LimitType::Channel(channel_id),
         );
@@ -473,7 +463,6 @@ impl Message {
             .as_str(),
             None,
             None,
-            None,
             Some(user),
             LimitType::Channel(channel_id),
         );

src/api/channels/permissions.rs

@@ -83,7 +83,6 @@ impl types::Channel {
             &url,
             None,
             None,
-            None,
             Some(user),
             LimitType::Channel(channel_id),
         );