Merge remote-tracking branch 'origin/main' into sertschgi/main

.github/workflows/main.yml

@@ -193,7 +193,7 @@ jobs:
       - name: Build all flake outputs
         run: om ci
       - name: Ensure devShell has all build deps
-        run: nix develop -c cargo build -p dioxus-cli
+        run: nix develop -c cargo build -p dioxus-cli --features no-downloads
 
   playwright:
     if: github.event.pull_request.draft == false

example-projects/fullstack-hackernews/src/main.rs

@@ -172,7 +172,7 @@ fn Preview(story: ReadOnlySignal<PreviewState>) -> Element {
         active_story: Some(id),
     } = story()
     else {
-        return rsx! {"Hover over a story to preview it here"};
+        return rsx! {"Click on a story to preview it here"};
     };
 
     let story = use_server_future(use_reactive!(|id| get_story(id)))?;

examples/README.md

@@ -99,17 +99,3 @@ cargo run --example hello_world
 [dog_app](./dog_app.rs) - Accesses dog API
 
 [todomvc](./todomvc.rs) - Todo task list example
-
-# TODO
-Missing Features
-- Fine-grained reactivity
-- Refs - imperative handles to elements
-- Function-driven children: Pass functions to make VNodes
-
-Missing examples
-- Shared state
-- Root-less element groups
-- Custom elements
-- Component Children: Pass children into child components
-- Render To string: Render a mounted virtualdom to a string
-- Testing and Debugging

examples/fullstack-auth/src/auth.rs

@@ -192,71 +192,15 @@ pub async fn connect_to_database() -> SqlitePool {
         .unwrap()
 }
 
-pub struct Session(
-    pub  axum_session_auth::AuthSession<
-        crate::auth::User,
-        i64,
-        axum_session_auth::SessionSqlitePool,
-        sqlx::SqlitePool,
-    >,
-);
-
-impl std::ops::Deref for Session {
-    type Target = axum_session_auth::AuthSession<
-        crate::auth::User,
-        i64,
-        axum_session_auth::SessionSqlitePool,
-        sqlx::SqlitePool,
-    >;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl std::ops::DerefMut for Session {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
-    }
-}
-
-#[derive(Debug)]
-pub struct AuthSessionLayerNotFound;
-
-impl std::fmt::Display for AuthSessionLayerNotFound {
-    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
-        write!(f, "AuthSessionLayer was not found")
-    }
-}
-
-impl std::error::Error for AuthSessionLayerNotFound {}
-
-impl IntoResponse for AuthSessionLayerNotFound {
-    fn into_response(self) -> Response {
-        (
-            http::status::StatusCode::INTERNAL_SERVER_ERROR,
-            "AuthSessionLayer was not found",
-        )
-            .into_response()
-    }
-}
-
-#[async_trait]
-impl<S: std::marker::Sync + std::marker::Send> axum::extract::FromRequestParts<S> for Session {
-    type Rejection = AuthSessionLayerNotFound;
-
-    async fn from_request_parts(
-        parts: &mut http::request::Parts,
-        state: &S,
-    ) -> Result<Self, Self::Rejection> {
-        axum_session_auth::AuthSession::<
-            crate::auth::User,
-            i64,
-            axum_session_auth::SessionSqlitePool,
-            sqlx::SqlitePool,
-        >::from_request_parts(parts, state)
+pub type Session = axum_session_auth::AuthSession<
+    crate::auth::User,
+    i64,
+    axum_session_auth::SessionSqlitePool,
+    sqlx::SqlitePool,
+>;
+
+pub async fn get_session() -> Result<Session, ServerFnError> {
+    extract::<Session, _>()
         .await
-        .map(Session)
-        .map_err(|_| AuthSessionLayerNotFound)
-    }
+        .map_err(|_| ServerFnError::new("AuthSessionLayer was not found"))
 }

examples/fullstack-auth/src/main.rs

@@ -1,10 +1,3 @@
-//! Run with:
-//!
-//! ```sh
-//! dx build --features web
-//! cargo run --features server
-//! ```
-
 #![allow(non_snake_case, unused)]
 
 #[cfg(feature = "server")]
@@ -113,23 +106,23 @@ fn app() -> Element {
     }
 }
 
-#[server(GetUserName)]
+#[server]
 pub async fn get_user_name() -> Result<String, ServerFnError> {
-    let session: crate::auth::Session = extract().await?;
-    Ok(session.0.current_user.unwrap().username.to_string())
+    let auth = auth::get_session().await?;
+    Ok(auth.current_user.unwrap().username.to_string())
 }
 
-#[server(Login)]
+#[server]
 pub async fn login() -> Result<(), ServerFnError> {
-    let auth: crate::auth::Session = extract().await?;
+    let auth = auth::get_session().await?;
     auth.login_user(2);
     Ok(())
 }
 
-#[server(Permissions)]
+#[server]
 pub async fn get_permissions() -> Result<String, ServerFnError> {
     let method: axum::http::Method = extract().await?;
-    let auth: crate::auth::Session = extract().await?;
+    let auth = auth::get_session().await?;
     let current_user = auth.current_user.clone().unwrap_or_default();
 
     // lets check permissions only and not worry about if they are anon or not