fix(sdk): Use a short request retry for login/register/get_version methods

Author: poljar

crates/matrix-sdk/src/client.rs

@@ -341,11 +341,7 @@ impl Client {
     /// # Result::<_, anyhow::Error>::Ok(()) });
     /// ```
     pub async fn get_supported_versions(&self) -> HttpResult<get_supported_versions::Response> {
-        self.send(
-            get_supported_versions::Request::new(),
-            Some(RequestConfig::new().disable_retry()),
-        )
-        .await
+        self.send(get_supported_versions::Request::new(), Some(RequestConfig::short_retry())).await
     }
 
     /// Get the capabilities of the homeserver.
@@ -834,7 +830,7 @@ impl Client {
             initial_device_display_name,
         });
 
-        let response = self.send(request, None).await?;
+        let response = self.send(request, Some(RequestConfig::short_retry())).await?;
         self.receive_login_response(&response).await?;
 
         Ok(response)
@@ -1117,7 +1113,7 @@ impl Client {
             }
         );
 
-        let response = self.send(request, None).await?;
+        let response = self.send(request, Some(RequestConfig::short_retry())).await?;
         self.receive_login_response(&response).await?;
 
         Ok(response)
@@ -1249,7 +1245,7 @@ impl Client {
         info!("Registering to {}", homeserver);
 
         let config = if self.inner.appservice_mode {
-            Some(self.inner.http_client.request_config.force_auth())
+            Some(RequestConfig::short_retry().force_auth())
         } else {
             None
         };
@@ -3631,13 +3627,12 @@ pub(crate) mod test {
     }
 
     #[async_test]
-    async fn no_retry_http_requests() {
+    async fn short_retry_initial_http_requests() {
         let homeserver = Url::from_str(&mockito::server_url()).unwrap();
-        let config = ClientConfig::default().request_config(RequestConfig::new().disable_retry());
-        assert!(config.request_config.retry_limit.unwrap() == 0);
-        let client = Client::new_with_config(homeserver, config).await.unwrap();
+        let client = Client::new(homeserver).await.unwrap();
 
-        let m = mock("POST", "/_matrix/client/r0/login").with_status(501).create();
+        let m =
+            mock("POST", "/_matrix/client/r0/login").with_status(501).expect_at_least(3).create();
 
         if client.login("example", "wordpass", None, None).await.is_err() {
             m.assert();
@@ -3646,6 +3641,19 @@ pub(crate) mod test {
         }
     }
 
+    #[async_test]
+    async fn no_retry_http_requests() {
+        let client = logged_in_client().await;
+
+        let m = mock("GET", "/_matrix/client/r0/devices").with_status(501).create();
+
+        if client.devices().await.is_err() {
+            m.assert();
+        } else {
+            panic!("this request should return an `Err` variant")
+        }
+    }
+
     #[async_test]
     async fn get_media_content() {
         let client = logged_in_client().await;

crates/matrix-sdk/src/config/request.rs

@@ -77,6 +77,13 @@ impl RequestConfig {
         Default::default()
     }
 
+    /// Create a new `RequestConfig` with default values, except the retry limit
+    /// which is set to 3.
+    #[must_use]
+    pub fn short_retry() -> Self {
+        Self::default().retry_limit(3)
+    }
+
     /// This is a convince method to disable the retries of a request. Setting
     /// the `retry_limit` to `0` has the same effect.
     #[must_use]