diff --git a/http-signature-normalization-actix/src/lib.rs b/http-signature-normalization-actix/src/lib.rs index ccd93a3..a4ab017 100644 --- a/http-signature-normalization-actix/src/lib.rs +++ b/http-signature-normalization-actix/src/lib.rs @@ -18,7 +18,7 @@ pub mod prelude { pub use crate::{ middleware::{SignatureVerified, VerifySignature}, verify::Unverified, - Config, Sign, SignatureVerify, Verify, VerifyError, + Config, Sign, SignatureVerify, VerifyError, }; #[cfg(feature = "digest")] @@ -29,17 +29,18 @@ pub mod prelude { pub use actix_web::http::header::{InvalidHeaderValue, ToStrError}; } -pub mod verify; +pub mod verify { + pub use http_signature_normalization::verify::{ + Algorithm, DeprecatedAlgorithm, ParseSignatureError, ParsedHeader, Unvalidated, Unverified, + ValidateError, + }; +} use self::{ create::Unsigned, verify::{Algorithm, Unverified}, }; -pub trait Verify { - fn begin_verify(&self, config: &Config) -> Result; -} - pub trait SignatureVerify { type Error: actix_web::ResponseError; type Future: IntoFuture; diff --git a/http-signature-normalization-actix/src/verify.rs b/http-signature-normalization-actix/src/verify.rs deleted file mode 100644 index 80fa580..0000000 --- a/http-signature-normalization-actix/src/verify.rs +++ /dev/null @@ -1,27 +0,0 @@ -use actix_web::{dev::ServiceRequest, HttpRequest}; -pub use http_signature_normalization::verify::{ - Algorithm, DeprecatedAlgorithm, ParseSignatureError, ParsedHeader, Unvalidated, Unverified, - ValidateError, -}; - -use crate::{Config, Verify, VerifyError}; - -impl Verify for HttpRequest { - fn begin_verify(&self, config: &Config) -> Result { - config.begin_verify( - self.method(), - self.uri().path_and_query(), - self.headers().clone(), - ) - } -} - -impl Verify for ServiceRequest { - fn begin_verify(&self, config: &Config) -> Result { - config.begin_verify( - self.method(), - self.uri().path_and_query(), - self.headers().clone(), - ) - } -}