Implement Clone on ClientCredentials

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

@@ -52,17 +52,17 @@ pub const CLIENT_SUPPORTED_AUTH_METHODS: &[OAuthClientAuthenticationMethod] = &[
 
 /// A function that takes a map of claims and a signing algorithm and returns a
 /// signed JWT.
-pub type JwtSigningFn =
+pub type JwtSigningFn = fn(HashMap<String, Value>, JsonWebSignatureAlg) -> Result<String, BoxError>;
-    dyn Fn(HashMap<String, Value>, JsonWebSignatureAlg) -> Result<String, BoxError> + Send + Sync;
 
 /// The method used to sign JWTs with a private key.
+#[derive(Clone)]
 pub enum JwtSigningMethod {
     /// Sign the JWTs with this library, by providing the signing keys.
     #[cfg(feature = "keystore")]
     Keystore(Keystore),
 
     /// Sign the JWTs in a callback.
-    Custom(Box<JwtSigningFn>),
+    Custom(JwtSigningFn),
 }
 
 impl JwtSigningMethod {
@@ -75,14 +75,8 @@ impl JwtSigningMethod {
 
     /// Creates a new [`JwtSigningMethod`] from a [`JwtSigningFn`].
     #[must_use]
-    pub fn with_custom_signing_method<F>(signing_fn: F) -> Self
+    pub fn with_custom_signing_method(signing_fn: JwtSigningFn) -> Self {
-    where
+        Self::Custom(signing_fn)
-        F: Fn(HashMap<String, Value>, JsonWebSignatureAlg) -> Result<String, BoxError>
-            + Send
-            + Sync
-            + 'static,
-    {
-        Self::Custom(Box::new(signing_fn))
     }
 
     /// Get the [`Keystore`] from this [`JwtSigningMethod`].
@@ -107,6 +101,7 @@ impl JwtSigningMethod {
 
 /// The credentials obtained during registration, to authenticate a client on
 /// endpoints that require it.
+#[derive(Clone)]
 pub enum ClientCredentials {
     /// No client authentication is used.
     ///

crates/oidc-client/tests/it/main.rs

@@ -130,7 +130,7 @@ fn id_token(issuer: &str) -> (IdToken, PublicJsonWebKeySet) {
 fn client_credentials(
     auth_method: OAuthClientAuthenticationMethod,
     issuer: &Url,
-    custom_signing: Option<Box<JwtSigningFn>>,
+    custom_signing: Option<JwtSigningFn>,
 ) -> ClientCredentials {
     match auth_method {
         OAuthClientAuthenticationMethod::None => ClientCredentials::None {

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

@@ -372,7 +372,7 @@ async fn pass_private_key_jwt_with_custom_signing() {
     let client_credentials = client_credentials(
         OAuthClientAuthenticationMethod::PrivateKeyJwt,
         &issuer,
-        Some(Box::new(|_claims, _alg| Ok("fake.signed.jwt".to_owned()))),
+        Some(|_claims, _alg| Ok("fake.signed.jwt".to_owned())),
     );
     let token_endpoint = issuer.join("token").unwrap();
     let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(42);
@@ -441,7 +441,7 @@ async fn fail_private_key_jwt_with_custom_signing() {
     let client_credentials = client_credentials(
         OAuthClientAuthenticationMethod::PrivateKeyJwt,
         &issuer,
-        Some(Box::new(|_claims, _alg| Err("Something went wrong".into()))),
+        Some(|_claims, _alg| Err("Something went wrong".into())),
     );
     let token_endpoint = issuer.join("token").unwrap();
     let mut rng = rand_chacha::ChaCha8Rng::seed_from_u64(42);