Can finalize Matrix authentication

matrixgw_backend/src/matrix_connection/matrix_client.rs

@@ -1,8 +1,8 @@
 use crate::app_config::AppConfig;
 use crate::users::UserEmail;
 use crate::utils::rand_utils::rand_string;
-use matrix_sdk::authentication::oauth::OAuthError;
 use matrix_sdk::authentication::oauth::error::OAuthDiscoveryError;
+use matrix_sdk::authentication::oauth::{OAuthError, UrlOrQuery};
 use matrix_sdk::ruma::serde::Raw;
 use matrix_sdk::{Client, ClientBuildError};
 use url::Url;
@@ -28,6 +28,14 @@ enum MatrixClientError {
     ParseAuthRedirectURL(url::ParseError),
     #[error("Failed to build auth request! {0}")]
     BuildAuthRequest(OAuthError),
+    #[error("Failed to finalize authentication! {0}")]
+    FinishLogin(matrix_sdk::Error),
+}
+
+#[derive(serde::Deserialize)]
+pub struct FinishMatrixAuth {
+    code: String,
+    state: String,
 }
 
 #[derive(Clone)]
@@ -91,7 +99,7 @@ impl MatrixClient {
         todo!()
     }
 
-    /// Initiate oauth authentication
+    /// Initiate OAuth authentication
     pub async fn initiate_login(&self) -> anyhow::Result<Url> {
         let oauth = self.client.oauth();
 
@@ -112,4 +120,23 @@ impl MatrixClient {
 
         Ok(auth.url)
     }
+
+    /// Finish OAuth authentication
+    pub async fn finish_login(&self, info: FinishMatrixAuth) -> anyhow::Result<()> {
+        let oauth = self.client.oauth();
+        oauth
+            .finish_login(UrlOrQuery::Query(format!(
+                "state={}&code={}",
+                info.state, info.code
+            )))
+            .await
+            .map_err(MatrixClientError::FinishLogin)?;
+
+        log::info!(
+            "User successfully authenticated as {}!",
+            self.client.user_id().unwrap()
+        );
+
+        Ok(())
+    }
 }