From 0478d08a97ffd58db14f9d23699bb94f6ee1ca2c Mon Sep 17 00:00:00 2001 From: asonix Date: Tue, 9 Mar 2021 20:04:56 -0600 Subject: [PATCH] Update actix deps --- http-signature-normalization-actix/Cargo.toml | 8 ++++---- http-signature-normalization-actix/examples/client.rs | 3 ++- http-signature-normalization-actix/src/digest/mod.rs | 4 ++-- http-signature-normalization-actix/src/digest/sign.rs | 5 ++--- http-signature-normalization-actix/src/lib.rs | 7 ++++--- http-signature-normalization-actix/src/sign.rs | 5 ++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/http-signature-normalization-actix/Cargo.toml b/http-signature-normalization-actix/Cargo.toml index cc1d685..9e45251 100644 --- a/http-signature-normalization-actix/Cargo.toml +++ b/http-signature-normalization-actix/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "http-signature-normalization-actix" description = "An HTTP Signatures library that leaves the signing to you" -version = "0.5.0-beta.3" +version = "0.5.0-beta.4" authors = ["asonix "] license-file = "LICENSE" readme = "README.md" @@ -25,8 +25,8 @@ name = "client" required-features = ["sha-2"] [dependencies] -actix-web = { version = "4.0.0-beta.3", default-features = false } -awc = "3.0.0-beta.2" +actix-web = { version = "4.0.0-beta.4", default-features = false } +awc = "3.0.0-beta.3" base64 = { version = "0.13", optional = true } chrono = "0.4.6" futures = "0.3" @@ -37,5 +37,5 @@ sha3 = { version = "0.9", optional = true } thiserror = "1.0" [dev-dependencies] -actix-rt = "2.0.2" +actix-rt = "2.1.0" pretty_env_logger = "0.4" diff --git a/http-signature-normalization-actix/examples/client.rs b/http-signature-normalization-actix/examples/client.rs index 4fd3864..ecff259 100644 --- a/http-signature-normalization-actix/examples/client.rs +++ b/http-signature-normalization-actix/examples/client.rs @@ -1,4 +1,5 @@ -use actix_web::{client::Client, error::BlockingError}; +use actix_web::error::BlockingError; +use awc::Client; use http_signature_normalization_actix::prelude::*; use sha2::{Digest, Sha256}; use std::time::SystemTime; diff --git a/http-signature-normalization-actix/src/digest/mod.rs b/http-signature-normalization-actix/src/digest/mod.rs index f079533..e16f328 100644 --- a/http-signature-normalization-actix/src/digest/mod.rs +++ b/http-signature-normalization-actix/src/digest/mod.rs @@ -3,8 +3,8 @@ //! Digest headers are commonly used in conjunction with HTTP Signatures to verify the whole //! request when request bodies are present -use actix_web::{client::ClientRequest, error::BlockingError, http::header::InvalidHeaderValue}; -use awc::SendClientRequest; +use actix_web::{error::BlockingError, http::header::InvalidHeaderValue}; +use awc::{ClientRequest, SendClientRequest}; use std::{fmt::Display, future::Future, pin::Pin}; use crate::{Config, PrepareSignError, Sign}; diff --git a/http-signature-normalization-actix/src/digest/sign.rs b/http-signature-normalization-actix/src/digest/sign.rs index ea3ebe0..e20edf0 100644 --- a/http-signature-normalization-actix/src/digest/sign.rs +++ b/http-signature-normalization-actix/src/digest/sign.rs @@ -1,6 +1,5 @@ -use actix_web::{ - client::ClientRequest, error::BlockingError, http::header::InvalidHeaderValue, web, -}; +use actix_web::{error::BlockingError, http::header::InvalidHeaderValue, web}; +use awc::ClientRequest; use std::{fmt::Display, future::Future, pin::Pin}; use crate::{ diff --git a/http-signature-normalization-actix/src/lib.rs b/http-signature-normalization-actix/src/lib.rs index 407bfad..c51dcea 100644 --- a/http-signature-normalization-actix/src/lib.rs +++ b/http-signature-normalization-actix/src/lib.rs @@ -3,7 +3,7 @@ //! # Integration of Http Signature Normalization with Actix Web //! //! This library provides middlewares for verifying HTTP Signature headers and, optionally, Digest -//! headers with the `digest` feature enabled. It also extends actix_web's ClientRequest type to +//! headers with the `digest` feature enabled. It also extends awc's ClientRequest type to //! add signatures and digests to the request //! //! ### Use it in a server @@ -99,7 +99,8 @@ //! //! ### Use it in a client //! ```rust,ignore -//! use actix_web::{client::Client, error::BlockingError}; +//! use actix_web::error::BlockingError; +//! use awc::Client; //! use http_signature_normalization_actix::prelude::*; //! use sha2::{Digest, Sha256}; //! @@ -229,7 +230,7 @@ pub trait SignatureVerify { ) -> Self::Future; } -/// A trait implemented by the Actix Web ClientRequest type to add an HTTP signature to the request +/// A trait implemented by the awc ClientRequest type to add an HTTP signature to the request pub trait Sign { /// Add an Authorization Signature to the request fn authorization_signature( diff --git a/http-signature-normalization-actix/src/sign.rs b/http-signature-normalization-actix/src/sign.rs index c499262..db9bd44 100644 --- a/http-signature-normalization-actix/src/sign.rs +++ b/http-signature-normalization-actix/src/sign.rs @@ -1,6 +1,5 @@ -use actix_web::{ - client::ClientRequest, error::BlockingError, http::header::InvalidHeaderValue, web, -}; +use actix_web::{error::BlockingError, http::header::InvalidHeaderValue, web}; +use awc::ClientRequest; use std::{fmt::Display, future::Future, pin::Pin}; use crate::{create::Signed, Config, PrepareSignError, Sign};