From 69c357b69e0f0c62e35c880910f82ab0f01067e4 Mon Sep 17 00:00:00 2001 From: Simon Goller Date: Thu, 6 Jun 2024 07:33:54 +0200 Subject: [PATCH] Fix import warnings --- rest/src/lib.rs | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/rest/src/lib.rs b/rest/src/lib.rs index 29e87f9..a3e05f9 100644 --- a/rest/src/lib.rs +++ b/rest/src/lib.rs @@ -5,13 +5,19 @@ mod permission; mod sales_person; mod slot; +#[cfg(feature = "oidc")] +use axum::error_handling::HandleErrorLayer; use axum::extract::{Request, State}; +#[cfg(feature = "oidc")] use axum::http::Uri; -use axum::middleware::{self, Next}; -use axum::response::{IntoResponse, Redirect}; +use axum::middleware::Next; +use axum::middleware::{self}; +#[cfg(feature = "oidc")] +use axum::response::IntoResponse; +use axum::response::Redirect; use axum::routing::get; use axum::Extension; -use axum::{body::Body, error_handling::HandleErrorLayer, response::Response, Router}; +use axum::{body::Body, response::Response, Router}; #[cfg(feature = "oidc")] use axum_oidc::{EmptyAdditionalClaims, OidcClaims}; use serde::{Deserialize, Serialize}; @@ -19,8 +25,9 @@ use service::user_service::UserService; use service::PermissionService; use service::ServiceError; use thiserror::Error; -use time::Duration; +#[cfg(feature = "oidc")] use tower::ServiceBuilder; +#[cfg(feature = "oidc")] use tower_sessions::{cookie::SameSite, Expiry, MemoryStore, SessionManagerLayer}; use uuid::Uuid; @@ -264,7 +271,7 @@ pub async fn start_server(rest_state: RestState) { #[cfg(feature = "oidc")] let app = { use axum_oidc::error::MiddlewareError; - use axum_oidc::{EmptyAdditionalClaims, OidcAuthLayer, OidcLoginLayer}; + use axum_oidc::{EmptyAdditionalClaims, OidcLoginLayer}; let oidc_login_service = ServiceBuilder::new() .layer(HandleErrorLayer::new(|e: MiddlewareError| async { @@ -288,7 +295,7 @@ pub async fn start_server(rest_state: RestState) { #[cfg(feature = "oidc")] let app = { use axum_oidc::error::MiddlewareError; - use axum_oidc::{EmptyAdditionalClaims, OidcAuthLayer, OidcLoginLayer}; + use axum_oidc::{EmptyAdditionalClaims, OidcAuthLayer}; let oidc_config = oidc_config(); let session_store = MemoryStore::default();