From 3b24d33822ad9a6dc0c9065fff975efcdd8cc372 Mon Sep 17 00:00:00 2001
From: Johannes Becker <j.becker@famedly.com>
Date: Mon, 10 May 2021 07:56:00 +0200
Subject: [PATCH] appservice: Rely on cfg-toggle in send_request

---
 matrix_sdk/src/client.rs      |   2 +
 matrix_sdk/src/http_client.rs | 130 ++++++++++++++++++++--------------
 2 files changed, 77 insertions(+), 55 deletions(-)

diff --git a/matrix_sdk/src/client.rs b/matrix_sdk/src/client.rs
index a5154fe2..983fb086 100644
--- a/matrix_sdk/src/client.rs
+++ b/matrix_sdk/src/client.rs
@@ -405,6 +405,7 @@ pub struct RequestConfig {
     pub(crate) retry_limit: Option<u64>,
     pub(crate) retry_timeout: Option<Duration>,
     pub(crate) force_auth: bool,
+    #[cfg(feature = "appservice")]
     pub(crate) assert_identity: bool,
 }
 
@@ -427,6 +428,7 @@ impl Default for RequestConfig {
             retry_limit: Default::default(),
             retry_timeout: Default::default(),
             force_auth: false,
+            #[cfg(feature = "appservice")]
             assert_identity: false,
         }
     }
diff --git a/matrix_sdk/src/http_client.rs b/matrix_sdk/src/http_client.rs
index 63c3142a..4f91143a 100644
--- a/matrix_sdk/src/http_client.rs
+++ b/matrix_sdk/src/http_client.rs
@@ -115,68 +115,88 @@ impl HttpClient {
             None => self.request_config,
         };
 
+        #[cfg(not(feature = "appservice"))]
+        let request = self.try_into_http_request(request, session, config).await?;
+
+        #[cfg(feature = "appservice")]
         let request = if !self.request_config.assert_identity {
-            let read_guard;
-            let access_token = if config.force_auth {
-                read_guard = session.read().await;
-                if let Some(session) = read_guard.as_ref() {
-                    SendAccessToken::Always(session.access_token.as_str())
-                } else {
-                    return Err(HttpError::ForcedAuthenticationWithoutAccessToken);
-                }
-            } else {
-                match Request::METADATA.authentication {
-                    AuthScheme::AccessToken => {
-                        read_guard = session.read().await;
-
-                        if let Some(session) = read_guard.as_ref() {
-                            SendAccessToken::IfRequired(session.access_token.as_str())
-                        } else {
-                            return Err(HttpError::AuthenticationRequired);
-                        }
-                    }
-                    AuthScheme::None => SendAccessToken::None,
-                    _ => return Err(HttpError::NotClientRequest),
-                }
-            };
-
-            request
-                .try_into_http_request::<BytesMut>(&self.homeserver.to_string(), access_token)?
-                .map(|body| body.freeze())
+            self.try_into_http_request(request, session, config).await?
         } else {
-            // this should be unreachable since assert_identity on request_config can only be set
-            // with the appservice feature active
-            #[cfg(not(feature = "appservice"))]
-            return Err(HttpError::NeedsAppserviceFeature);
-
-            #[cfg(feature = "appservice")]
-            {
-                let read_guard = session.read().await;
-                let access_token = if let Some(session) = read_guard.as_ref() {
-                    SendAccessToken::Always(session.access_token.as_str())
-                } else {
-                    return Err(HttpError::AuthenticationRequired);
-                };
-
-                let user_id = if let Some(session) = read_guard.as_ref() {
-                    session.user_id.clone()
-                } else {
-                    return Err(HttpError::UserIdRequired);
-                };
-
-                request
-                    .try_into_http_request_with_user_id::<BytesMut>(
-                        &self.homeserver.to_string(),
-                        access_token,
-                        user_id,
-                    )?
-                    .map(|body| body.freeze())
-            }
+            self.try_into_http_request_with_identy_assertion(request, session, config)
+                .await?
         };
 
         self.inner.send_request(request, config).await
     }
 
+    async fn try_into_http_request<Request: OutgoingRequest>(
+        &self,
+        request: Request,
+        session: Arc<RwLock<Option<Session>>>,
+        config: RequestConfig,
+    ) -> Result<http::Request<Bytes>, HttpError> {
+        let read_guard;
+        let access_token = if config.force_auth {
+            read_guard = session.read().await;
+            if let Some(session) = read_guard.as_ref() {
+                SendAccessToken::Always(session.access_token.as_str())
+            } else {
+                return Err(HttpError::ForcedAuthenticationWithoutAccessToken);
+            }
+        } else {
+            match Request::METADATA.authentication {
+                AuthScheme::AccessToken => {
+                    read_guard = session.read().await;
+
+                    if let Some(session) = read_guard.as_ref() {
+                        SendAccessToken::IfRequired(session.access_token.as_str())
+                    } else {
+                        return Err(HttpError::AuthenticationRequired);
+                    }
+                }
+                AuthScheme::None => SendAccessToken::None,
+                _ => return Err(HttpError::NotClientRequest),
+            }
+        };
+
+        let http_request = request
+            .try_into_http_request::<BytesMut>(&self.homeserver.to_string(), access_token)?
+            .map(|body| body.freeze());
+
+        Ok(http_request)
+    }
+
+    #[cfg(feature = "appservice")]
+    async fn try_into_http_request_with_identy_assertion<Request: OutgoingRequest>(
+        &self,
+        request: Request,
+        session: Arc<RwLock<Option<Session>>>,
+        _: RequestConfig,
+    ) -> Result<http::Request<Bytes>, HttpError> {
+        let read_guard = session.read().await;
+        let access_token = if let Some(session) = read_guard.as_ref() {
+            SendAccessToken::Always(session.access_token.as_str())
+        } else {
+            return Err(HttpError::AuthenticationRequired);
+        };
+
+        let user_id = if let Some(session) = read_guard.as_ref() {
+            session.user_id.clone()
+        } else {
+            return Err(HttpError::UserIdRequired);
+        };
+
+        let http_request = request
+            .try_into_http_request_with_user_id::<BytesMut>(
+                &self.homeserver.to_string(),
+                access_token,
+                user_id,
+            )?
+            .map(|body| body.freeze());
+
+        Ok(http_request)
+    }
+
     pub async fn upload(
         &self,
         request: create_content::Request<'_>,