Remove the client features from mas-oidc-client and replace it in tests

Author: sandhose

Cargo.lock

@@ -16,7 +16,7 @@ use std::time::Duration;
 
 use headers::{ContentLength, HeaderMapExt, Host, UserAgent};
 use http::{header::USER_AGENT, HeaderValue, Request, Response};
-use hyper::client::connect::HttpInfo;
+use hyper_util::client::legacy::connect::HttpInfo;
 use mas_tower::{
     DurationRecorderLayer, DurationRecorderService, EnrichSpan, InFlightCounterLayer,
     InFlightCounterService, MakeSpan, MetricsAttributes, TraceContextLayer, TraceContextService,

crates/http/src/layers/client.rs

@@ -12,16 +12,7 @@ repository.workspace = true
 workspace = true
 
 [features]
-default = ["hyper", "keystore"]
-hyper = [
-    "dep:http-body",
-    "dep:hyper",
-    "dep:hyper-rustls",
-    "dep:rustls",
-    "dep:rustls-platform-verifier",
-    "dep:tower-http",
-    "tower/limit",
-]
+default = ["keystore"]
 keystore = ["dep:mas-keystore"]
 
 [dependencies]
@@ -50,22 +41,13 @@ mas-jose.workspace = true
 mas-keystore = { workspace = true, optional = true }
 oauth2-types.workspace = true
 
-# Default http service
-http-body = { workspace = true, optional = true }
-hyper = { workspace = true, optional = true }
-hyper-rustls = { workspace = true, optional = true }
-rustls = { workspace = true, optional = true }
-rustls-platform-verifier = { workspace = true, optional = true }
-
-[dependencies.tower-http]
-version = "0.4.4"
-features = ["follow-redirect", "set-header", "timeout", "map-request-body", "util"]
-optional = true
-
 [dev-dependencies]
 assert_matches = "1.5.0"
 bitflags = "2.6.0"
 mas-keystore.workspace = true
 rand_chacha = "0.3.1"
 tokio.workspace = true
 wiremock = "0.6.0"
+http-body-util.workspace = true
+
+mas-http = { workspace = true, features = ["client"] }

crates/oidc-client/Cargo.toml

@@ -15,7 +15,4 @@
 //! Reexports of traits to implement to provide a custom HTTP service for
 //! `Client`.
 
-#[cfg(feature = "hyper")]
-pub mod hyper;
-
 pub use mas_http::{BoxCloneSyncService, HttpService};

crates/oidc-client/src/http_service/mod.rs renamed to crates/oidc-client/src/http_service.rs

@@ -15,6 +15,8 @@
 use std::collections::HashMap;
 
 use chrono::{DateTime, Duration, Utc};
+use http_body_util::Full;
+use mas_http::{BodyToBytesResponseLayer, BoxCloneSyncService};
 use mas_iana::{jose::JsonWebSignatureAlg, oauth::OAuthClientAuthenticationMethod};
 use mas_jose::{
     claims::{self, hash_token},
@@ -24,7 +26,7 @@ use mas_jose::{
 };
 use mas_keystore::{JsonWebKey, JsonWebKeySet, Keystore, PrivateKey};
 use mas_oidc_client::{
-    http_service::{hyper::hyper_service, HttpService},
+    http_service::HttpService,
     types::{
         client_credentials::{ClientCredentials, JwtSigningFn, JwtSigningMethod},
         IdToken,
@@ -34,6 +36,10 @@ use rand::{
     distributions::{Alphanumeric, DistString},
     SeedableRng,
 };
+use tower::{
+    util::{MapErrLayer, MapRequestLayer},
+    BoxError, Layer,
+};
 use url::Url;
 use wiremock::MockServer;
 
@@ -58,7 +64,13 @@ fn now() -> DateTime<Utc> {
 }
 
 async fn init_test() -> (HttpService, MockServer, Url) {
-    let http_service = hyper_service();
+    let http_service = (
+        MapErrLayer::new(BoxError::from),
+        MapRequestLayer::new(|req: http::Request<_>| req.map(Full::new)),
+        BodyToBytesResponseLayer,
+    )
+        .layer(mas_http::make_untraced_client());
+    let http_service = BoxCloneSyncService::new(http_service);
     let mock_server = MockServer::start().await;
     let issuer = Url::parse(&mock_server.uri()).expect("Couldn't parse URL");