Make futures Send and Sync

This requires `reqwest` >= 0.11.11, which is the earliest version of `reqwest` that depends on `hyper` >= 0.14.14, in which the returned futures became `Sync`. BREAKING CHANGES: All parameters passed to request_async() methods must now be Send and Sync, as must generic types stored in `*Request` types on which `request_async()` is called. Notably, this also means that futures returned by `AsyncHttpClient::call()` must be `Send` and `Sync`. Resolves #260.
ramosbugs · Mar 10, 2024 · 73df219 · 73df219
1 parent 4f7a22f
commit 73df219
Show file tree

Hide file tree

Showing 8 changed files with 271 additions and 118 deletions.
diff --git a/Cargo-1.65.lock b/Cargo-1.65.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -52,7 +52,7 @@ base64 = "0.13"
 thiserror = "1.0"
 http = "0.2"
 rand = "0.8"
-reqwest = { version = "0.11", optional = true, default-features = false }
+reqwest = { version = "0.11.11", optional = true, default-features = false }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 sha2 = "0.10"

diff --git a/src/devicecode.rs b/src/devicecode.rs
@@ -121,7 +121,7 @@ where
 
 impl<'a, TE> DeviceAuthorizationRequest<'a, TE>
 where
-    TE: ErrorResponse + 'static,
+    TE: ErrorResponse + Send + Sync + 'static,
 {
     /// Appends an extra param to the token request.
     ///
@@ -196,7 +196,7 @@ where
     ) -> Pin<Box<DeviceAuthorizationRequestFuture<'c, C, EF, TE>>>
     where
         Self: 'c,
-        C: AsyncHttpClient<'c>,
+        C: AsyncHttpClient<'c> + Send + Sync,
         EF: ExtraDeviceAuthorizationFields,
     {
         Box::pin(async move { endpoint_response(http_client.call(self.prepare_request()?).await?) })
@@ -331,9 +331,12 @@ where
     >
     where
         Self: 'c,
-        C: AsyncHttpClient<'c>,
-        S: Fn(Duration) -> SF + 'c,
-        SF: Future<Output = ()>,
+        C: AsyncHttpClient<'c> + Send + Sync,
+        EF: Send + Sync,
+        S: Fn(Duration) -> SF + Send + Sync + 'c,
+        SF: Future<Output = ()> + Send + Sync,
+        TR: Send + Sync,
+        TT: Send + Sync,
     {
         Box::pin(async move {
             // Get the request timeout and starting interval

diff --git a/src/endpoint.rs b/src/endpoint.rs
@@ -22,18 +22,18 @@ pub type HttpResponse = http::Response<Vec<u8>>;
 /// An asynchronous (future-based) HTTP client.
 pub trait AsyncHttpClient<'c> {
     /// Error type returned by HTTP client.
-    type Error: Error + 'static;
+    type Error: Error + Send + Sync + 'static;
 
     /// Perform a single HTTP request.
     fn call(
         &'c self,
         request: HttpRequest,
-    ) -> Pin<Box<dyn Future<Output = Result<HttpResponse, Self::Error>> + 'c>>;
+    ) -> Pin<Box<dyn Future<Output = Result<HttpResponse, Self::Error>> + Send + Sync + 'c>>;
 }
 impl<'c, E, F, T> AsyncHttpClient<'c> for T
 where
-    E: Error + 'static,
-    F: Future<Output = Result<HttpResponse, E>> + 'c,
+    E: Error + Send + Sync + 'static,
+    F: Future<Output = Result<HttpResponse, E>> + Send + Sync + 'c,
     // We can't implement this for FnOnce because the device authorization flow requires clients to
     // supportmultiple calls.
     T: Fn(HttpRequest) -> F,
@@ -43,7 +43,7 @@ where
     fn call(
         &'c self,
         request: HttpRequest,
-    ) -> Pin<Box<dyn Future<Output = Result<HttpResponse, Self::Error>> + 'c>> {
+    ) -> Pin<Box<dyn Future<Output = Result<HttpResponse, Self::Error>> + Send + Sync + 'c>> {
         Box::pin(self(request))
     }
 }

diff --git a/src/introspection.rs b/src/introspection.rs
@@ -183,7 +183,10 @@ where
     ) -> Pin<Box<TokenRequestFuture<'c, <C as AsyncHttpClient<'c>>::Error, TE, TIR>>>
     where
         Self: 'c,
