Compare commits

...

17 Commits

Author SHA1 Message Date
spinline
9f009bc18b Auto-login user after setup and redirect to dashboard
All checks were successful
Build MIPS Binary / build (push) Successful in 4m16s
2026-02-07 19:54:14 +03:00
spinline
643b83ac21 Remove unused leptos_router imports from login and setup components
All checks were successful
Build MIPS Binary / build (push) Successful in 4m8s
2026-02-07 19:49:58 +03:00
spinline
90b65240b2 Restore required utoipa::OpenApi import
Some checks failed
Build MIPS Binary / build (push) Has been cancelled
2026-02-07 19:47:06 +03:00
spinline
69243a5590 Redirect authenticated users away from login/setup pages
Some checks failed
Build MIPS Binary / build (push) Failing after 3m27s
2026-02-07 19:39:53 +03:00
spinline
10262142fc Fix unused OpenApi import warning
Some checks failed
Build MIPS Binary / build (push) Failing after 3m25s
2026-02-07 19:34:41 +03:00
spinline
858a1c9b63 Fix compilation errors: Restore missing delete_session method and ApiDoc struct
All checks were successful
Build MIPS Binary / build (push) Successful in 4m7s
2026-02-07 19:28:47 +03:00
spinline
edfb7458f8 Add CLI password reset feature: --reset-password <USERNAME>
Some checks failed
Build MIPS Binary / build (push) Failing after 3m24s
2026-02-07 19:18:10 +03:00
spinline
575cfa4b38 Add 'Remember Me' feature to login (extends session to 30 days)
All checks were successful
Build MIPS Binary / build (push) Successful in 4m7s
2026-02-07 19:05:52 +03:00
spinline
9b18b97c49 Fetch and display actual username in sidebar profile section
All checks were successful
Build MIPS Binary / build (push) Successful in 4m8s
2026-02-07 17:17:16 +03:00
spinline
88723352fd Fix sidebar overlap: Add bottom padding to account for fixed status bar
All checks were successful
Build MIPS Binary / build (push) Successful in 4m12s
2026-02-07 17:07:30 +03:00
spinline
4231e0b3a7 Adjust sidebar layout to push profile section to the bottom and reduce avatar size
All checks were successful
Build MIPS Binary / build (push) Successful in 4m7s
2026-02-07 16:59:31 +03:00
spinline
1177412c87 Add user profile and logout button to sidebar footer
All checks were successful
Build MIPS Binary / build (push) Successful in 4m7s
2026-02-07 16:40:55 +03:00
spinline
aed753c64f Lower bcrypt cost to 6 to improve login speed on low-end hardware
All checks were successful
Build MIPS Binary / build (push) Successful in 4m8s
2026-02-07 16:24:06 +03:00
spinline
9d0eb11f16 Refactor App routing to fix infinite recursion and stack overflow errors
All checks were successful
Build MIPS Binary / build (push) Successful in 4m8s
2026-02-07 16:10:06 +03:00
spinline
3c13f99652 Improve App initialization logic with better error handling and logging to prevent infinite loading state
All checks were successful
Build MIPS Binary / build (push) Successful in 4m6s
2026-02-07 15:45:51 +03:00
spinline
a948215538 Change cookie SameSite policy to Lax to fix login redirection issue
All checks were successful
Build MIPS Binary / build (push) Successful in 4m6s
2026-02-07 15:38:56 +03:00
spinline
13424fceeb Demote 'Torrent status changed' log from INFO to DEBUG to reduce console noise
All checks were successful
Build MIPS Binary / build (push) Successful in 4m6s
2026-02-07 15:33:16 +03:00
12 changed files with 544 additions and 219 deletions

View File

@@ -59,15 +59,23 @@ impl Db {
Ok(()) Ok(())
} }
pub async fn get_user_by_username(&self, username: &str) -> Result<Option<(i64, String)>> { pub async fn get_user_by_username(&self, username: &str) -> Result<Option<(i64, String)>> {
let row = sqlx::query("SELECT id, password_hash FROM users WHERE username = ?") let row = sqlx::query("SELECT id, password_hash FROM users WHERE username = ?")
.bind(username) .bind(username)
.fetch_optional(&self.pool) .fetch_optional(&self.pool)
.await?; .await?;
Ok(row.map(|r| (r.get(0), r.get(1)))) Ok(row.map(|r| (r.get(0), r.get(1))))
} }
pub async fn get_username_by_id(&self, id: i64) -> Result<Option<String>> {
let row = sqlx::query("SELECT username FROM users WHERE id = ?")
.bind(id)
.fetch_optional(&self.pool)
.await?;
Ok(row.map(|r| r.get(0)))
}
pub async fn has_users(&self) -> Result<bool> { pub async fn has_users(&self) -> Result<bool> {
let row: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM users") let row: (i64,) = sqlx::query_as("SELECT COUNT(*) FROM users")
.fetch_one(&self.pool) .fetch_one(&self.pool)
@@ -103,4 +111,21 @@ impl Db {
.await?; .await?;
Ok(()) Ok(())
} }
pub async fn update_password(&self, user_id: i64, password_hash: &str) -> Result<()> {
sqlx::query("UPDATE users SET password_hash = ? WHERE id = ?")
.bind(password_hash)
.bind(user_id)
.execute(&self.pool)
.await?;
Ok(())
}
pub async fn delete_all_sessions_for_user(&self, user_id: i64) -> Result<()> {
sqlx::query("DELETE FROM sessions WHERE user_id = ?")
.bind(user_id)
.execute(&self.pool)
.await?;
Ok(())
}
} }

View File

