diff --git a/examples/dioxus-axum/src/main.rs b/examples/dioxus-axum/src/main.rs index b4e0ed1..051cd7e 100644 --- a/examples/dioxus-axum/src/main.rs +++ b/examples/dioxus-axum/src/main.rs @@ -5,10 +5,10 @@ use crate::app::App; #[cfg(not(feature = "server"))] fn main() { - use shield_bootstrap::dioxus::BootstrapStyle; + use shield_bootstrap::BootstrapDioxusStyle; dioxus::LaunchBuilder::new() - .with_context(BootstrapStyle::default().context()) + .with_context(BootstrapDioxusStyle::default().context()) .launch(App) } @@ -23,8 +23,8 @@ async fn main() { prelude::{DioxusRouterExt, *}, }; use shield::{Shield, ShieldOptions}; - use shield_bootstrap::dioxus::BootstrapStyle; - use shield_dioxus_axum::{DioxusAxumIntegration, ShieldLayer}; + use shield_bootstrap::BootstrapDioxusStyle; + use shield_dioxus_axum::{AxumDioxusIntegration, ShieldLayer}; use shield_memory::{MemoryStorage, User}; use shield_oidc::{Keycloak, OidcMethod}; use tokio::net::TcpListener; @@ -66,8 +66,8 @@ async fn main() { let router = Router::new() .serve_dioxus_application( ServeConfigBuilder::new() - .context(DioxusAxumIntegration::::default().context()) - .context(BootstrapStyle::default().context()) + .context(AxumDioxusIntegration::::default().context()) + .context(BootstrapDioxusStyle::default().context()) .build() .unwrap(), App, diff --git a/packages/core/shield/src/shield.rs b/packages/core/shield/src/shield.rs index ef44e6b..c6d327d 100644 --- a/packages/core/shield/src/shield.rs +++ b/packages/core/shield/src/shield.rs @@ -77,7 +77,7 @@ impl Shield { }; for provider in method.erased_providers().await? { - if !action.erased_condition(&provider, session.clone())? { + if !action.erased_condition(&*provider, session.clone())? { continue; } diff --git a/packages/integrations/shield-dioxus-axum/src/integration.rs b/packages/integrations/shield-dioxus-axum/src/integration.rs index 28dabdb..ecf5e84 100644 --- a/packages/integrations/shield-dioxus-axum/src/integration.rs +++ b/packages/integrations/shield-dioxus-axum/src/integration.rs @@ -7,22 +7,22 @@ use shield::{Session, ShieldDyn, User}; use shield_axum::{ExtractSession, ExtractShield}; use shield_dioxus::{DioxusIntegration, DioxusIntegrationDyn}; -pub struct DioxusAxumIntegration(PhantomData); +pub struct AxumDioxusIntegration(PhantomData); -impl DioxusAxumIntegration { +impl AxumDioxusIntegration { pub fn context(self) -> DioxusIntegrationDyn { DioxusIntegrationDyn::new(self) } } -impl Default for DioxusAxumIntegration { +impl Default for AxumDioxusIntegration { fn default() -> Self { Self(Default::default()) } } #[async_trait] -impl DioxusIntegration for DioxusAxumIntegration { +impl DioxusIntegration for AxumDioxusIntegration { async fn extract_shield(&self) -> ShieldDyn { let ExtractShield(shield) = extract::, _>().await.expect("TODO"); diff --git a/packages/styles/shield-bootstrap/src/dioxus.rs b/packages/styles/shield-bootstrap/src/dioxus.rs index efb75e8..db6b0eb 100644 --- a/packages/styles/shield-bootstrap/src/dioxus.rs +++ b/packages/styles/shield-bootstrap/src/dioxus.rs @@ -3,15 +3,15 @@ use shield::Form; use shield_dioxus::{DioxusStyle, ErasedDioxusStyle}; #[derive(Default)] -pub struct BootstrapStyle {} +pub struct BootstrapDioxusStyle {} -impl BootstrapStyle { +impl BootstrapDioxusStyle { pub fn context(self) -> ErasedDioxusStyle { ErasedDioxusStyle::new(self) } } -impl DioxusStyle for BootstrapStyle { +impl DioxusStyle for BootstrapDioxusStyle { fn render(&self, forms: &[Form]) -> Element { rsx! { div { diff --git a/packages/styles/shield-bootstrap/src/lib.rs b/packages/styles/shield-bootstrap/src/lib.rs index 341e5a0..33e2da1 100644 --- a/packages/styles/shield-bootstrap/src/lib.rs +++ b/packages/styles/shield-bootstrap/src/lib.rs @@ -1,2 +1,5 @@ #[cfg(feature = "dioxus")] -pub mod dioxus; +mod dioxus; + +#[cfg(feature = "dioxus")] +pub use dioxus::*;