-        C: AsyncHttpClient<'c>,
+        C: AsyncHttpClient<'c> + Send + Sync,
+        TE: Send + Sync,
+        TIR: Send + Sync,
+        TT: Send + Sync,
     {
         Box::pin(async move { endpoint_response(http_client.call(self.prepare_request()?).await?) })
     }

diff --git a/src/reqwest_client.rs b/src/reqwest_client.rs
@@ -9,7 +9,7 @@ impl<'c> AsyncHttpClient<'c> for reqwest::Client {
     fn call(
         &'c self,
         request: HttpRequest,
-    ) -> Pin<Box<dyn Future<Output = Result<HttpResponse, Self::Error>> + 'c>> {
+    ) -> Pin<Box<dyn Future<Output = Result<HttpResponse, Self::Error>> + Send + Sync + 'c>> {
         Box::pin(async move {
             let response = self
                 .execute(request.try_into().map_err(Box::new)?)

diff --git a/src/revocation.rs b/src/revocation.rs
@@ -305,7 +305,9 @@ where
     ) -> Pin<Box<TokenRequestFuture<'c, <C as AsyncHttpClient<'c>>::Error, TE, ()>>>
     where
         Self: 'c,
-        C: AsyncHttpClient<'c>,
+        C: AsyncHttpClient<'c> + Send + Sync,
+        RT: Send + Sync,
+        TE: Send + Sync,
     {
         Box::pin(async move { endpoint_response(http_client.call(self.prepare_request()?).await?) })
     }

diff --git a/src/token/mod.rs b/src/token/mod.rs
@@ -131,7 +131,7 @@ where
 
 /// Future returned by `request_async` methods.
 pub type TokenRequestFuture<'c, RE, TE, TR> =
-    dyn Future<Output = Result<TR, RequestTokenError<RE, TE>>> + 'c;
+    dyn Future<Output = Result<TR, RequestTokenError<RE, TE>>> + Send + Sync + 'c;
 
 /// A request to exchange an authorization code for an access token.
 ///
@@ -240,7 +240,10 @@ where
     ) -> Pin<Box<TokenRequestFuture<'c, <C as AsyncHttpClient<'c>>::Error, TE, TR>>>
     where
         Self: 'c,
-        C: AsyncHttpClient<'c>,
+        C: AsyncHttpClient<'c> + Send + Sync,
+        TE: Send + Sync,
+        TR: Send + Sync,
+        TT: Send + Sync,
     {
         Box::pin(async move { endpoint_response(http_client.call(self.prepare_request()?).await?) })
     }
@@ -325,7 +328,10 @@ where
     ) -> Pin<Box<TokenRequestFuture<'c, <C as AsyncHttpClient<'c>>::Error, TE, TR>>>
     where
         Self: 'c,
-        C: AsyncHttpClient<'c>,
+        C: AsyncHttpClient<'c> + Send + Sync,
+        TE: Send + Sync,
+        TR: Send + Sync,
+        TT: Send + Sync,
     {
         Box::pin(async move { endpoint_response(http_client.call(self.prepare_request()?).await?) })
     }
@@ -432,7 +438,10 @@ where
     ) -> Pin<Box<TokenRequestFuture<'c, <C as AsyncHttpClient<'c>>::Error, TE, TR>>>
     where
         Self: 'c,
-        C: AsyncHttpClient<'c>,
+        C: AsyncHttpClient<'c> + Send + Sync,
+        TE: Send + Sync,
+        TR: Send + Sync,
+        TT: Send + Sync,
     {
         Box::pin(async move { endpoint_response(http_client.call(self.prepare_request()?).await?) })
     }
@@ -538,7 +547,10 @@ where
     ) -> Pin<Box<TokenRequestFuture<'c, <C as AsyncHttpClient<'c>>::Error, TE, TR>>>
     where
         Self: 'c,
-        C: AsyncHttpClient<'c>,
+        C: AsyncHttpClient<'c> + Send + Sync,
+        TE: Send + Sync,
+        TR: Send + Sync,
+        TT: Send + Sync,
     {
         Box::pin(async move { endpoint_response(http_client.call(self.prepare_request()?).await?) })
     }