@@ -85,7 +85,7 @@ pub fn diff_torrents(old: &[Torrent], new: &[Torrent]) -> DiffResult {
has_changes = true; has_changes = true;
// Log status changes for debugging // Log status changes for debugging
tracing::info!( tracing::debug!(
"Torrent status changed: {} ({}) {:?} -> {:?}", "Torrent status changed: {} ({}) {:?} -> {:?}",
new_t.name, new_t.hash, old_t.status, new_t.status new_t.name, new_t.hash, old_t.status, new_t.status
); );

View File

@@ -13,9 +13,10 @@ use time::Duration;
pub struct LoginRequest { pub struct LoginRequest {
username: String, username: String,
password: String, password: String,
#[serde(default)]
remember_me: bool,
} }
#[allow(dead_code)]
#[derive(Serialize, ToSchema)] #[derive(Serialize, ToSchema)]
pub struct UserResponse { pub struct UserResponse {
username: String, username: String,
@@ -62,8 +63,13 @@ pub async fn login_handler(
rand::thread_rng().sample(Alphanumeric) as char rand::thread_rng().sample(Alphanumeric) as char
}).collect(); }).collect();
// Expires in 30 days // Expiration: 30 days if remember_me is true, else 1 day
let expires_in = 60 * 60 * 24 * 30; let expires_in = if payload.remember_me {
60 * 60 * 24 * 30
} else {
60 * 60 * 24
};
let expires_at = time::OffsetDateTime::now_utc().unix_timestamp() + expires_in; let expires_at = time::OffsetDateTime::now_utc().unix_timestamp() + expires_in;
if let Err(e) = state.db.create_session(user_id, &token, expires_at).await { if let Err(e) = state.db.create_session(user_id, &token, expires_at).await {
@@ -71,15 +77,16 @@ pub async fn login_handler(
return (StatusCode::INTERNAL_SERVER_ERROR, "Failed to create session").into_response(); return (StatusCode::INTERNAL_SERVER_ERROR, "Failed to create session").into_response();
} }
let cookie = Cookie::build(("auth_token", token)) let mut cookie = Cookie::build(("auth_token", token))
.path("/") .path("/")
.http_only(true) .http_only(true)
.same_site(SameSite::Strict) .same_site(SameSite::Lax)
.max_age(Duration::seconds(expires_in))
.build(); .build();
cookie.set_max_age(Duration::seconds(expires_in));
tracing::info!("Session created and cookie set for user: {}", payload.username); tracing::info!("Session created and cookie set for user: {}", payload.username);
(StatusCode::OK, jar.add(cookie), "Login successful").into_response() (StatusCode::OK, jar.add(cookie), Json(UserResponse { username: payload.username })).into_response()
} }
Ok(false) => { Ok(false) => {
tracing::warn!("Login failed: Invalid password for {}", payload.username); tracing::warn!("Login failed: Invalid password for {}", payload.username);
@@ -120,7 +127,7 @@ pub async fn logout_handler(
get, get,
path = "/api/auth/check", path = "/api/auth/check",
responses( responses(
(status = 200, description = "Authenticated"), (status = 200, description = "Authenticated", body = UserResponse),
(status = 401, description = "Not authenticated") (status = 401, description = "Not authenticated")
) )
)] )]
@@ -130,7 +137,15 @@ pub async fn check_auth_handler(
) -> impl IntoResponse { ) -> impl IntoResponse {
if let Some(token) = jar.get("auth_token") { if let Some(token) = jar.get("auth_token") {
match state.db.get_session_user(token.value()).await { match state.db.get_session_user(token.value()).await {
Ok(Some(_)) => return StatusCode::OK.into_response(), Ok(Some(user_id)) => {
// Fetch username
// We need a helper in db.rs to get username by id, or we can use a direct query here if we don't want to change db.rs interface yet.
// But better to add `get_username_by_id` to db.rs
// For now let's query directly or via a new db method.
if let Ok(Some(username)) = state.db.get_username_by_id(user_id).await {
return (StatusCode::OK, Json(UserResponse { username })).into_response();
}
},
_ => {} // Invalid session _ => {} // Invalid session
} }
} }

View File

@@ -6,6 +6,8 @@ use axum::{
}; };
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use utoipa::ToSchema; use utoipa::ToSchema;
use axum_extra::extract::cookie::{Cookie, CookieJar, SameSite};
use time::Duration;
#[derive(Deserialize, ToSchema)] #[derive(Deserialize, ToSchema)]
pub struct SetupRequest { pub struct SetupRequest {
@@ -41,7 +43,7 @@ pub async fn get_setup_status_handler(State(state): State<AppState>) -> impl Int
path = "/api/setup", path = "/api/setup",
request_body = SetupRequest, request_body = SetupRequest,
responses( responses(
(status = 200, description = "Setup completed"), (status = 200, description = "Setup completed and logged in"),
(status = 400, description = "Invalid request"), (status = 400, description = "Invalid request"),
(status = 403, description = "Setup already completed"), (status = 403, description = "Setup already completed"),
(status = 500, description = "Internal server error") (status = 500, description = "Internal server error")
@@ -49,6 +51,7 @@ pub async fn get_setup_status_handler(State(state): State<AppState>) -> impl Int
)] )]
pub async fn setup_handler( pub async fn setup_handler(
State(state): State<AppState>, State(state): State<AppState>,
jar: CookieJar,
Json(payload): Json<SetupRequest>, Json(payload): Json<SetupRequest>,
) -> impl IntoResponse { ) -> impl IntoResponse {
// 1. Check if setup is already completed (i.e., users exist) // 1. Check if setup is already completed (i.e., users exist)
@@ -67,7 +70,8 @@ pub async fn setup_handler(
} }
// 3. Create User // 3. Create User
let password_hash = match bcrypt::hash(&payload.password, bcrypt::DEFAULT_COST) { // Lower cost for faster login on low-power devices (MIPS routers etc.)
let password_hash = match bcrypt::hash(&payload.password, 6) {
Ok(h) => h, Ok(h) => h,
Err(e) => { Err(e) => {
tracing::error!("Failed to hash password: {}", e); tracing::error!("Failed to hash password: {}", e);
@@ -80,5 +84,42 @@ pub async fn setup_handler(
return (StatusCode::INTERNAL_SERVER_ERROR, "Failed to create user").into_response(); return (StatusCode::INTERNAL_SERVER_ERROR, "Failed to create user").into_response();
} }
(StatusCode::OK, "Setup completed successfully").into_response() // 4. Auto-Login (Create Session)
// Get the created user's ID
let user = match state.db.get_user_by_username(&payload.username).await {
Ok(Some(u)) => u,
Ok(None) => return (StatusCode::INTERNAL_SERVER_ERROR, "User created but not found").into_response(),
Err(e) => {
tracing::error!("DB error fetching new user: {}", e);
return (StatusCode::INTERNAL_SERVER_ERROR, "Database error").into_response();
}
};
let (user_id, _) = user;
// Create session token
let token: String = (0..32).map(|_| {
use rand::{distributions::Alphanumeric, Rng};
rand::thread_rng().sample(Alphanumeric) as char
}).collect();
// Default expiration: 1 day (since it's not "remember me")
let expires_in = 60 * 60 * 24;
let expires_at = time::OffsetDateTime::now_utc().unix_timestamp() + expires_in;
if let Err(e) = state.db.create_session(user_id, &token, expires_at).await {
tracing::error!("Failed to create session for new user: {}", e);
// Even if session fails, setup is technically complete, but login failed.
// We return OK but user will have to login manually.
return (StatusCode::OK, "Setup completed, please login").into_response();
}
let mut cookie = Cookie::build(("auth_token", token))
.path("/")
.http_only(true)
.same_site(SameSite::Lax)
.build();
cookie.set_max_age(Duration::seconds(expires_in));
(StatusCode::OK, jar.add(cookie), "Setup completed and logged in").into_response()
} }

View File

@@ -90,6 +90,10 @@ struct Args {
/// Database URL /// Database URL
#[arg(long, env = "DATABASE_URL", default_value = "sqlite:vibetorrent.db")] #[arg(long, env = "DATABASE_URL", default_value = "sqlite:vibetorrent.db")]
db_url: String, db_url: String,
/// Reset password for the specified user
#[arg(long)]
reset_password: Option<String>,
} }
#[cfg(feature = "push-notifications")] #[cfg(feature = "push-notifications")]
@@ -130,7 +134,8 @@ struct Args {
push::PushKeys, push::PushKeys,
handlers::auth::LoginRequest, handlers::auth::LoginRequest,
handlers::setup::SetupRequest, handlers::setup::SetupRequest,
handlers::setup::SetupStatusResponse handlers::setup::SetupStatusResponse,
handlers::auth::UserResponse
) )
), ),
tags( tags(
@@ -173,7 +178,8 @@ struct ApiDoc;
shared::GlobalLimitRequest, shared::GlobalLimitRequest,
handlers::auth::LoginRequest, handlers::auth::LoginRequest,
handlers::setup::SetupRequest, handlers::setup::SetupRequest,
handlers::setup::SetupStatusResponse handlers::setup::SetupStatusResponse,
handlers::auth::UserResponse
) )
), ),
tags( tags(
@@ -197,9 +203,6 @@ async fn main() {
// Parse CLI Args // Parse CLI Args
let args = Args::parse(); let args = Args::parse();
tracing::info!("Starting VibeTorrent Backend...");
tracing::info!("Socket: {}", args.socket);
tracing::info!("Port: {}", args.port);
// Initialize Database // Initialize Database
tracing::info!("Connecting to database: {}", args.db_url); tracing::info!("Connecting to database: {}", args.db_url);
@@ -224,6 +227,68 @@ async fn main() {
}; };
tracing::info!("Database connected successfully."); tracing::info!("Database connected successfully.");
// Handle Password Reset
if let Some(username) = args.reset_password {
tracing::info!("Resetting password for user: {}", username);
// Check if user exists
let user_result = db.get_user_by_username(&username).await;
match user_result {
Ok(Some((user_id, _))) => {
// Generate random password
use rand::{distributions::Alphanumeric, Rng};
let new_password: String = rand::thread_rng()
.sample_iter(&Alphanumeric)
.take(12)
.map(char::from)
.collect();
// Hash password (low cost for performance)
let password_hash = match bcrypt::hash(&new_password, 6) {
Ok(h) => h,
Err(e) => {
tracing::error!("Failed to hash password: {}", e);
std::process::exit(1);
}
};
// Update in DB (using a direct query since db.rs doesn't have update_password yet)
// We should add `update_password` to db.rs for cleaner code, but for now direct query is fine or we can extend Db.
// Let's extend Db.rs first to be clean.
if let Err(e) = db.update_password(user_id, &password_hash).await {
tracing::error!("Failed to update password in DB: {}", e);
std::process::exit(1);
}
println!("--------------------------------------------------");
println!("Password reset successfully for user: {}", username);
println!("New Password: {}", new_password);
println!("--------------------------------------------------");
// Invalidate existing sessions for security
if let Err(e) = db.delete_all_sessions_for_user(user_id).await {
tracing::warn!("Failed to invalidate existing sessions: {}", e);
}
std::process::exit(0);
},
Ok(None) => {
tracing::error!("User '{}' not found.", username);
std::process::exit(1);
},
Err(e) => {
tracing::error!("Database error: {}", e);
std::process::exit(1);
}
}
}
tracing::info!("Starting VibeTorrent Backend...");
tracing::info!("Socket: {}", args.socket);
tracing::info!("Port: {}", args.port);
// ... rest of the main function ...
// Startup Health Check // Startup Health Check
let socket_path = std::path::Path::new(&args.socket); let socket_path = std::path::Path::new(&args.socket);
if !socket_path.exists() { if !socket_path.exists() {

View File

@@ -1,6 +1,4 @@
use crate::components::layout::sidebar::Sidebar; use crate::components::layout::protected::Protected;
use crate::components::layout::statusbar::StatusBar;
use crate::components::layout::toolbar::Toolbar;
use crate::components::toast::ToastContainer; use crate::components::toast::ToastContainer;
use crate::components::torrent::table::TorrentTable; use crate::components::torrent::table::TorrentTable;
use crate::components::auth::login::Login; use crate::components::auth::login::Login;
@@ -14,6 +12,11 @@ struct SetupStatus {
completed: bool, completed: bool,
} }
#[derive(Deserialize)]
struct UserResponse {
username: String,
}
#[component] #[component]
pub fn App() -> impl IntoView { pub fn App() -> impl IntoView {
crate::store::provide_torrent_store(); crate::store::provide_torrent_store();
@@ -25,77 +28,80 @@ pub fn App() -> impl IntoView {
// Check Auth & Setup Status on load // Check Auth & Setup Status on load
create_effect(move |_| { create_effect(move |_| {
spawn_local(async move { spawn_local(async move {
logging::log!("App initialization started...");
// 1. Check Setup Status // 1. Check Setup Status
let setup_res = gloo_net::http::Request::get("/api/setup/status").send().await; let setup_res = gloo_net::http::Request::get("/api/setup/status").send().await;
if let Ok(resp) = setup_res {
if let Ok(status) = resp.json::<SetupStatus>().await { match setup_res {
if !status.completed { Ok(resp) => {
// Redirect to setup if not completed if resp.ok() {
let navigate = use_navigate(); match resp.json::<SetupStatus>().await {
navigate("/setup", Default::default()); Ok(status) => {
set_is_loading.set(false); if !status.completed {
return; logging::log!("Setup not completed, redirecting to /setup");
let navigate = use_navigate();
navigate("/setup", Default::default());
set_is_loading.set(false);
return;
}
}
Err(e) => logging::error!("Failed to parse setup status: {}", e),
}
} }
} }
Err(e) => logging::error!("Network error checking setup status: {}", e),
} }
// 2. Check Auth Status // 2. Check Auth Status
let auth_res = gloo_net::http::Request::get("/api/auth/check").send().await; let auth_res = gloo_net::http::Request::get("/api/auth/check").send().await;
if let Ok(resp) = auth_res {
if resp.status() == 200 {
set_is_authenticated.set(true);
// Initialize push notifications logic only if authenticated match auth_res {
// ... (Push notification logic moved here or kept global but guarded) Ok(resp) => {
} else { if resp.status() == 200 {
let navigate = use_navigate(); logging::log!("Authenticated!");
// If we are already on login or setup, don't redirect loop
let pathname = window().location().pathname().unwrap_or_default(); // Parse user info
if pathname != "/login" && pathname != "/setup" { if let Ok(user_info) = resp.json::<UserResponse>().await {
navigate("/login", Default::default()); if let Some(store) = use_context::<crate::store::TorrentStore>() {
} store.user.set(Some(user_info.username));
} }
} }
set_is_authenticated.set(true);
// If user is already authenticated but on login/setup page, redirect to home
let pathname = window().location().pathname().unwrap_or_default();
if pathname == "/login" || pathname == "/setup" {
logging::log!("Already authenticated, redirecting to home");
let navigate = use_navigate();
navigate("/", Default::default());
}
} else {
logging::log!("Not authenticated, redirecting to /login");
let navigate = use_navigate();
let pathname = window().location().pathname().unwrap_or_default();
if pathname != "/login" && pathname != "/setup" {
navigate("/login", Default::default());
}
}
}
Err(e) => logging::error!("Network error checking auth status: {}", e),
}
set_is_loading.set(false); set_is_loading.set(false);
}); });
}); });
// Initialize push notifications (Only if authenticated)
// Initialize push notifications after user grants permission (Only if authenticated)
create_effect(move |_| { create_effect(move |_| {
if is_authenticated.get() { if is_authenticated.get() {
spawn_local(async { spawn_local(async {
// ... (Push notification logic kept same, shortened for brevity in this replace)
// Wait a bit for service worker to be ready // Wait a bit for service worker to be ready
gloo_timers::future::TimeoutFuture::new(2000).await; gloo_timers::future::TimeoutFuture::new(2000).await;
// Check if running on iOS and not standalone if crate::utils::platform::supports_push_notifications() && !crate::utils::platform::is_safari() {
if let Some(ios_message) = crate::utils::platform::get_ios_notification_info() { crate::store::subscribe_to_push_notifications().await;
log::warn!("iOS detected: {}", ios_message);
if let Some(store) = use_context::<crate::store::TorrentStore>() {
crate::store::show_toast_with_signal(
store.notifications,
shared::NotificationLevel::Info,
ios_message,
);
}
return;
} }
if !crate::utils::platform::supports_push_notifications() {
return;
}
if crate::utils::platform::is_safari() {
if let Some(store) = use_context::<crate::store::TorrentStore>() {
crate::store::show_toast_with_signal(
store.notifications,
shared::NotificationLevel::Info,
"Bildirim izni için sağ alttaki ayarlar ⚙️ ikonuna basın.".to_string(),
);
}
return;
}
crate::store::subscribe_to_push_notifications().await;
}); });
} }
}); });
@@ -107,38 +113,29 @@ pub fn App() -> impl IntoView {
<Route path="/login" view=move || view! { <Login /> } /> <Route path="/login" view=move || view! { <Login /> } />
<Route path="/setup" view=move || view! { <Setup /> } /> <Route path="/setup" view=move || view! { <Setup /> } />
<Route path="/*" view=move || { <Route path="/" view=move || {
view! { view! {
<Show when=move || !is_loading.get() fallback=|| view! { <Show when=move || !is_loading.get() fallback=|| view! {
<div class="flex items-center justify-center h-screen bg-base-100"> <div class="flex items-center justify-center h-screen bg-base-100">
<span class="loading loading-spinner loading-lg"></span> <span class="loading loading-spinner loading-lg"></span>
</div> </div>
}> }>
<Show when=move || is_authenticated.get() fallback=|| view! { <Login /> }> <Show when=move || is_authenticated.get() fallback=|| ()>
// Protected Layout <Protected>
<div class="drawer lg:drawer-open h-full w-full"> <TorrentTable />
<input id="my-drawer" type="checkbox" class="drawer-toggle" /> </Protected>
</Show>
</Show>
}
}/>
<div class="drawer-content flex flex-col h-full overflow-hidden bg-base-100 text-base-content text-sm select-none"> <Route path="/settings" view=move || {
<Toolbar /> view! {
<Show when=move || !is_loading.get() fallback=|| ()>
<main class="flex-1 flex flex-col min-w-0 bg-base-100 overflow-hidden pb-8"> <Show when=move || is_authenticated.get() fallback=|| ()>
<Routes> <Protected>
<Route path="/" view=move || view! { <TorrentTable /> } /> <div class="p-4">"Settings Page (Coming Soon)"</div>
<Route path="/settings" view=move || view! { <div class="p-4">"Settings Page (Coming Soon)"</div> } /> </Protected>
</Routes>
</main>
<StatusBar />
</div>
<div class="drawer-side z-40 transition-none duration-0">
<label for="my-drawer" aria-label="close sidebar" class="drawer-overlay transition-none duration-0"></label>
<div class="menu p-0 min-h-full bg-base-200 text-base-content border-r border-base-300 transition-none duration-0">
<Sidebar />
</div>
</div>
</div>
</Show> </Show>
</Show> </Show>
} }

View File

@@ -1,17 +1,18 @@
use leptos::*; use leptos::*;
use leptos_router::*;
use serde::Serialize; use serde::Serialize;
#[derive(Serialize)] #[derive(Serialize)]
struct LoginRequest { struct LoginRequest {
username: String, username: String,
password: String, password: String,
remember_me: bool,
} }
#[component] #[component]
pub fn Login() -> impl IntoView { pub fn Login() -> impl IntoView {
let (username, set_username) = create_signal(String::new()); let (username, set_username) = create_signal(String::new());
let (password, set_password) = create_signal(String::new()); let (password, set_password) = create_signal(String::new());
let (remember_me, set_remember_me) = create_signal(false);
let (error, set_error) = create_signal(Option::<String>::None); let (error, set_error) = create_signal(Option::<String>::None);
let (loading, set_loading) = create_signal(false); let (loading, set_loading) = create_signal(false);
@@ -26,6 +27,7 @@ pub fn Login() -> impl IntoView {
let req = LoginRequest { let req = LoginRequest {
username: username.get(), username: username.get(),
password: password.get(), password: password.get(),
remember_me: remember_me.get(),
}; };
let client = gloo_net::http::Request::post("/api/auth/login") let client = gloo_net::http::Request::post("/api/auth/login")
@@ -89,6 +91,19 @@ pub fn Login() -> impl IntoView {
/> />
</div> </div>
<div class="form-control mt-4">
<label class="label cursor-pointer justify-start gap-3">
<input
type="checkbox"
class="checkbox checkbox-primary checkbox-sm"
prop:checked=remember_me
on:change=move |ev| set_remember_me.set(event_target_checked(&ev))
disabled=move || loading.get()
/>
<span class="label-text">"Beni Hatırla"</span>
</label>
</div>
<Show when=move || error.get().is_some()> <Show when=move || error.get().is_some()>
<div class="alert alert-error mt-4 text-sm py-2"> <div class="alert alert-error mt-4 text-sm py-2">
<svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg> <svg xmlns="http://www.w3.org/2000/svg" class="stroke-current shrink-0 h-6 w-6" fill="none" viewBox="0 0 24 24"><path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M10 14l2-2m0 0l2-2m-2 2l-2-2m2 2l2 2m7-2a9 9 0 11-18 0 9 9 0 0118 0z" /></svg>

View File

@@ -1,5 +1,4 @@
use leptos::*; use leptos::*;
use leptos_router::*;
use serde::Serialize; use serde::Serialize;
#[derive(Serialize)] #[derive(Serialize)]
@@ -49,8 +48,9 @@ pub fn Setup() -> impl IntoView {
match client.send().await { match client.send().await {
Ok(resp) => { Ok(resp) => {
if resp.ok() { if resp.ok() {
// Redirect to login after setup (full reload to be safe) // Redirect to home after setup (auto-login handled by backend)
let _ = window().location().set_href("/login"); // Full reload to ensure auth state is refreshed
let _ = window().location().set_href("/");
} else { } else {
let text = resp.text().await.unwrap_or_default(); let text = resp.text().await.unwrap_or_default();
set_error.set(Some(format!("Hata: {}", text))); set_error.set(Some(format!("Hata: {}", text)));

View File

@@ -1,3 +1,4 @@
pub mod sidebar; pub mod sidebar;
pub mod toolbar;
pub mod statusbar; pub mod statusbar;
pub mod toolbar;
pub mod protected;

View File

@@ -0,0 +1,30 @@
use leptos::*;
use crate::components::layout::sidebar::Sidebar;
use crate::components::layout::statusbar::StatusBar;
use crate::components::layout::toolbar::Toolbar;
#[component]
pub fn Protected(children: Children) -> impl IntoView {
view! {
<div class="drawer lg:drawer-open h-full w-full">
<input id="my-drawer" type="checkbox" class="drawer-toggle" />
<div class="drawer-content flex flex-col h-full overflow-hidden bg-base-100 text-base-content text-sm select-none">
<Toolbar />
<main class="flex-1 flex flex-col min-w-0 bg-base-100 overflow-hidden pb-8">
{children()}
</main>
<StatusBar />
</div>
<div class="drawer-side z-40 transition-none duration-0">
<label for="my-drawer" aria-label="close sidebar" class="drawer-overlay transition-none duration-0"></label>
<div class="menu p-0 min-h-full bg-base-200 text-base-content border-r border-base-300 transition-none duration-0">
<Sidebar />
</div>
</div>
</div>
}
}

View File

@@ -74,69 +74,202 @@ pub fn Sidebar() -> impl IntoView {
} }
}; };
view! { let handle_logout = move |_| {
<div class="w-64 h-full flex flex-col bg-base-200 border-r border-base-300" style="padding-top: env(safe-area-inset-top);"> spawn_local(async move {
<div class="p-2"> let client = gloo_net::http::Request::post("/api/auth/logout");
<ul class="menu w-full rounded-box gap-1"> if let Ok(resp) = client.send().await {
<li class="menu-title text-primary uppercase font-bold px-4">"Filters"</li> if resp.ok() {
<li> // Force full reload to clear state
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::All))} on:click=move |_| set_filter(crate::store::FilterStatus::All)> let _ = window().location().set_href("/login");
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5"> }
<path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" /> }
</svg> });
"All" };
<span class="badge badge-sm badge-ghost ml-auto">{total_count}</span>
</button> let username = move || {
</li>
<li> store.user.get().unwrap_or_else(|| "User".to_string())
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Downloading))} on:click=move |_| set_filter(crate::store::FilterStatus::Downloading)>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5"> };
<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5M16.5 12L12 16.5m0 0L7.5 12m4.5 4.5V3" />
</svg>
"Downloading"
<span class="badge badge-sm badge-ghost ml-auto">{downloading_count}</span>
</button>
</li>
<li>
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Seeding))} on:click=move |_| set_filter(crate::store::FilterStatus::Seeding)>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5m-13.5-9L12 3m0 0l4.5 4.5M12 3v13.5" />
</svg>
"Seeding"
<span class="badge badge-sm badge-ghost ml-auto">{seeding_count}</span>
</button>
</li>
<li>
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Completed))} on:click=move |_| set_filter(crate::store::FilterStatus::Completed)>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
<path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
"Completed"
<span class="badge badge-sm badge-ghost ml-auto">{completed_count}</span>
</button>
</li>
<li>
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Paused))} on:click=move |_| set_filter(crate::store::FilterStatus::Paused)>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
<path stroke-linecap="round" stroke-linejoin="round" d="M15.75 5.25v13.5m-7.5-13.5v13.5" />
</svg>
"Paused"
<span class="badge badge-sm badge-ghost ml-auto">{paused_count}</span>
</button>
</li>
<li>
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Inactive))} on:click=move |_| set_filter(crate::store::FilterStatus::Inactive)>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
<path stroke-linecap="round" stroke-linejoin="round" d="M18.364 18.364A9 9 0 005.636 5.636m12.728 12.728A9 9 0 015.636 5.636m12.728 12.728L5.636 5.636" />
</svg>
"Inactive"
<span class="badge badge-sm badge-ghost ml-auto">{inactive_count}</span>
</button>
</li>
</ul>
</div>
</div>
} let first_letter = move || {
}
username().chars().next().unwrap_or('?').to_uppercase().to_string()
};
view! {
<div class="w-64 min-h-[100dvh] flex flex-col bg-base-200 border-r border-base-300 pb-8" style="padding-top: env(safe-area-inset-top);">
<div class="p-2 flex-1 overflow-y-auto">
<ul class="menu w-full rounded-box gap-1">
<li class="menu-title text-primary uppercase font-bold px-4">"Filters"</li>
<li>
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::All))} on:click=move |_| set_filter(crate::store::FilterStatus::All)>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
<path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" />
</svg>
"All"
<span class="badge badge-sm badge-ghost ml-auto">{total_count}</span>
</button>
</li>
<li>
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Downloading))} on:click=move |_| set_filter(crate::store::FilterStatus::Downloading)>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5M16.5 12L12 16.5m0 0L7.5 12m4.5 4.5V3" />
</svg>
"Downloading"
<span class="badge badge-sm badge-ghost ml-auto">{downloading_count}</span>
</button>
</li>
<li>
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Seeding))} on:click=move |_| set_filter(crate::store::FilterStatus::Seeding)>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
<path stroke-linecap="round" stroke-linejoin="round" d="M3 16.5v2.25A2.25 2.25 0 005.25 21h13.5A2.25 2.25 0 0021 18.75V16.5m-13.5-9L12 3m0 0l4.5 4.5M12 3v13.5" />
</svg>
"Seeding"
<span class="badge badge-sm badge-ghost ml-auto">{seeding_count}</span>
</button>
</li>
<li>
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Completed))} on:click=move |_| set_filter(crate::store::FilterStatus::Completed)>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
<path stroke-linecap="round" stroke-linejoin="round" d="M9 12.75L11.25 15 15 9.75M21 12a9 9 0 11-18 0 9 9 0 0118 0z" />
</svg>
"Completed"
<span class="badge badge-sm badge-ghost ml-auto">{completed_count}</span>
</button>
</li>
<li>
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Paused))} on:click=move |_| set_filter(crate::store::FilterStatus::Paused)>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
<path stroke-linecap="round" stroke-linejoin="round" d="M15.75 5.25v13.5m-7.5-13.5v13.5" />
</svg>
"Paused"
<span class="badge badge-sm badge-ghost ml-auto">{paused_count}</span>
</button>
</li>
<li>
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Inactive))} on:click=move |_| set_filter(crate::store::FilterStatus::Inactive)>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-5 h-5">
<path stroke-linecap="round" stroke-linejoin="round" d="M18.364 18.364A9 9 0 005.636 5.636m12.728 12.728A9 9 0 015.636 5.636m12.728 12.728L5.636 5.636" />
</svg>
"Inactive"
<span class="badge badge-sm badge-ghost ml-auto">{inactive_count}</span>
</button>
</li>
</ul>
</div>
<div class="p-4 border-t border-base-300 bg-base-200/50">
<div class="flex items-center gap-3">
<div class="avatar">
<div class="w-8 rounded-full bg-neutral text-neutral-content ring ring-primary ring-offset-base-100 ring-offset-1">
<span class="text-sm font-bold flex items-center justify-center h-full">{first_letter}</span>
</div>
</div>
<div class="flex-1 overflow-hidden">
<div class="font-bold text-sm truncate">{username}</div>
<div class="text-[10px] text-base-content/60 truncate">"Online"</div>
</div>
<button
class="btn btn-ghost btn-xs btn-square text-error hover:bg-error/10"
title="Logout"
on:click=handle_logout
>
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-4 h-4">
<path stroke-linecap="round" stroke-linejoin="round" d="M15.75 9V5.25A2.25 2.25 0 0013.5 3h-6a2.25 2.25 0 00-2.25 2.25v13.5A2.25 2.25 0 007.5 21h6a2.25 2.25 0 002.25-2.25V15M12 9l-3 3m0 0l3 3m-3-3h12.75" />
</svg>
</button>
</div>
</div>
</div>
}}

