update hyperium crates to 1.0, axum to 0.7

This commit is contained in:
Daniel Gallups 2023-12-01 12:37:13 -05:00
parent 8cec2283e0
commit 41f38d8db5
6 changed files with 204 additions and 69 deletions

View file

@ -7,8 +7,8 @@ edition = "2021"
[dependencies]
anyhow = "1.0.75"
axum = { version = "0.6.20", features = ["headers"] }
headers = "0.3"
axum = { version = "0.7.1" }
headers = "0.4"
josekit = "0.8.3"
jsonwebtoken = "9.1.0"
once_cell = "1.18.0"
@ -17,7 +17,7 @@ serde = { version = "1.0", features = ["derive"] }
serde_json = "1.0"
thiserror = "1.0.47"
tokio = { version = "1.32.0", features = ["full"] }
tower-http = { version = "0.4.3", features = ["trace"] }
tower-http = { version = "0.5.0", features = ["trace"] }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
jwt-authorizer = { path = "../jwt-authorizer" }

View file

@ -3,7 +3,7 @@ use jwt_authorizer::{
error::InitError, AuthError, Authorizer, IntoLayer, JwtAuthorizer, JwtClaims, Refresh, RefreshStrategy,
};
use serde::Deserialize;
use std::net::SocketAddr;
use tokio::net::TcpListener;
use tower_http::trace::TraceLayer;
use tracing::info;
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt};
@ -62,10 +62,10 @@ async fn main() -> Result<(), InitError> {
.nest("/api", api)
.layer(TraceLayer::new_for_http());
let addr = SocketAddr::from(([127, 0, 0, 1], 3000));
tracing::info!("listening on {}", addr);
let listener = TcpListener::bind("127.0.0.1:3000").await.unwrap();
tracing::info!("listening on {:?}", listener.local_addr());
axum::Server::bind(&addr).serve(app.into_make_service()).await.unwrap();
axum::serve(listener, app.into_make_service()).await.unwrap();
Ok(())
}

View file

@ -7,7 +7,8 @@ use jsonwebtoken::{encode, Algorithm, EncodingKey, Header};
use jwt_authorizer::{NumericDate, OneOrArray, RegisteredClaims};
use serde::{Deserialize, Serialize};
use serde_json::{json, Value};
use std::{net::SocketAddr, thread, time::Duration};
use std::{thread, time::Duration};
use tokio::net::TcpListener;
const ISSUER_URI: &str = "http://localhost:3001";
@ -171,9 +172,9 @@ pub fn run_server() -> &'static str {
.route("/tokens", get(tokens));
tokio::spawn(async move {
let addr = SocketAddr::from(([127, 0, 0, 1], 3001));
tracing::info!("oidc provider starting on: {}", addr);
axum::Server::bind(&addr).serve(app.into_make_service()).await.unwrap();
let listener = TcpListener::bind("127.0.0.1:3001").await.unwrap();
tracing::info!("oidc provider starting on: {:?}", listener.local_addr());
axum::serve(listener, app.into_make_service()).await.unwrap();
});
thread::sleep(Duration::from_millis(200)); // waiting oidc to start