Merge branch 'main' into leptos_v0.6

.gitignore

@@ -10,4 +10,5 @@ Cargo.lock
 .direnv
 .envrc
 
-.vscode
+.vscode
+vendor

Cargo.toml

@@ -25,22 +25,22 @@ members = [
 exclude = ["benchmarks", "examples"]
 
 [workspace.package]
-version = "0.5.4"
+version = "0.5.6"
 
 [workspace.dependencies]
-leptos = { path = "./leptos", version = "0.5.4" }
-leptos_dom = { path = "./leptos_dom", version = "0.5.4" }
-leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.5.4" }
-leptos_macro = { path = "./leptos_macro", version = "0.5.4" }
-leptos_reactive = { path = "./leptos_reactive", version = "0.5.4" }
-leptos_server = { path = "./leptos_server", version = "0.5.4" }
-server_fn = { path = "./server_fn", version = "0.6" }
-server_fn_macro = { path = "./server_fn_macro", version = "0.6" }
-server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.6" }
-leptos_config = { path = "./leptos_config", version = "0.5.4" }
-leptos_router = { path = "./router", version = "0.5.4" }
-leptos_meta = { path = "./meta", version = "0.5.4" }
-leptos_integration_utils = { path = "./integrations/utils", version = "0.5.4" }
+leptos = { path = "./leptos", version = "0.5.6" }
+leptos_dom = { path = "./leptos_dom", version = "0.5.6" }
+leptos_hot_reload = { path = "./leptos_hot_reload", version = "0.5.6" }
+leptos_macro = { path = "./leptos_macro", version = "0.5.6" }
+leptos_reactive = { path = "./leptos_reactive", version = "0.5.6" }
+leptos_server = { path = "./leptos_server", version = "0.5.6" }
+server_fn = { path = "./server_fn", version = "0.5.6" }
+server_fn_macro = { path = "./server_fn_macro", version = "0.5.6" }
+server_fn_macro_default = { path = "./server_fn/server_fn_macro_default", version = "0.5.6" }
+leptos_config = { path = "./leptos_config", version = "0.5.6" }
+leptos_router = { path = "./router", version = "0.5.6" }
+leptos_meta = { path = "./meta", version = "0.5.6" }
+leptos_integration_utils = { path = "./integrations/utils", version = "0.5.6" }
 
 [profile.release]
 codegen-units = 1

examples/sso_auth_axum/Cargo.toml

@@ -0,0 +1,110 @@
+[package]
+name = "sso_auth_axum"
+version = "0.1.0"
+edition = "2021"
+
+[lib]
+crate-type = ["cdylib", "rlib"]
+
+[dependencies]
+oauth2 = {version="4.4.2",optional=true}
+anyhow = "1.0.66"
+console_log = "1.0.0"
+rand = { version = "0.8.5", features = ["min_const_gen"], optional = true }
+console_error_panic_hook = "0.1.7"
+futures = "0.3.25"
+cfg-if = "1.0.0"
+leptos = { path = "../../leptos"}
+leptos_meta = { path = "../../meta" }
+leptos_axum = { path = "../../integrations/axum", optional = true }
+leptos_router = { path = "../../router"}
+log = "0.4.17"
+simple_logger = "4.0.0"
+serde = { version = "1.0.148", features = ["derive"] }
+serde_json = {version="1.0.108", optional = true }
+axum = { version = "0.6.1", optional = true, features=["macros"] }
+tower = { version = "0.4.13", optional = true }
+tower-http = { version = "0.4", features = ["fs"], optional = true }
+tokio = { version = "1.22.0", features = ["full"], optional = true }
+http = { version = "0.2.8" }
+sqlx = { version = "0.6.2", features = [
+	"runtime-tokio-rustls",
+	"sqlite",
+], optional = true }
+thiserror = "1.0.38"
+wasm-bindgen = "0.2"
+axum_session_auth = { version = "0.2.1", features = [
+	"sqlite-rustls",
+], optional = true }
+axum_session = { version = "0.2.3", features = [
+	"sqlite-rustls",
+], optional = true }
+async-trait = { version = "0.1.64", optional = true }
+reqwest= {version="0.11",optional=true, features=["json"]}
+
+[features]
+hydrate = ["leptos/hydrate", "leptos_meta/hydrate", "leptos_router/hydrate"]
+ssr = [
+	"dep:serde_json",
+	"dep:axum",
+	"dep:tower",
+	"dep:tower-http",
+	"dep:tokio",
+	"dep:reqwest",
+	"dep:oauth2",
+	"dep:axum_session_auth",
+	"dep:axum_session",
+	"dep:async-trait",
+	"dep:sqlx",
+	"dep:rand",
+	"leptos/ssr",
+	"leptos_meta/ssr",
+	"leptos_router/ssr",
+	"dep:leptos_axum",
+]
+
+
+
+[package.metadata.leptos]
+# The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name
+output-name = "sso_auth_axum"
+# The site root folder is where cargo-leptos generate all output. WARNING: all content of this folder will be erased on a rebuild. Use it in your server setup.
+site-root = "target/site"
+# The site-root relative folder where all compiled output (JS, WASM and CSS) is written
+# Defaults to pkg
+site-pkg-dir = "pkg"
+# [Optional] The source CSS file. If it ends with .sass or .scss then it will be compiled by dart-sass into CSS. The CSS is optimized by Lightning CSS before being written to <site-root>/<site-pkg>/app.css
+style-file = "./style.css"
+# [Optional] Files in the asset-dir will be copied to the site-root directory
+assets-dir = "public"
+# The IP and port (ex: 127.0.0.1:3000) where the server serves the content. Use it in your server setup.
+site-addr = "127.0.0.1:3000"
+# The port to use for automatic reload monitoring
+reload-port = 3001
+# [Optional] Command to use when running end2end tests. It will run in the end2end dir.
+end2end-cmd = "npx playwright test"
+#  The browserlist query used for optimizing the CSS.
+browserquery = "defaults"
+# Set by cargo-leptos watch when building with tha tool. Controls whether autoreload JS will be included in the head
+watch = false
+# The environment Leptos will run in, usually either "DEV" or "PROD"
+env = "DEV"
+# The features to use when compiling the bin target
+#
+# Optional. Can be over-ridden with the command line parameter --bin-features
+bin-features = ["ssr"]
+
+# If the --no-default-features flag should be used when compiling the bin target
+#
+# Optional. Defaults to false.
+bin-default-features = false
+
+# The features to use when compiling the lib target
+#
+# Optional. Can be over-ridden with the command line parameter --lib-features
+lib-features = ["hydrate"]
+
+# If the --no-default-features flag should be used when compiling the lib target
+#
+# Optional. Defaults to false.
+lib-default-features = false

examples/sso_auth_axum/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Greg Johnston
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

examples/sso_auth_axum/Makefile.toml

@@ -0,0 +1,11 @@
+extend = { path = "../cargo-make/main.toml" }
+
+[tasks.build]
+command = "cargo"
+args = ["+nightly", "build-all-features"]
+install_crate = "cargo-all-features"
+
+[tasks.check]
+command = "cargo"
+args = ["+nightly", "check-all-features"]
+install_crate = "cargo-all-features"

examples/sso_auth_axum/README.md

@@ -0,0 +1,83 @@
+# Leptos SSO Authenticated Email Display App with Axum
+
+## Overview
+This project demonstrates various methods of implementing Single Sign-On (SSO) authorization using OAuth, specifically with the OAuth2 library. The primary focus is on the Authorization Code Grant flow.
+
+### Process Flow
+1. **Initiating Sign-In:** When a user clicks the 'Sign In With {THIRD PARTY SERVICE}' button, the request is sent to a server function. This function retrieves an authorization URL from the third-party service.
+
+2. **CSRF Token Handling:** During the URL fetch, a CSRF_TOKEN is generated and confirmed by the service to mitigate Cross-Site Request Forgery attacks. Learn more about CSRF [here](https://en.wikipedia.org/wiki/Cross-site_request_forgery). This token is stored on our server.
+
+3. **User Redirection:** Post-login, users are redirected to our server with a URL formatted as follows:  
+`http://your-redirect-uri.com/callback?code=AUTHORIZATION_CODE&state=CSRF_TOKEN`
+Note: Additional parameters like Scope and Client_ID may be included by the service.
+
+4. **Token Acquisition:** The 'code' parameter in the URL is not the actual service token. Instead, it's used to fetch the token. We verify the CSRF_TOKEN in the URL against our server's stored token for security.
+
+5. **Access Token Usage:** With a valid CSRF_TOKEN, we use the AUTHORIZATION_CODE in an HTTP Request to the third-party service. The response typically includes:
+- An `access token`
+- An `expires_in` value (time in seconds until token expiration)
+- A `refresh token` (used to renew the access token)
+
+6. **Email Retrieval and Display:** The access token allows us to retrieve the user's email. This email is then displayed in our Email Display App.
+
+7. **Session Management:** The `expires_in` value is sent to the client. The client uses this to set a timeout, ensuring that if the session is still active (the window hasn't been closed), it automatically triggers a token refresh when required.
+
+
+
+## Client Side Rendering
+This example cannot be built as a trunk standalone CSR-only app. Only the server may directly connect to the database.
+
+## Server Side Rendering with cargo-leptos
+cargo-leptos is now the easiest and most featureful way to build server side rendered apps with hydration. It provides automatic recompilation of client and server code, wasm optimisation, CSS minification, and more! Check out more about it [here](https://github.com/akesson/cargo-leptos)
+
+## Env Vars
+Commands that run the program, cargo leptos watch, cargo leptos serve, cargo run etc... All need the following Environment variables
+G_AUTH_CLIENT_ID : This is the client ID given to you by google.
+G_AUTH_SECRET : This is the secret given to you by google.
+NGROK : this is the ngrok endpoint you get when you run ngrok http 3000
+
+## Ngrok Google Set Up
+After running your app, run
+```bash
+ngrok http 3000
+```
+Then use google api's and services, go to credentials, create credentials, add your app name, and use the ngrok url as the origin
+and use the ngrok url with /g_auth as the redirect url. That will look like this `https://362b-24-34-20-189.ngrok-free.app/g_auth`
+Save you client ID and secret given to you by google. Use them as Envars when you run the program as below
+```bash
+REDIRECT_URL={ngrok_redirect_url} G_AUTH_CLIENT_ID={google_credential_client_id} G_AUTH_SECRET={google_credential_secret} {your command here...}
+```
+
+1. Install cargo-leptos
+```bash
+cargo install --locked cargo-leptos
+``` 
+2. Build the site in watch mode, recompiling on file changes
+```bash
+cargo leptos watch
+```
+
+Open browser on [http://localhost:3000/](http://localhost:3000/)
+
+3. When ready to deploy, run
+```bash
+cargo leptos build --release
+```
+
+## Server Side Rendering without cargo-leptos
+To run it as a server side app with hydration, you'll need to have wasm-pack installed.
+
+0. Edit the `[package.metadata.leptos]` section and set `site-root` to `"."`. You'll also want to change the path of the `<StyleSheet / >` component in the root component to point towards the CSS file in the root. This tells leptos that the WASM/JS files generated by wasm-pack are available at `./pkg` and that the CSS files are no longer processed by cargo-leptos. Building to alternative folders is not supported at this time. You'll also want to edit the call to `get_configuration()` to pass in `Some(Cargo.toml)`, so that Leptos will read the settings instead of cargo-leptos. If you do so, your file/folder names cannot include dashes.
+1. Install wasm-pack
+```bash
+cargo install wasm-pack
+```
+2. Build the Webassembly used to hydrate the HTML from the server
+```bash
+wasm-pack build --target=web --debug --no-default-features --features=hydrate
+```
+3. Run the server to serve the Webassembly, JS, and HTML 
+```bash
+cargo run --no-default-features --features=ssr
+```