Merge branch 'leptos-rs:main' into spread-event-handlers

.github/workflows/ci-semver.yml

@@ -0,0 +1,28 @@
+name: CI semver
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+    branches:
+      - main
+
+jobs:
+  get-leptos-changed:
+    uses: ./.github/workflows/get-leptos-changed.yml
+
+  test:
+    needs: [get-leptos-changed]
+    if: needs.get-leptos-changed.outputs.leptos_changed == 'true'
+    name: Run semver check (nightly-2024-01-29)
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Sember Checks
+        uses: obi1kenobi/cargo-semver-checks-action@v2
+        with:
+          rust-toolchain: nightly-2024-01-29

.github/workflows/get-example-changed.yml

@@ -21,7 +21,7 @@ jobs:
 
       - name: Get example files that changed
         id: changed-files
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v43
         with:
           files: |
             examples/**

.github/workflows/get-examples-matrix.yml

@@ -17,8 +17,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Install JQ Tool
-        uses: mbround18/install-jq@v1
+      - name: Install jq
+        run: sudo apt-get install jq
 
       - name: Set Matrix
         id: set-matrix

.github/workflows/get-leptos-changed.yml

@@ -19,7 +19,7 @@ jobs:
 
       - name: Get source files that changed
         id: changed-source
-        uses: tj-actions/changed-files@v41
+        uses: tj-actions/changed-files@v43
         with:
           files: |
             integrations/**

.github/workflows/run-cargo-make-task.yml

@@ -27,11 +27,9 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Setup Rust
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ inputs.toolchain }}
-          override: true
-          components: rustfmt
 
       - name: Add wasm32-unknown-unknown
         run: rustup target add wasm32-unknown-unknown
@@ -78,7 +76,7 @@ jobs:
         run: |
           echo "STORE_PATH=$(pnpm store path)" >> $GITHUB_OUTPUT
 
-      - uses: actions/cache@v3
+      - uses: actions/cache@v4
         name: Setup pnpm cache
         with:
           path: ${{ steps.pnpm-cache.outputs.STORE_PATH }}

examples/Makefile.toml

@@ -5,34 +5,41 @@ CARGO_MAKE_EXTEND_WORKSPACE_MAKEFILE = true
 CARGO_MAKE_CARGO_BUILD_TEST_FLAGS = ""
 CARGO_MAKE_WORKSPACE_EMULATION = true
 CARGO_MAKE_CRATE_WORKSPACE_MEMBERS = [
+  "action-form-error-handling",
   "animated_show",
   "counter",
   "counter_isomorphic",
   "counters",
   "counters_stable",
   "counter_url_query",
   "counter_without_macros",
+  "directives",
   "error_boundary",
   "errors_axum",
   "fetch",
   "hackernews",
   "hackernews_axum",
+  "hackernews_islands_axum",
+  "hackernews_js_fetch",
   "js-framework-benchmark",
   "login_with_token_csr_only",
   "parent_child",
+  "portal",
   "router",
   "server_fns_axum",
   "session_auth_axum",
   "slots",
+  "sso_auth_axum",
   "ssr_modes",
   "ssr_modes_axum",
   "suspense_tests",
   "tailwind_actix",
-  "tailwind_csr",
   "tailwind_axum",
+  "tailwind_csr",
   "timer",
   "todo_app_sqlite",
   "todo_app_sqlite_axum",
+  "todo_app_sqlite_csr",
   "todomvc",
 ]
 

examples/cargo-make/clean.toml

@@ -4,11 +4,13 @@ dependencies = [
   "clean-trunk",
   "clean-node_modules",
   "clean-playwright",
+  "clean-pkg",
 ]
 
 [tasks.clean-cargo]
-command = "rm"
-args = ["-rf", "target"]
+script = '''
+find . -type d -name target | xargs rm -rf
+'''
 
 [tasks.clean-trunk]
 script = '''
@@ -27,3 +29,8 @@ fi
 script = '''
 find . -name playwright-report -name playwright -name test-results | xargs rm -rf
 '''
+
+[tasks.clean-pkg]
+script = '''
+find . -type d -name pkg | xargs rm -rf
+'''

examples/session_auth_axum/src/auth.rs

@@ -6,26 +6,28 @@ use std::collections::HashSet;
 pub struct User {
     pub id: i64,
     pub username: String,
-    pub password: String,
     pub permissions: HashSet<String>,
 }
 
+// Explicitly is not Serialize/Deserialize!
+#[derive(Clone, Debug, PartialEq, Eq)]
+pub struct UserPasshash(String);
+
 impl Default for User {
     fn default() -> Self {
         let permissions = HashSet::new();
 
         Self {
             id: -1,
             username: "Guest".into(),
-            password: "".into(),
             permissions,
         }
     }
 }
 
 #[cfg(feature = "ssr")]
 pub mod ssr {
-    pub use super::User;
+    pub use super::{User, UserPasshash};
     pub use axum_session_auth::{
         Authentication, HasPermission, SessionSqlitePool,
     };
@@ -42,7 +44,10 @@ pub mod ssr {
     pub use bcrypt::{hash, verify, DEFAULT_COST};
 
     impl User {
-        pub async fn get(id: i64, pool: &SqlitePool) -> Option<Self> {
+        pub async fn get_with_passhash(
+            id: i64,
+            pool: &SqlitePool,
+        ) -> Option<(Self, UserPasshash)> {
             let sqluser = sqlx::query_as::<_, SqlUser>(
                 "SELECT * FROM users WHERE id = ?",
             )
@@ -63,10 +68,16 @@ pub mod ssr {
             Some(sqluser.into_user(Some(sql_user_perms)))
         }
 
-        pub async fn get_from_username(
+        pub async fn get(id: i64, pool: &SqlitePool) -> Option<Self> {
+            User::get_with_passhash(id, pool)
+                .await
+                .map(|(user, _)| user)
+        }
+
+        pub async fn get_from_username_with_passhash(
             name: String,
             pool: &SqlitePool,
-        ) -> Option<Self> {
+        ) -> Option<(Self, UserPasshash)> {
             let sqluser = sqlx::query_as::<_, SqlUser>(
                 "SELECT * FROM users WHERE username = ?",
             )
@@ -86,6 +97,15 @@ pub mod ssr {
 
             Some(sqluser.into_user(Some(sql_user_perms)))
         }
+
+        pub async fn get_from_username(
+            name: String,
+            pool: &SqlitePool,
+        ) -> Option<Self> {
+            User::get_from_username_with_passhash(name, pool)
+                .await
+                .map(|(user, _)| user)
+        }
     }
 
     #[derive(sqlx::FromRow, Clone)]
@@ -137,20 +157,22 @@ pub mod ssr {
         pub fn into_user(
             self,
             sql_user_perms: Option<Vec<SqlPermissionTokens>>,
-        ) -> User {
-            User {
-                id: self.id,
-                username: self.username,
-                password: self.password,
-                permissions: if let Some(user_perms) = sql_user_perms {
-                    user_perms
-                        .into_iter()
-                        .map(|x| x.token)
-                        .collect::<HashSet<String>>()
-                } else {
-                    HashSet::<String>::new()
+        ) -> (User, UserPasshash) {
+            (
+                User {
+                    id: self.id,
+                    username: self.username,
+                    permissions: if let Some(user_perms) = sql_user_perms {
+                        user_perms
+                            .into_iter()
+                            .map(|x| x.token)
+                            .collect::<HashSet<String>>()
+                    } else {
+                        HashSet::<String>::new()
+                    },
                 },
-            }
+                UserPasshash(self.password),
+            )
         }
     }
 }
@@ -180,11 +202,12 @@ pub async fn login(
     let pool = pool()?;
     let auth = auth()?;
 
-    let user: User = User::get_from_username(username, &pool)
-        .await
-        .ok_or_else(|| ServerFnError::new("User does not exist."))?;
+    let (user, UserPasshash(expected_passhash)) =
+        User::get_from_username_with_passhash(username, &pool)
+            .await
+            .ok_or_else(|| ServerFnError::new("User does not exist."))?;
 
-    match verify(password, &user.password)? {
+    match verify(password, &expected_passhash)? {
         true => {
             auth.login_user(user.id);
             auth.remember_user(remember.is_some());