mirrors/ntex-extras
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex-extras.git synced 2025-04-03 21:07:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

upgrade to service 0.4

Browse source
This commit is contained in:
Nikolay Kim 2022-12-26 17:14:39 +01:00
parent fe92ba2e8c
commit 440c0073d0
10 changed files with 64 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ntex-identity/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
name = "ntex-identity"
version = "0.1.0"
version = "0.2.0"
authors = ["ntex contributors <team@ntex.rs>"]
description = "Identity service for ntex web framework."
readme = "README.md"
@ -21,7 +21,7 @@ default = ["cookie-policy"]
cookie-policy = ["cookie/secure", "ntex/cookie"]
[dependencies]
ntex = "0.5.14"
ntex = "0.6.0-alpha.0"
futures = "0.3"
serde = "1.0"
serde_json = "1.0"
@ -30,4 +30,4 @@ cookie = { version = "0.16", features = ["private"] }
time = { version = "0.3", default-features = false, features = ["std"] }
[dev-dependencies]
ntex = { version = "0.5", features=["tokio"] }
ntex = { version = "0.6.0-alpha.0", features=["tokio"] }

11
ntex-identity/src/lib.rs
View file

@ -57,7 +57,7 @@ use time::Duration;
use ntex::http::error::HttpError;
use ntex::http::header::{self, HeaderValue};
use ntex::http::{HttpMessage, Payload};
use ntex::service::{Service, Transform};
use ntex::service::{Middleware, Service};
use ntex::util::Extensions;
use ntex::web::{
DefaultError, ErrorRenderer, FromRequest, HttpRequest, WebRequest, WebResponse,
@ -220,10 +220,10 @@ impl<T> IdentityService<T> {
}
}
impl<S, T> Transform<S> for IdentityService<T> {
impl<S, T> Middleware<S> for IdentityService<T> {
type Service = IdentityServiceMiddleware<S, T>;
fn new_transform(&self, service: S) -> Self::Service {
fn create(&self, service: S) -> Self::Service {
IdentityServiceMiddleware { backend: self.backend.clone(), service: Rc::new(service) }
}
}
@ -243,7 +243,6 @@ impl<S, T> Clone for IdentityServiceMiddleware<S, T> {
impl<S, T, Err> Service<WebRequest<Err>> for IdentityServiceMiddleware<S, T>
where
S: Service<WebRequest<Err>, Response = WebResponse> + 'static,
S::Future: 'static,
T: IdentityPolicy<Err>,
Err: ErrorRenderer,
Err::Container: From<S::Error>,
@ -251,7 +250,7 @@ where
{
type Response = WebResponse;
type Error = S::Error;
type Future = LocalBoxFuture<'static, Result<Self::Response, Self::Error>>;
type Future<'f> = LocalBoxFuture<'f, Result<Self::Response, Self::Error>>;
fn poll_ready(&self, cx: &mut Context) -> Poll<Result<(), Self::Error>> {
self.service.poll_ready(cx)
@ -261,7 +260,7 @@ where
self.service.poll_shutdown(cx, is_error)
}
fn call(&self, mut req: WebRequest<Err>) -> Self::Future {
fn call(&self, mut req: WebRequest<Err>) -> Self::Future<'_> {
let srv = self.service.clone();
let backend = self.backend.clone();
let fut = self.backend.from_request(&mut req);