Merge pull request #239 from threema-donat/add_timeout_option

Add timeout option

.github/workflows/test.yml

@@ -4,7 +4,7 @@ name: Actions CI
 
 jobs:
   build_and_test:
-    name: yup-oauth2
+    name: Run tests
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
@@ -21,7 +21,7 @@ jobs:
       - run: cargo test --no-default-features --features ${{ matrix.features }}
 
   doc:
-    name: yup-oauth2
+    name: Create docs
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -30,14 +30,25 @@ jobs:
           toolchain: nightly
       - run: cargo doc --no-deps --all-features
         env:
-          RUSTDOCFLAGS: --cfg yup_oauth2_docsrs
+          RUSTDOCFLAGS: --cfg docsrs -D warnings
 
   fmt:
-    name: yup-oauth2
+    name: Check formatting
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@stable
         with:
           toolchain: stable
       - run: cargo fmt -- --check
+
+  clippy:
+    name: Run clippy lints
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: dtolnay/rust-toolchain@stable
+        with:
+          toolchain: stable
+          components: clippy
+      - run: cargo clippy --all-features --all-targets -- -D warnings

Cargo.toml

@@ -71,4 +71,4 @@ members = ["examples/test-installed/", "examples/test-svc-acct/", "examples/test
 
 [package.metadata.docs.rs]
 all-features = true
-rustdoc-args = ["--cfg", "yup_oauth2_docsrs"]
+rustdoc-args = ["--cfg", "docsrs"]

examples/custom_client.rs

@@ -5,7 +5,10 @@
 //!
 //! It is also a better use of resources (memory, sockets, etc.)
 
+use std::time::Duration;
+
 use hyper_util::client::legacy::connect::Connect;
+use yup_oauth2::HyperClientBuilder;
 
 async fn r#use<C>(
     client: hyper_util::client::legacy::Client<C, String>,
@@ -43,11 +46,14 @@ async fn main() {
                 .enable_http2()
                 .build(),
         );
-    let authenticator =
-        yup_oauth2::ServiceAccountAuthenticator::with_client(secret, client.clone())
-            .build()
-            .await
-            .expect("could not create an authenticator");
+    let authenticator = yup_oauth2::ServiceAccountAuthenticator::with_client(
+        secret,
+        yup_oauth2::CustomHyperClientBuilder::from(client.clone())
+            .with_timeout(Duration::from_secs(10)),
+    )
+    .build()
+    .await
+    .expect("could not create an authenticator");
     r#use(client, authenticator)
         .await
         .expect("use is successful!");

src/access_token.rs

@@ -5,9 +5,9 @@
 //! The intention behind this is that if two services using the
 //! same refresh token then each service will invalitate the
 //! access token of the other service by generating a new token.
+use crate::client::SendRequest;
 use crate::error::Error;
 use crate::types::TokenInfo;
-use hyper_util::client::legacy::connect::Connect;
 
 /// the flow for the access token authenticator
 pub struct AccessTokenFlow {
@@ -16,14 +16,13 @@ pub struct AccessTokenFlow {
 
 impl AccessTokenFlow {
     /// just return the access token
-    pub(crate) async fn token<C, B, T>(
+    pub(crate) async fn token<T>(
         &self,
-        _hyper_client: &hyper_util::client::legacy::Client<C, B>,
+        _hyper_client: &impl SendRequest,
         _scopes: &[T],
     ) -> Result<TokenInfo, Error>
     where
         T: AsRef<str>,
-        C: Connect + Clone + Send + Sync + 'static,
     {
         Ok(TokenInfo {
             access_token: Some(self.access_token.clone()),

src/application_default_credentials.rs

@@ -1,7 +1,7 @@
+use crate::client::SendRequest;
 use crate::error::Error;
 use crate::types::TokenInfo;
 use http_body_util::BodyExt;
-use hyper_util::client::legacy::connect::Connect;
 
 /// Provide options for the Application Default Credential Flow, mostly used for testing
 #[derive(Default, Clone, Debug)]
@@ -20,14 +20,13 @@ impl ApplicationDefaultCredentialsFlow {
         ApplicationDefaultCredentialsFlow { metadata_url }
     }
 
-    pub(crate) async fn token<C, T>(
+    pub(crate) async fn token<T>(
         &self,
-        hyper_client: &hyper_util::client::legacy::Client<C, String>,
+        hyper_client: &impl SendRequest,
         scopes: &[T],
     ) -> Result<TokenInfo, Error>
     where
         T: AsRef<str>,
-        C: Connect + Clone + Send + Sync + 'static,
     {
         let scope = crate::helper::join(scopes, ",");
         let token_uri = format!("{}?scopes={}", self.metadata_url, scope);