chk
/
AppFlowy-Cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: session token WIP

This commit is contained in:
Fu Zi Xiang 2023-10-09 17:07:16 +08:00
parent c71665e57b
commit 827b79e15c
No known key found for this signature in database
7 changed files with 1276 additions and 143 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1092
Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

4
Cargo.toml
View File

@ -79,6 +79,7 @@ gotrue-entity = { path = "libs/gotrue-entity" }
infra = { path = "libs/infra" } infra = { path = "libs/infra" }
shared_entity = { path = "libs/shared-entity", features = ["cloud"] } shared_entity = { path = "libs/shared-entity", features = ["cloud"] }
itertools = "0.11" itertools = "0.11"
axum_session = "0.7.0"
[dev-dependencies] [dev-dependencies]
@ -109,7 +110,8 @@ members = [
"libs/infra", "libs/infra",
"libs/shared-entity", "libs/shared-entity",
"libs/gotrue", "libs/gotrue",
"libs/gotrue-entity" "libs/gotrue-entity",
"admin_frontend",
] ]
[profile.release] [profile.release]

1
admin_frontend/Cargo.toml
View File

@ -15,6 +15,7 @@ tokio = { version = "1.32.0", features = ["rt-multi-thread", "macros"] }
tower = "0.4.13" tower = "0.4.13"
tower-http = { version = "0.4.4", features = ["fs"]} tower-http = { version = "0.4.4", features = ["fs"]}
tracing = "0.1.37" tracing = "0.1.37"
serde = { version = "1.0.188", features = ["derive"] }
[package.metadata.leptos] [package.metadata.leptos]
# The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name # The name used by wasm-bindgen/cargo-leptos for the JS/WASM bundle. Defaults to the crate name

27
admin_frontend/migrations/20230226000000_create_todo_table.sql Normal file
View File

@ -0,0 +1,27 @@
CREATE TABLE IF NOT EXISTS users (
id INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
username TEXT NOT NULL UNIQUE,
password TEXT NOT NULL,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
);
CREATE TABLE IF NOT EXISTS user_permissions (
user_id INTEGER NOT NULL,
token TEXT NOT NULL
);
-- INSERT INTO users (id, anonymous, username, password)
-- SELECT 0, true, 'Guest', ''
-- ON CONFLICT(id) DO UPDATE SET
-- anonymous = EXCLUDED.anonymous,
-- username = EXCLUDED.username;
CREATE TABLE IF NOT EXISTS todos (
id INTEGER PRIMARY KEY AUTOINCREMENT,
user_id INTEGER NOT NULL,
title TEXT NOT NULL,
completed BOOLEAN,
created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
-- FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE
);

8
admin_frontend/src/api.rs
View File

@ -1,8 +1,16 @@
use axum::{routing::post, Router}; use axum::{routing::post, Router};
use leptos::{server, ServerFnError};
pub fn api_router() -> Router { pub fn api_router() -> Router {
Router::new().route("/test", post(test_handler)) Router::new().route("/test", post(test_handler))
} }
pub async fn test_handler() -> String { pub async fn test_handler() -> String {
"Test from api".to_string() "Test from api".to_string()
} }
#[server(Foo)]
pub async fn foo() -> Result<(), ServerFnError> {
println!("Foo!");
Ok(())
}

35
admin_frontend/src/app.rs
View File

@ -1,4 +1,6 @@
use leptos::{component, view, IntoView}; use crate::api::{foo, Foo};
use leptos::{component, create_resource, create_server_action, provide_context, view, IntoView};
use leptos_axum::handle_server_fns_with_context;
use leptos_router::{Route, Router, Routes}; use leptos_router::{Route, Router, Routes};
#[component] #[component]
@ -28,6 +30,30 @@ pub fn Users() -> impl IntoView {
#[component] #[component]
pub fn Home() -> impl IntoView { pub fn Home() -> impl IntoView {
// let a = tokio::spawn(async move {
// println!("Hello from tokio!");
// tokio::time::sleep(std::time::Duration::from_secs(1)).await;
// println!("Hello from tokio again!");
// });
// let b = tokio::runtime::Runtime::new().unwrap();
// b.block_on(a).unwrap();
// let action = create_server_action::<Foo>();
// // create_resource(source, fetcher)
// let bar = create_resource(
// move || {
// (
// // action.version().get(),
// // action.version().post(),
// // action.version().put(),
// // action.version().delete(),
// )
// },
// move |_| foo(),
// );
// println!("bar: {:?}", bar);
// handle_server_fns_with_context(path, headers, raw_query, additional_context, req)
view! { view! {
<script <script
src="https://unpkg.com/htmx.org@1.9.6" src="https://unpkg.com/htmx.org@1.9.6"
@ -38,6 +64,10 @@ pub fn Home() -> impl IntoView {
<body> <body>
<h1>Admin Login</h1> <h1>Admin Login</h1>
let todos = create_resource(
move || (add_todo.version().get(), delete_todo.version().get()),
move |_| get_todos(),
);
<form> <form>
<table> <table>
<tr> <tr>
@ -59,8 +89,7 @@ pub fn Home() -> impl IntoView {
</tr> </tr>
</table> </table>
<button hx-post="/token?grant_type=password" <button hx-get="/settings" hx-target="#response">
hx-target="#response">
Submit Submit
</button> </button>
</form> </form>

20
admin_frontend/src/main.rs
View File

@ -10,7 +10,11 @@ use axum::{
http::{Request, Response, StatusCode, Uri}, http::{Request, Response, StatusCode, Uri},
response::IntoResponse, response::IntoResponse,
}; };
// use axum_session::{SessionConfig, SessionLayer, SessionStore};
// use axum_session_auth::{AuthConfig, AuthSessionLayer, SessionSqlitePool};
use leptos::LeptosOptions; use leptos::LeptosOptions;
// use sqlx::{sqlite::SqlitePoolOptions, SqlitePool};
use leptos::{component, get_configuration, view, IntoView}; use leptos::{component, get_configuration, view, IntoView};
use leptos_axum::generate_route_list; use leptos_axum::generate_route_list;
use leptos_axum::LeptosRoutes; use leptos_axum::LeptosRoutes;
@ -23,6 +27,22 @@ async fn main() {
let leptos_options = conf.leptos_options; let leptos_options = conf.leptos_options;
let routes = generate_route_list(App); let routes = generate_route_list(App);
// let pool = SqlitePoolOptions::new()
// .connect("sqlite:Todos.db")
// .await
// .expect("Could not make pool.");
// let session_config = SessionConfig::default().with_table_name("axum_sessions");
// let auth_config = AuthConfig::<i64>::default();
// let session_store =
// SessionStore::<SessionSqlitePool>::new(Some(pool.clone().into()), session_config);
// session_store.initiate().await.unwrap();
// sqlx::migrate!()
// .run(&pool)
// .await
// .expect("could not run SQLx migrations");
let app = Router::new() let app = Router::new()
.nest_service("/api", api::api_router()) .nest_service("/api", api::api_router())
.leptos_routes(&leptos_options, routes, App) .leptos_routes(&leptos_options, routes, App)