admin/vibetorrent
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 26 Wiki Activity

Compare commits

base: admin:release-20260207-1403
Branches Tags
admin:main
admin:release-20260207-1724 admin:release-20260207-1658 admin:release-20260207-1654 admin:release-20260207-1632 admin:release-20260207-1610 admin:release-20260207-1421 admin:release-20260207-1411 admin:release-20260207-1403 admin:release-20260207-1345 admin:release-20260207-1328 admin:release-20260207-1314 admin:release-20260207-1249 admin:release-20260207-1243 admin:release-20260207-1237 admin:release-20260207-1232 admin:release-20260207-1224 admin:release-20260207-1217 admin:release-20260207-1118 admin:release-20260207-1057 admin:release-20260207-1044 admin:release-20260206-2314 admin:release-20260206-2238 admin:release-20260206-1927 admin:release-20260206-1918 admin:release-20260206-1905 admin:release-20260206-1820
...
compare: admin:release-20260207-1421
Branches Tags
admin:main
admin:release-20260207-1724 admin:release-20260207-1658 admin:release-20260207-1654 admin:release-20260207-1632 admin:release-20260207-1610 admin:release-20260207-1421 admin:release-20260207-1411 admin:release-20260207-1403 admin:release-20260207-1345 admin:release-20260207-1328 admin:release-20260207-1314 admin:release-20260207-1249 admin:release-20260207-1243 admin:release-20260207-1237 admin:release-20260207-1232 admin:release-20260207-1224 admin:release-20260207-1217 admin:release-20260207-1118 admin:release-20260207-1057 admin:release-20260207-1044 admin:release-20260206-2314 admin:release-20260206-2238 admin:release-20260206-1927 admin:release-20260206-1918 admin:release-20260206-1905 admin:release-20260206-1820

2 Commits
release-20 ... release-20

Author SHA1 Message Date
spinline
9b18b97c49 Fetch and display actual username in sidebar profile section
All checks were successful
Build MIPS Binary / build (push) Successful in 4m8s
Details
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
Details
2026-02-07 17:07:30 +03:00
5 changed files with 270 additions and 139 deletions
Expand all files Collapse all files

22
backend/src/db.rs
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)

15
backend/src/handlers/auth.rs
View File

@@ -15,7 +15,6 @@ pub struct LoginRequest {
password: String, password: String,
} }
#[allow(dead_code)]
#[derive(Serialize, ToSchema)] #[derive(Serialize, ToSchema)]
pub struct UserResponse { pub struct UserResponse {
username: String, username: String,
@@ -79,7 +78,7 @@ pub async fn login_handler(
.build(); .build();
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 +119,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 +129,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
} }
} }

14
frontend/src/app.rs
View File

@@ -12,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();
@@ -55,6 +60,14 @@ pub fn App() -> impl IntoView {
Ok(resp) => { Ok(resp) => {
if resp.status() == 200 { if resp.status() == 200 {
logging::log!("Authenticated!"); logging::log!("Authenticated!");
// Parse user info
if let Ok(user_info) = resp.json::<UserResponse>().await {
if let Some(store) = use_context::<crate::store::TorrentStore>() {
store.user.set(Some(user_info.username));
}
}
set_is_authenticated.set(true); set_is_authenticated.set(true);
} else { } else {
logging::log!("Not authenticated, redirecting to /login"); logging::log!("Not authenticated, redirecting to /login");
@@ -71,7 +84,6 @@ pub fn App() -> impl IntoView {
set_is_loading.set(false); set_is_loading.set(false);
}); });
}); });
// Initialize push notifications (Only if authenticated) // Initialize push notifications (Only if authenticated)
create_effect(move |_| { create_effect(move |_| {
if is_authenticated.get() { if is_authenticated.get() {

265
frontend/src/components/layout/sidebar.rs
View File

@@ -86,89 +86,190 @@ pub fn Sidebar() -> impl IntoView {
}); });
}; };
view! { let username = move || {
<div class="w-64 min-h-[100dvh] flex flex-col bg-base-200 border-r border-base-300" style="padding-top: env(safe-area-inset-top);">
<div class="p-2 flex-1 overflow-y-auto"> store.user.get().unwrap_or_else(|| "User".to_string())
<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" /> let first_letter = move || {
</svg>
"All" username().chars().next().unwrap_or('?').to_uppercase().to_string()
<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"> view! {
<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> <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);">
"Downloading"
<span class="badge badge-sm badge-ghost ml-auto">{downloading_count}</span> <div class="p-2 flex-1 overflow-y-auto">
</button>
</li> <ul class="menu w-full rounded-box gap-1">
<li>
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Seeding))} on:click=move |_| set_filter(crate::store::FilterStatus::Seeding)> <li class="menu-title text-primary uppercase font-bold px-4">"Filters"</li>
<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" /> <li>
</svg>
"Seeding" <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::All))} on:click=move |_| set_filter(crate::store::FilterStatus::All)>
<span class="badge badge-sm badge-ghost ml-auto">{seeding_count}</span>
</button> <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">
</li>
<li> <path stroke-linecap="round" stroke-linejoin="round" d="M3.75 6.75h16.5M3.75 12h16.5m-16.5 5.25h16.5" />
<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"> </svg>
<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> "All"
"Completed"
<span class="badge badge-sm badge-ghost ml-auto">{completed_count}</span> <span class="badge badge-sm badge-ghost ml-auto">{total_count}</span>
</button>
</li> </button>
<li>
<button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Paused))} on:click=move |_| set_filter(crate::store::FilterStatus::Paused)> </li>
<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" /> <li>
</svg>
"Paused" <button class={move || format!("cursor-pointer {}", filter_class(crate::store::FilterStatus::Downloading))} on:click=move |_| set_filter(crate::store::FilterStatus::Downloading)>
<span class="badge badge-sm badge-ghost ml-auto">{paused_count}</span>
</button> <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">
</li>
<li> <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" />
<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"> </svg>
<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> "Downloading"
"Inactive"
<span class="badge badge-sm badge-ghost ml-auto">{inactive_count}</span> <span class="badge badge-sm badge-ghost ml-auto">{downloading_count}</span>
</button>
</li> </button>
</ul>
</div> </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 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">"A"</span>
</div> </div>
</div> </div>
<div class="flex-1 overflow-hidden">
<div class="font-bold text-sm truncate">"Admin User"</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>
</div> }}
}}

93
frontend/src/store.rs
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)
} }