View File

@@ -27,9 +27,9 @@ pub fn show_toast_with_signal(
message: message.into(), message: message.into(),
}; };
let item = NotificationItem { id, notification }; let item = NotificationItem { id, notification };
notifications.update(|list| list.push(item)); notifications.update(|list| list.push(item));
// Auto-remove after 5 seconds // Auto-remove after 5 seconds
let _ = set_timeout( let _ = set_timeout(
move || { move || {
@@ -120,6 +120,7 @@ pub struct TorrentStore {
pub search_query: RwSignal<String>, pub search_query: RwSignal<String>,
pub global_stats: RwSignal<GlobalStats>, pub global_stats: RwSignal<GlobalStats>,
pub notifications: RwSignal<Vec<NotificationItem>>, pub notifications: RwSignal<Vec<NotificationItem>>,
pub user: RwSignal<Option<String>>,
} }
pub fn provide_torrent_store() { pub fn provide_torrent_store() {
@@ -128,6 +129,7 @@ pub fn provide_torrent_store() {
let search_query = create_rw_signal(String::new()); let search_query = create_rw_signal(String::new());
let global_stats = create_rw_signal(GlobalStats::default()); let global_stats = create_rw_signal(GlobalStats::default());
let notifications = create_rw_signal(Vec::<NotificationItem>::new()); let notifications = create_rw_signal(Vec::<NotificationItem>::new());
let user = create_rw_signal(Option::<String>::None);
let store = TorrentStore { let store = TorrentStore {
torrents, torrents,
@@ -135,6 +137,7 @@ pub fn provide_torrent_store() {
search_query, search_query,
global_stats, global_stats,
notifications, notifications,
user,
}; };
provide_context(store); provide_context(store);
@@ -149,7 +152,7 @@ pub fn provide_torrent_store() {
loop { loop {
let es_result = EventSource::new("/api/events"); let es_result = EventSource::new("/api/events");
match es_result { match es_result {
Ok(mut es) => { Ok(mut es) => {
match es.subscribe("message") { match es.subscribe("message") {
@@ -163,7 +166,7 @@ pub fn provide_torrent_store() {
if !got_first_message { if !got_first_message {
got_first_message = true; got_first_message = true;
backoff_ms = 1000; // Reset backoff on real data backoff_ms = 1000; // Reset backoff on real data
if was_connected && disconnect_notified { if was_connected && disconnect_notified {
// We were previously connected, lost connection, and now truly reconnected // We were previously connected, lost connection, and now truly reconnected
show_toast_with_signal( show_toast_with_signal(
@@ -225,11 +228,11 @@ pub fn provide_torrent_store() {
AppEvent::Notification(n) => { AppEvent::Notification(n) => {
// Show toast notification // Show toast notification
show_toast_with_signal(notifications, n.level.clone(), n.message.clone()); show_toast_with_signal(notifications, n.level.clone(), n.message.clone());
// Show browser notification for critical events // Show browser notification for critical events
let is_critical = n.message.contains("tamamlandı") let is_critical = n.message.contains("tamamlandı")
|| n.level == shared::NotificationLevel::Error; || n.level == shared::NotificationLevel::Error;
if is_critical { if is_critical {
let title = match n.level { let title = match n.level {
shared::NotificationLevel::Success => "✅ VibeTorrent", shared::NotificationLevel::Success => "✅ VibeTorrent",
@@ -237,7 +240,7 @@ pub fn provide_torrent_store() {
shared::NotificationLevel::Warning => "⚠️ VibeTorrent", shared::NotificationLevel::Warning => "⚠️ VibeTorrent",
shared::NotificationLevel::Info => " VibeTorrent", shared::NotificationLevel::Info => " VibeTorrent",
}; };
crate::utils::notification::show_notification_if_enabled( crate::utils::notification::show_notification_if_enabled(
title, title,
&n.message &n.message
@@ -316,7 +319,7 @@ struct PushKeys {
/// Requests notification permission if needed, then subscribes to push /// Requests notification permission if needed, then subscribes to push
pub async fn subscribe_to_push_notifications() { pub async fn subscribe_to_push_notifications() {
use gloo_net::http::Request; use gloo_net::http::Request;
// First, request notification permission if not already granted // First, request notification permission if not already granted
let window = web_sys::window().expect("window should exist"); let window = web_sys::window().expect("window should exist");
let permission_granted = if let Ok(notification_class) = js_sys::Reflect::get(&window, &"Notification".into()) { let permission_granted = if let Ok(notification_class) = js_sys::Reflect::get(&window, &"Notification".into()) {
@@ -324,13 +327,13 @@ pub async fn subscribe_to_push_notifications() {
log::error!("Notification API not available"); log::error!("Notification API not available");
return; return;
} }
// Check current permission // Check current permission
let current_permission = js_sys::Reflect::get(&notification_class, &"permission".into()) let current_permission = js_sys::Reflect::get(&notification_class, &"permission".into())
.ok() .ok()
.and_then(|p| p.as_string()) .and_then(|p| p.as_string())
.unwrap_or_default(); .unwrap_or_default();
if current_permission == "granted" { if current_permission == "granted" {
log::info!("Notification permission already granted"); log::info!("Notification permission already granted");
true true
@@ -376,14 +379,14 @@ pub async fn subscribe_to_push_notifications() {
log::error!("Cannot access Notification class"); log::error!("Cannot access Notification class");
return; return;
}; };
if !permission_granted { if !permission_granted {
log::warn!("Notification permission not granted, cannot subscribe to push"); log::warn!("Notification permission not granted, cannot subscribe to push");
return; return;
} }
log::info!("Notification permission granted! Proceeding with push subscription..."); log::info!("Notification permission granted! Proceeding with push subscription...");
// Get VAPID public key from backend // Get VAPID public key from backend
let public_key_response = match Request::get("/api/push/public-key").send().await { let public_key_response = match Request::get("/api/push/public-key").send().await {
Ok(resp) => resp, Ok(resp) => resp,
@@ -392,7 +395,7 @@ pub async fn subscribe_to_push_notifications() {
return; return;
} }
}; };
let public_key_data: serde_json::Value = match public_key_response.json().await { let public_key_data: serde_json::Value = match public_key_response.json().await {
Ok(data) => data, Ok(data) => data,
Err(e) => { Err(e) => {
@@ -400,7 +403,7 @@ pub async fn subscribe_to_push_notifications() {
return; return;
} }
}; };
let public_key = match public_key_data.get("publicKey").and_then(|v| v.as_str()) { let public_key = match public_key_data.get("publicKey").and_then(|v| v.as_str()) {
Some(key) => key, Some(key) => key,
None => { None => {
@@ -408,9 +411,9 @@ pub async fn subscribe_to_push_notifications() {
return; return;
} }
}; };
log::info!("VAPID public key from backend: {} (len: {})", public_key, public_key.len()); log::info!("VAPID public key from backend: {} (len: {})", public_key, public_key.len());
// Convert VAPID public key to Uint8Array // Convert VAPID public key to Uint8Array
let public_key_array = match url_base64_to_uint8array(public_key) { let public_key_array = match url_base64_to_uint8array(public_key) {
Ok(arr) => { Ok(arr) => {
@@ -422,12 +425,12 @@ pub async fn subscribe_to_push_notifications() {
return; return;
} }
}; };
// Get service worker registration // Get service worker registration
let window = web_sys::window().expect("window should exist"); let window = web_sys::window().expect("window should exist");
let navigator = window.navigator(); let navigator = window.navigator();
let service_worker = navigator.service_worker(); let service_worker = navigator.service_worker();
let registration_promise = match service_worker.ready() { let registration_promise = match service_worker.ready() {
Ok(promise) => promise, Ok(promise) => promise,
Err(e) => { Err(e) => {
@@ -435,9 +438,9 @@ pub async fn subscribe_to_push_notifications() {
return; return;
} }
}; };
let registration_future = wasm_bindgen_futures::JsFuture::from(registration_promise); let registration_future = wasm_bindgen_futures::JsFuture::from(registration_promise);
let registration = match registration_future.await { let registration = match registration_future.await {
Ok(reg) => reg, Ok(reg) => reg,
Err(e) => { Err(e) => {
@@ -445,11 +448,11 @@ pub async fn subscribe_to_push_notifications() {
return; return;
} }
}; };
let service_worker_registration = registration let service_worker_registration = registration
.dyn_into::<web_sys::ServiceWorkerRegistration>() .dyn_into::<web_sys::ServiceWorkerRegistration>()
.expect("should be ServiceWorkerRegistration"); .expect("should be ServiceWorkerRegistration");
// Subscribe to push // Subscribe to push
let push_manager = match service_worker_registration.push_manager() { let push_manager = match service_worker_registration.push_manager() {
Ok(pm) => pm, Ok(pm) => pm,
@@ -458,11 +461,11 @@ pub async fn subscribe_to_push_notifications() {
return; return;
} }
}; };
let subscribe_options = web_sys::PushSubscriptionOptionsInit::new(); let subscribe_options = web_sys::PushSubscriptionOptionsInit::new();
subscribe_options.set_user_visible_only(true); subscribe_options.set_user_visible_only(true);
subscribe_options.set_application_server_key(&public_key_array); subscribe_options.set_application_server_key(&public_key_array);
let subscribe_promise = match push_manager.subscribe_with_options(&subscribe_options) { let subscribe_promise = match push_manager.subscribe_with_options(&subscribe_options) {
Ok(promise) => promise, Ok(promise) => promise,
Err(e) => { Err(e) => {
@@ -470,9 +473,9 @@ pub async fn subscribe_to_push_notifications() {
return; return;
} }
}; };
let subscription_future = wasm_bindgen_futures::JsFuture::from(subscribe_promise); let subscription_future = wasm_bindgen_futures::JsFuture::from(subscribe_promise);
let subscription = match subscription_future.await { let subscription = match subscription_future.await {
Ok(sub) => sub, Ok(sub) => sub,
Err(e) => { Err(e) => {
@@ -480,11 +483,11 @@ pub async fn subscribe_to_push_notifications() {
return; return;
} }
}; };
let push_subscription = subscription let push_subscription = subscription
.dyn_into::<web_sys::PushSubscription>() .dyn_into::<web_sys::PushSubscription>()
.expect("should be PushSubscription"); .expect("should be PushSubscription");
// Get subscription JSON using toJSON() method // Get subscription JSON using toJSON() method
let json_result = match js_sys::Reflect::get(&push_subscription, &"toJSON".into()) { let json_result = match js_sys::Reflect::get(&push_subscription, &"toJSON".into()) {
Ok(func) if func.is_function() => { Ok(func) if func.is_function() => {
@@ -502,7 +505,7 @@ pub async fn subscribe_to_push_notifications() {
return; return;
} }
}; };
let json_value = match js_sys::JSON::stringify(&json_result) { let json_value = match js_sys::JSON::stringify(&json_result) {
Ok(val) => val, Ok(val) => val,
Err(e) => { Err(e) => {
@@ -510,11 +513,11 @@ pub async fn subscribe_to_push_notifications() {
return; return;
} }
}; };
let subscription_json_str = json_value.as_string().expect("should be string"); let subscription_json_str = json_value.as_string().expect("should be string");
log::info!("Push subscription: {}", subscription_json_str); log::info!("Push subscription: {}", subscription_json_str);
// Parse and send to backend // Parse and send to backend
let subscription_data: serde_json::Value = match serde_json::from_str(&subscription_json_str) { let subscription_data: serde_json::Value = match serde_json::from_str(&subscription_json_str) {
Ok(data) => data, Ok(data) => data,
@@ -523,35 +526,35 @@ pub async fn subscribe_to_push_notifications() {
return; return;
} }
}; };
// Extract endpoint and keys // Extract endpoint and keys
let endpoint = subscription_data let endpoint = subscription_data
.get("endpoint") .get("endpoint")
.and_then(|v| v.as_str()) .and_then(|v| v.as_str())
.expect("endpoint should exist") .expect("endpoint should exist")
.to_string(); .to_string();
let keys_obj = subscription_data let keys_obj = subscription_data
.get("keys") .get("keys")
.expect("keys should exist"); .expect("keys should exist");
let p256dh = keys_obj let p256dh = keys_obj
.get("p256dh") .get("p256dh")
.and_then(|v| v.as_str()) .and_then(|v| v.as_str())
.expect("p256dh should exist") .expect("p256dh should exist")
.to_string(); .to_string();
let auth = keys_obj let auth = keys_obj
.get("auth") .get("auth")
.and_then(|v| v.as_str()) .and_then(|v| v.as_str())
.expect("auth should exist") .expect("auth should exist")
.to_string(); .to_string();
let push_data = PushSubscriptionData { let push_data = PushSubscriptionData {
endpoint, endpoint,
keys: PushKeys { p256dh, auth }, keys: PushKeys { p256dh, auth },
}; };
// Send to backend // Send to backend
let response = match Request::post("/api/push/subscribe") let response = match Request::post("/api/push/subscribe")
.json(&push_data) .json(&push_data)
@@ -565,7 +568,7 @@ pub async fn subscribe_to_push_notifications() {
return; return;
} }
}; };
if response.ok() { if response.ok() {
log::info!("Successfully subscribed to push notifications"); log::info!("Successfully subscribed to push notifications");
} else { } else {
@@ -580,10 +583,10 @@ fn url_base64_to_uint8array(base64_string: &str) -> Result<js_sys::Uint8Array, J
let padding = (4 - (base64_string.len() % 4)) % 4; let padding = (4 - (base64_string.len() % 4)) % 4;
let mut padded = base64_string.to_string(); let mut padded = base64_string.to_string();
padded.push_str(&"=".repeat(padding)); padded.push_str(&"=".repeat(padding));
// Replace URL-safe characters // Replace URL-safe characters
let standard_base64 = padded.replace('-', "+").replace('_', "/"); let standard_base64 = padded.replace('-', "+").replace('_', "/");
// Decode using JavaScript to avoid UTF-8 encoding issues // Decode using JavaScript to avoid UTF-8 encoding issues
// Create a JavaScript function to decode the base64 and convert to Uint8Array // Create a JavaScript function to decode the base64 and convert to Uint8Array
let js_code = format!( let js_code = format!(
@@ -599,9 +602,9 @@ fn url_base64_to_uint8array(base64_string: &str) -> Result<js_sys::Uint8Array, J
"#, "#,
standard_base64 standard_base64
); );
let result = js_sys::eval(&js_code)?; let result = js_sys::eval(&js_code)?;
let array = result.dyn_into::<js_sys::Uint8Array>()?; let array = result.dyn_into::<js_sys::Uint8Array>()?;
Ok(array) Ok(array)
} }