Delete more unused oidc-client code

Author: sandhose

Cargo.lock

@@ -9,7 +9,7 @@ use std::string::FromUtf8Error;
 use mas_data_model::UpstreamOAuthProvider;
 use mas_iana::{jose::JsonWebSignatureAlg, oauth::OAuthClientAuthenticationMethod};
 use mas_keystore::{DecryptError, Encrypter, Keystore};
-use mas_oidc_client::types::client_credentials::{ClientCredentials, JwtSigningMethod};
+use mas_oidc_client::types::client_credentials::ClientCredentials;
 use thiserror::Error;
 use url::Url;
 
@@ -84,7 +84,7 @@ fn client_credentials_for_provider(
         },
         OAuthClientAuthenticationMethod::PrivateKeyJwt => ClientCredentials::PrivateKeyJwt {
             client_id,
-            jwt_signing_method: JwtSigningMethod::Keystore(keystore.clone()),
+            keystore: keystore.clone(),
             signing_algorithm: provider
                 .token_endpoint_signing_alg
                 .clone()

crates/handlers/src/upstream_oauth2/mod.rs

@@ -11,16 +11,10 @@ repository.workspace = true
 [lints]
 workspace = true
 
-[features]
-default = ["keystore"]
-keystore = ["dep:mas-keystore"]
-
 [dependencies]
 base64ct = { version = "1.6.0", features = ["std"] }
-bytes.workspace = true
 chrono.workspace = true
 form_urlencoded = "1.2.1"
-futures-util = "0.3.31"
 headers.workspace = true
 http.workspace = true
 language-tags = "0.3.2"
@@ -30,22 +24,19 @@ reqwest.workspace = true
 serde.workspace = true
 serde_json.workspace = true
 serde_urlencoded = "0.7.1"
-serde_with = "3.11.0"
 thiserror.workspace = true
-tower.workspace = true
 tracing.workspace = true
 url.workspace = true
 
 mas-http.workspace = true
 mas-iana.workspace = true
 mas-jose.workspace = true
-mas-keystore = { workspace = true, optional = true }
+mas-keystore.workspace = true
 oauth2-types.workspace = 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.2"

crates/oidc-client/Cargo.toml

@@ -13,7 +13,6 @@ use mas_jose::{
 };
 use oauth2_types::{oidc::ProviderMetadataVerificationError, pkce::CodeChallengeError};
 use thiserror::Error;
-pub use tower::BoxError;
 
 /// All possible errors when using this crate.
 #[derive(Debug, Error)]
@@ -225,8 +224,4 @@ pub enum CredentialsError {
     /// An error occurred when signing the JWT.
     #[error(transparent)]
     JwtSignature(#[from] JwtSignatureError),
-
-    /// An error occurred with a custom signing method.
-    #[error(transparent)]
-    Custom(BoxError),
 }

crates/oidc-client/src/error.rs

@@ -29,7 +29,6 @@ use rand::{
     Rng,
 };
 use serde::Serialize;
-use serde_with::skip_serializing_none;
 use url::Url;
 
 use super::jose::JwtVerificationData;
@@ -194,12 +193,12 @@ pub struct AuthorizationValidationData {
     pub code_challenge_verifier: Option<String>,
 }
 
-#[skip_serializing_none]
 #[derive(Clone, Serialize)]
 struct FullAuthorizationRequest {
     #[serde(flatten)]
     inner: AuthorizationRequest,
-    #[serde(flatten)]
+
+    #[serde(flatten, skip_serializing_if = "Option::is_none")]
     pkce: Option<pkce::AuthorizationRequest>,
 }
 

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

@@ -11,6 +11,5 @@ pub mod client_credentials;
 pub mod discovery;
 pub mod jose;
 pub mod refresh_token;
-pub mod rp_initiated_logout;
 pub mod token;
 pub mod userinfo;