Leptos updated to 0.6.5

src/backend/user.rs

@@ -42,9 +42,14 @@ cfg_if! { if #[cfg(feature = "ssr")] {
     }
 
     pub async fn logged_in_user() -> Option<User> {
-        extract(|session: Session| async move {
-            session.get::<User>("user").unwrap_or(None)
-        }).await.unwrap_or(None)
+        let session = extract::<Session>().await;
+
+        if session.is_err() {
+            return None
+        }
+
+        session.unwrap().get::<User>("user").unwrap_or(None)
+
         /*let mut usr = User::default();
         usr.full_name = Some("PokAdm".to_string());
         usr.admin = true;
@@ -77,10 +82,8 @@ pub async fn login(username: String, password: String) -> Result<ApiResponse<()>
     let user = user_from_login(&pool, &username).await.unwrap_or(User::default());
 
     if !user.login.is_empty() && pwhash::bcrypt::verify(password, &user.password) {
-        extract(|session: Session| async move {
-            let _ = session.insert("user", user);
-        })
-            .await?;
+        let session = extract::<Session>().await?;
+        let _ = session.insert("user", user);
 
         info!("User {} logged in", username);
 
@@ -97,9 +100,8 @@ pub async fn login(username: String, password: String) -> Result<ApiResponse<()>
 
 #[server]
 pub async fn logout() -> Result<(), ServerFnError> {
-    extract(|session: Session| async move {
-        session.clear();
-    }).await?;
+    let session = extract::<Session>().await?;
+    session.clear();
 
     redirect("/login");
     Ok(())
@@ -160,9 +162,8 @@ pub async fn update_profile(user: UserProfile) -> Result<ApiResponse<()>, Server
 
     if logged_in_user().await.unwrap_or_default().login == user.login() {
         let usr = user_from_login(&pool, user.login()).await?;
-        extract(|session: Session| async move {
-            let _ = session.insert("user", usr);
-        }).await?;
+        let session = extract::<Session>().await?;
+        let _ = session.insert("user", usr);
     }
 
     Ok(ApiResponse::Data(()))