Shield Leptos: Fix hydration

DanielleHuisman · DanielleHuisman · commit 8a59e76bc8dd · 2024-12-28T14:53:48.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -37,7 +37,6 @@ tower-service = "0.3.3"
 tower-sessions = "0.13.0"
 tracing = "0.1.41"
 tracing-subscriber = "0.3.19"
-typetag = "0.2.19"
 uuid = "1.11.0"
 wasm-bindgen = "0.2.97"
 wasm-tracing = "1.0.1"
diff --git a/examples/leptos-actix/src/home.rs b/examples/leptos-actix/src/home.rs
@@ -1,10 +1,9 @@
-use std::sync::Arc;
-
 use leptos::{either::Either, prelude::*};
 use leptos_router::components::A;
+use shield_leptos::integration::LeptosUser;
 
 #[server]
-pub async fn user() -> Result<Option<Arc<dyn shield::User>>, ServerFnError> {
+pub async fn user() -> Result<Option<LeptosUser>, ServerFnError> {
     use shield_leptos::context::extract_user;
 
     Ok(extract_user().await)
@@ -20,7 +19,9 @@ pub fn HomePage() -> impl IntoView {
         <Suspense fallback=|| view! { "Loading..." }>
             {move || Suspend::new(async move { match user.await {
                 Ok(user) => Either::Left(match user {
-                    Some(_user) => Either::Left(view! {
+                    Some(user) => Either::Left(view! {
+                        {user.id}
+
                         <A href="/auth/sign-out">
                             <button>"Sign out"</button>
                         </A>
diff --git a/examples/leptos-axum/src/home.rs b/examples/leptos-axum/src/home.rs
@@ -1,16 +1,12 @@
-use std::sync::Arc;
-
-use leptos::prelude::*;
-use tracing::debug;
+use leptos::{either::Either, prelude::*};
+use leptos_router::components::A;
+use shield_leptos::integration::LeptosUser;
 
 #[server]
-pub async fn user() -> Result<Option<Arc<dyn shield::User>>, ServerFnError> {
+pub async fn user() -> Result<Option<LeptosUser>, ServerFnError> {
     use shield_leptos::context::extract_user;
 
-    let user = extract_user().await;
-    debug!("action {:?}", user.as_ref().map(|user| user.id()));
-
-    Ok(user)
+    Ok(extract_user().await)
 }
 
 #[component]
@@ -20,35 +16,26 @@ pub fn HomePage() -> impl IntoView {
     view! {
         <h1>"Shield Leptos Axum Example"</h1>
 
-        {move || match user.get() {
-            Some(user) => {
-                debug!("{:?}", user);
-                match user {
-                    Ok(user) => view! {
-                        {user.as_ref().map(|user| user.id())}
-                    }.into_any(),
-                    Err(err) => view! {
-                        {err.to_string()}
-                    }.into_any(),
-                }
-            }.into_any(),
-            None => view! { "Loading..." }.into_any(),
-        }}
-
-        // <Suspense fallback=move || view! { "Loading..." }>
-        //     {move || Suspend::new(async move {
-        //         let user = user.await;
-        //         debug!("view {:?}", user);
-
-        //         match user {
-        //             Ok(user) => Either::Left(view! {
-        //                 {user.as_ref().map(|user| user.id())}
-        //             }),
-        //             Err(err) => Either::Right(view! {
-        //                 {err.to_string()}
-        //             })
-        //         }
-        //     })}
-        // </Suspense>
+        <Suspense fallback=|| view! { "Loading..." }>
+            {move || Suspend::new(async move { match user.await {
+                Ok(user) => Either::Left(match user {
+                    Some(user) => Either::Left(view! {
+                        {user.id}
+
+                        <A href="/auth/sign-out">
+                            <button>"Sign out"</button>
+                        </A>
+                    }),
+                    None => Either::Right(view! {
+                        <A href="/auth/sign-in">
+                            <button>"Sign in"</button>
+                        </A>
+                    }),
+                }),
+                Err(err) => Either::Right(view! {
+                    {err.to_string()}
+                })
+            }})}
+        </Suspense>
     }
 }
diff --git a/packages/core/shield/Cargo.toml b/packages/core/shield/Cargo.toml
@@ -16,4 +16,3 @@ serde.workspace = true
 serde_json.workspace = true
 thiserror.workspace = true
 tracing.workspace = true
-typetag.workspace = true
diff --git a/packages/core/shield/src/user.rs b/packages/core/shield/src/user.rs
@@ -3,7 +3,6 @@ use std::fmt::Debug;
 use chrono::{DateTime, Utc};
 use serde::{Deserialize, Serialize};
 
-#[typetag::serde(tag = "type")]
 pub trait User: Debug + Send + Sync {
     fn id(&self) -> String;
 }
@@ -62,7 +61,6 @@ pub(crate) mod tests {
         id: String,
     }
 
-    #[typetag::serde]
     impl User for TestUser {
         fn id(&self) -> String {
             self.id.clone()
diff --git a/packages/integrations/shield-leptos-actix/src/integration.rs b/packages/integrations/shield-leptos-actix/src/integration.rs
@@ -5,7 +5,7 @@ use leptos::prelude::provide_context;
 use leptos_actix::{extract, redirect};
 use shield::{Session, ShieldDyn, User};
 use shield_actix::{ExtractSession, ExtractShield, ExtractUser};
-use shield_leptos::LeptosIntegration;
+use shield_leptos::integration::{LeptosIntegration, LeptosUser};
 
 pub struct LeptosActixIntegration<U: User>(PhantomData<U>);
 
@@ -29,10 +29,10 @@ impl<U: User + Clone + 'static> LeptosIntegration for LeptosActixIntegration<U>
         session
     }
 
-    async fn extract_user(&self) -> Option<Arc<dyn User>> {
+    async fn extract_user(&self) -> Option<LeptosUser> {
         let ExtractUser(user) = extract::<ExtractUser<U>>().await.expect("TODO");
 
-        user.map(|user| Arc::new(user) as Arc<dyn User>)
+        user.map(|user| user.into())
     }
 
     fn redirect(&self, path: &str) {
diff --git a/packages/integrations/shield-leptos-axum/src/integration.rs b/packages/integrations/shield-leptos-axum/src/integration.rs
@@ -5,7 +5,7 @@ use leptos::prelude::provide_context;
 use leptos_axum::{extract, redirect};
 use shield::{Session, ShieldDyn, User};
 use shield_axum::{ExtractSession, ExtractShield, ExtractUser};
-use shield_leptos::LeptosIntegration;
+use shield_leptos::integration::{LeptosIntegration, LeptosUser};
 
 pub struct LeptosAxumIntegration<U: User>(PhantomData<U>);
 
@@ -29,10 +29,10 @@ impl<U: User + Clone + 'static> LeptosIntegration for LeptosAxumIntegration<U> {
         session
     }
 
-    async fn extract_user(&self) -> Option<Arc<dyn User>> {
+    async fn extract_user(&self) -> Option<LeptosUser> {
         let ExtractUser(user) = extract::<ExtractUser<U>>().await.expect("TODO");
 
-        user.map(|user| Arc::new(user) as Arc<dyn User>)
+        user.map(|user| user.into())
     }
 
     fn redirect(&self, path: &str) {
diff --git a/packages/integrations/shield-leptos/Cargo.toml b/packages/integrations/shield-leptos/Cargo.toml
@@ -11,4 +11,5 @@ version.workspace = true
 [dependencies]
 async-trait.workspace = true
 leptos.workspace = true
+serde.workspace = true
 shield = { path = "../../core/shield" }
diff --git a/packages/integrations/shield-leptos/src/context.rs b/packages/integrations/shield-leptos/src/context.rs
@@ -1,20 +1,20 @@
 use std::sync::Arc;
 
 use leptos::prelude::expect_context;
-use shield::{ShieldDyn, User};
+use shield::ShieldDyn;
 
-use crate::integration::LeptosIntegration;
+use crate::integration::{LeptosIntegration, LeptosUser};
 
 pub fn expect_server_integration() -> Arc<dyn LeptosIntegration> {
     expect_context::<Arc<dyn LeptosIntegration>>()
 }
 
-pub async fn expect_shield() -> ShieldDyn {
+pub async fn extract_shield() -> ShieldDyn {
     let server_integration = expect_server_integration();
     server_integration.extract_shield().await
 }
 
-pub async fn extract_user() -> Option<Arc<dyn User>> {
+pub async fn extract_user() -> Option<LeptosUser> {
     let server_integration = expect_server_integration();
     server_integration.extract_user().await
 }
diff --git a/packages/integrations/shield-leptos/src/integration.rs b/packages/integrations/shield-leptos/src/integration.rs
@@ -1,15 +1,25 @@
-use std::sync::Arc;
-
 use async_trait::async_trait;
+use serde::{Deserialize, Serialize};
 use shield::{Session, ShieldDyn, User};
 
+#[derive(Clone, Debug, Deserialize, Serialize)]
+pub struct LeptosUser {
+    pub id: String,
+}
+
+impl<U: User> From<U> for LeptosUser {
+    fn from(value: U) -> Self {
+        Self { id: value.id() }
+    }
+}
+
 #[async_trait]
 pub trait LeptosIntegration: Send + Sync {
     async fn extract_shield(&self) -> ShieldDyn;
 
     async fn extract_session(&self) -> Session;
 
-    async fn extract_user(&self) -> Option<Arc<dyn User>>;
+    async fn extract_user(&self) -> Option<LeptosUser>;
 
     fn redirect(&self, path: &str);
 }
diff --git a/packages/integrations/shield-leptos/src/lib.rs b/packages/integrations/shield-leptos/src/lib.rs
@@ -1,5 +1,3 @@
 pub mod context;
-mod integration;
+pub mod integration;
 pub mod routes;
-
-pub use integration::*;
diff --git a/packages/integrations/shield-leptos/src/routes/sign_in.rs b/packages/integrations/shield-leptos/src/routes/sign_in.rs
@@ -3,9 +3,9 @@ use shield::SubproviderVisualisation;
 
 #[server]
 pub async fn subproviders() -> Result<Vec<SubproviderVisualisation>, ServerFnError> {
-    use crate::context::expect_shield;
+    use crate::context::extract_shield;
 
-    let shield = expect_shield().await;
+    let shield = extract_shield().await;
 
     shield
         .subprovider_visualisations()
diff --git a/packages/storage/shield-memory/Cargo.toml b/packages/storage/shield-memory/Cargo.toml
@@ -17,7 +17,6 @@ shield-email = { path = "../../providers/shield-email", optional = true }
 shield-oauth = { path = "../../providers/shield-oauth", optional = true }
 shield-oidc = { path = "../../providers/shield-oidc", optional = true }
 shield-webauthn = { path = "../../providers/shield-webauthn", optional = true }
-typetag.workspace = true
 uuid = { workspace = true, features = ["v4"] }
 
 [features]
diff --git a/packages/storage/shield-memory/src/user.rs b/packages/storage/shield-memory/src/user.rs
@@ -8,7 +8,6 @@ pub struct User {
     pub(crate) email_addresses: Vec<EmailAddress>,
 }
 
-#[typetag::serde]
 impl shield::User for User {
     fn id(&self) -> String {
         self.id.clone()
diff --git a/packages/storage/shield-sea-orm/Cargo.toml b/packages/storage/shield-sea-orm/Cargo.toml
@@ -20,7 +20,6 @@ shield-email = { path = "../../providers/shield-email", optional = true }
 shield-oauth = { path = "../../providers/shield-oauth", optional = true }
 shield-oidc = { path = "../../providers/shield-oidc", optional = true }
 shield-webauthn = { path = "../../providers/shield-webauthn", optional = true }
-typetag.workspace = true
 
 [features]
 default = []
diff --git a/packages/storage/shield-sea-orm/src/storage.rs b/packages/storage/shield-sea-orm/src/storage.rs
@@ -11,7 +11,6 @@ use crate::entities::{email_address, prelude::User, user};
 
 pub const SEA_ORM_STORAGE_ID: &str = "sea-orm";
 
-#[typetag::serde]
 impl shield::User for user::Model {
     fn id(&self) -> String {
         self.id.to_string()

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,6 @@ use std::fmt::Debug;`
`3`	`3`	`use chrono::{DateTime, Utc};`
`4`	`4`	`use serde::{Deserialize, Serialize};`
`5`	`5`
`6`		`-#[typetag::serde(tag = "type")]`
`7`	`6`	`pub trait User: Debug + Send + Sync {`
`8`	`7`	`fn id(&self) -> String;`
`9`	`8`	`}`
`@@ -62,7 +61,6 @@ pub(crate) mod tests {`
`62`	`61`	`id: String,`
`63`	`62`	`}`
`64`	`63`
`65`		`- #[typetag::serde]`
`66`	`64`	`impl User for TestUser {`
`67`	`65`	`fn id(&self) -> String {`
`68`	`66`	`self.id.clone()`