Replace http_service with http_client

Author: sandhose

crates/oidc-client/src/requests/authorization_code.rs

@@ -347,7 +347,7 @@ pub fn build_authorization_url(
 ///
 /// # Arguments
 ///
-/// * `http_service` - The service to use for making HTTP requests.
+/// * `http_client` - The reqwest client to use for making HTTP requests.
 ///
 /// * `client_credentials` - The credentials obtained when registering the
 ///   client.

crates/oidc-client/src/requests/client_credentials.rs

@@ -28,7 +28,7 @@ use crate::{
 ///
 /// # Arguments
 ///
-/// * `http_service` - The service to use for making HTTP requests.
+/// * `http_client` - The reqwest client to use for making HTTP requests.
 ///
 /// * `client_credentials` - The credentials obtained when registering the
 ///   client.

crates/oidc-client/src/requests/discovery.rs

@@ -69,7 +69,7 @@ pub async fn discover(
 ///
 /// # Arguments
 ///
-/// * `http_service` - The service to use for making HTTP requests.
+/// * `http_client` - The reqwest client to use for making HTTP requests.
 ///
 /// * `issuer` - The URL of the OpenID Connect Provider to fetch metadata for.
 ///

crates/oidc-client/src/requests/jose.rs

@@ -28,7 +28,7 @@ use crate::{
 ///
 /// # Arguments
 ///
-/// * `http_service` - The service to use for making HTTP requests.
+/// * `http_client` - The reqwest client to use for making HTTP requests.
 ///
 /// * `jwks_uri` - The URL where the JWKS can be retrieved.
 ///

crates/oidc-client/src/requests/refresh_token.rs

@@ -31,7 +31,7 @@ use crate::{
 ///
 /// # Arguments
 ///
-/// * `http_service` - The service to use for making HTTP requests.
+/// * `http_client` - The reqwest client to use for making HTTP requests.
 ///
 /// * `client_credentials` - The credentials obtained when registering the
 ///   client.

crates/oidc-client/src/requests/token.rs

@@ -21,7 +21,7 @@ use crate::{
 ///
 /// # Arguments
 ///
-/// * `http_service` - The service to use for making HTTP requests.
+/// * `http_client` - The reqwest client to use for making HTTP requests.
 ///
 /// * `client_credentials` - The credentials obtained when registering the
 ///   client.

crates/oidc-client/src/requests/userinfo.rs

@@ -32,7 +32,7 @@ use crate::{
 ///
 /// # Arguments
 ///
-/// * `http_service` - The service to use for making HTTP requests.
+/// * `http_client` - The reqwest client to use for making HTTP requests.
 ///
 /// * `userinfo_endpoint` - The URL of the issuer's User Info endpoint.
 ///

crates/oidc-client/tests/it/requests/authorization_code.rs

@@ -178,7 +178,7 @@ fn is_valid_token_endpoint_request(req: &Request) -> bool {
 
 #[tokio::test]
 async fn pass_access_token_with_authorization_code() {
-    let (http_service, mock_server, issuer) = init_test().await;
+    let (http_client, mock_server, issuer) = init_test().await;
     let client_credentials = client_credentials(&OAuthClientAuthenticationMethod::None, &issuer);
     let token_endpoint = issuer.join("token").unwrap();
     let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(42);
@@ -216,7 +216,7 @@ async fn pass_access_token_with_authorization_code() {
         .await;
 
     let (response, response_id_token) = access_token_with_authorization_code(
-        &http_service,
+        &http_client,
         client_credentials,
         &token_endpoint,
         AUTHORIZATION_CODE.to_owned(),
@@ -236,7 +236,7 @@ async fn pass_access_token_with_authorization_code() {
 
 #[tokio::test]
 async fn fail_access_token_with_authorization_code_wrong_nonce() {
-    let (http_service, mock_server, issuer) = init_test().await;
+    let (http_client, mock_server, issuer) = init_test().await;
     let client_credentials = client_credentials(&OAuthClientAuthenticationMethod::None, &issuer);
     let token_endpoint = issuer.join("token").unwrap();
     let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(42);
@@ -274,7 +274,7 @@ async fn fail_access_token_with_authorization_code_wrong_nonce() {
         .await;
 
     let error = access_token_with_authorization_code(
-        &http_service,
+        &http_client,
         client_credentials,
         &token_endpoint,
         AUTHORIZATION_CODE.to_owned(),
@@ -297,7 +297,7 @@ async fn fail_access_token_with_authorization_code_wrong_nonce() {
 
 #[tokio::test]
 async fn fail_access_token_with_authorization_code_no_id_token() {
-    let (http_service, mock_server, issuer) = init_test().await;
+    let (http_client, mock_server, issuer) = init_test().await;
     let client_credentials = client_credentials(&OAuthClientAuthenticationMethod::None, &issuer);
     let token_endpoint = issuer.join("token").unwrap();
     let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(42);
@@ -335,7 +335,7 @@ async fn fail_access_token_with_authorization_code_no_id_token() {
         .await;
 
     let error = access_token_with_authorization_code(
-        &http_service,
+        &http_client,
         client_credentials,
         &token_endpoint,
         AUTHORIZATION_CODE.to_owned(),

crates/oidc-client/tests/it/requests/client_credentials.rs

@@ -22,7 +22,7 @@ use crate::{client_credentials, init_test, now, ACCESS_TOKEN, CLIENT_ID, CLIENT_
 
 #[tokio::test]
 async fn pass_access_token_with_client_credentials() {
-    let (http_service, mock_server, issuer) = init_test().await;
+    let (http_client, mock_server, issuer) = init_test().await;
     let client_credentials =
         client_credentials(&OAuthClientAuthenticationMethod::ClientSecretPost, &issuer);
     let token_endpoint = issuer.join("token").unwrap();
@@ -83,7 +83,7 @@ async fn pass_access_token_with_client_credentials() {
         .await;
 
     let response = access_token_with_client_credentials(
-        &http_service,
+        &http_client,
         client_credentials,
         &token_endpoint,
         Some(scope),

crates/oidc-client/tests/it/requests/discovery.rs

@@ -53,39 +53,39 @@ async fn pass_discover() {
 
 #[tokio::test]
 async fn fail_discover_404() {
-    let (http_service, _mock_server, issuer) = init_test().await;
+    let (http_client, _mock_server, issuer) = init_test().await;
 
-    let error = discover(&http_service, issuer.as_str()).await.unwrap_err();
+    let error = discover(&http_client, issuer.as_str()).await.unwrap_err();
 
     assert_matches!(error, DiscoveryError::Http(_));
 }
 
 #[tokio::test]
 async fn fail_discover_not_json() {
-    let (http_service, mock_server, issuer) = init_test().await;
+    let (http_client, mock_server, issuer) = init_test().await;
 
     Mock::given(method("GET"))
         .and(path("/.well-known/openid-configuration"))
         .respond_with(ResponseTemplate::new(200))
         .mount(&mock_server)
         .await;
 
-    let error = discover(&http_service, issuer.as_str()).await.unwrap_err();
+    let error = discover(&http_client, issuer.as_str()).await.unwrap_err();
 
     assert_matches!(error, DiscoveryError::Http(_));
 }
 
 #[tokio::test]
 async fn fail_discover_invalid_metadata() {
-    let (http_service, mock_server, issuer) = init_test().await;
+    let (http_client, mock_server, issuer) = init_test().await;
 
     Mock::given(method("GET"))
         .and(path("/.well-known/openid-configuration"))
         .respond_with(ResponseTemplate::new(200).set_body_json(ProviderMetadata::default()))
         .mount(&mock_server)
         .await;
 
-    let error = discover(&http_service, issuer.as_str()).await.unwrap_err();
+    let error = discover(&http_client, issuer.as_str()).await.unwrap_err();
 
     assert_matches!(error, DiscoveryError::Validation(_));
 }