Compare commits
3 Commits
release-20
...
release-20
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
e23585dfea | ||
|
|
9d5092649f | ||
|
|
9f009bc18b |
@@ -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)
|
||||||
@@ -68,7 +71,6 @@ pub async fn setup_handler(
|
|||||||
|
|
||||||
// 3. Create User
|
// 3. Create User
|
||||||
// Lower cost for faster login on low-power devices (MIPS routers etc.)
|
// Lower cost for faster login on low-power devices (MIPS routers etc.)
|
||||||
// Default is usually 12, which takes ~3s on slow CPUs. 6 should be much faster.
|
|
||||||
let password_hash = match bcrypt::hash(&payload.password, 6) {
|
let password_hash = match bcrypt::hash(&payload.password, 6) {
|
||||||
Ok(h) => h,
|
Ok(h) => h,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
@@ -82,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()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -48,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)));
|
||||||
|
|||||||
@@ -45,6 +45,22 @@ fn format_duration(seconds: i64) -> String {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn format_date(timestamp: i64) -> String {
|
||||||
|
if timestamp <= 0 {
|
||||||
|
return "-".to_string();
|
||||||
|
}
|
||||||
|
let date = js_sys::Date::new(&wasm_bindgen::JsValue::from_f64((timestamp * 1000) as f64));
|
||||||
|
|
||||||
|
// Simple formatting: YYYY-MM-DD HH:mm
|
||||||
|
let year = date.get_full_year();
|
||||||
|
let month = date.get_month() + 1; // 0-based
|
||||||
|
let day = date.get_date();
|
||||||
|
let hours = date.get_hours();
|
||||||
|
let minutes = date.get_minutes();
|
||||||
|
|
||||||
|
format!("{:04}-{:02}-{:02} {:02}:{:02}", year, month, day, hours, minutes)
|
||||||
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
enum SortColumn {
|
enum SortColumn {
|
||||||
Name,
|
Name,
|
||||||
@@ -54,6 +70,7 @@ enum SortColumn {
|
|||||||
DownSpeed,
|
DownSpeed,
|
||||||
UpSpeed,
|
UpSpeed,
|
||||||
ETA,
|
ETA,
|
||||||
|
Added,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
|
||||||
@@ -66,8 +83,8 @@ enum SortDirection {
|
|||||||
pub fn TorrentTable() -> impl IntoView {
|
pub fn TorrentTable() -> impl IntoView {
|
||||||
let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
|
let store = use_context::<crate::store::TorrentStore>().expect("store not provided");
|
||||||
|
|
||||||
let sort_col = create_rw_signal(SortColumn::Name);
|
let sort_col = create_rw_signal(SortColumn::Added);
|
||||||
let sort_dir = create_rw_signal(SortDirection::Ascending);
|
let sort_dir = create_rw_signal(SortDirection::Descending);
|
||||||
|
|
||||||
let filtered_torrents = move || {
|
let filtered_torrents = move || {
|
||||||
let mut torrents = store
|
let mut torrents = store
|
||||||
@@ -127,6 +144,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
let b_eta = if b.eta <= 0 { i64::MAX } else { b.eta };
|
let b_eta = if b.eta <= 0 { i64::MAX } else { b.eta };
|
||||||
a_eta.cmp(&b_eta)
|
a_eta.cmp(&b_eta)
|
||||||
}
|
}
|
||||||
|
SortColumn::Added => a.added_date.cmp(&b.added_date),
|
||||||
};
|
};
|
||||||
if dir == SortDirection::Descending {
|
if dir == SortDirection::Descending {
|
||||||
cmp.reverse()
|
cmp.reverse()
|
||||||
@@ -264,6 +282,9 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<th class="w-24 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::ETA)>
|
<th class="w-24 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::ETA)>
|
||||||
<div class="flex items-center">"ETA" {move || sort_arrow(SortColumn::ETA)}</div>
|
<div class="flex items-center">"ETA" {move || sort_arrow(SortColumn::ETA)}</div>
|
||||||
</th>
|
</th>
|
||||||
|
<th class="w-32 cursor-pointer hover:bg-base-300 group select-none" on:click=move |_| handle_sort(SortColumn::Added)>
|
||||||
|
<div class="flex items-center">"Added" {move || sort_arrow(SortColumn::Added)}</div>
|
||||||
|
</th>
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -317,6 +338,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<td class="text-right font-mono text-[11px] opacity-80 text-success">{format_speed(t.down_rate)}</td>
|
<td class="text-right font-mono text-[11px] opacity-80 text-success">{format_speed(t.down_rate)}</td>
|
||||||
<td class="text-right font-mono text-[11px] opacity-80 text-primary">{format_speed(t.up_rate)}</td>
|
<td class="text-right font-mono text-[11px] opacity-80 text-primary">{format_speed(t.up_rate)}</td>
|
||||||
<td class="text-right font-mono text-[11px] opacity-80">{format_duration(t.eta)}</td>
|
<td class="text-right font-mono text-[11px] opacity-80">{format_duration(t.eta)}</td>
|
||||||
|
<td class="text-right font-mono text-[11px] opacity-60 whitespace-nowrap">{format_date(t.added_date)}</td>
|
||||||
</tr>
|
</tr>
|
||||||
}
|
}
|
||||||
}).collect::<Vec<_>>()}
|
}).collect::<Vec<_>>()}
|
||||||
@@ -359,6 +381,7 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
<li class="menu-title px-2 py-1 opacity-50 text-[10px] uppercase font-bold">"Sort By"</li>
|
<li class="menu-title px-2 py-1 opacity-50 text-[10px] uppercase font-bold">"Sort By"</li>
|
||||||
{
|
{
|
||||||
let columns = vec![
|
let columns = vec![
|
||||||
|
(SortColumn::Added, "Date Added"),
|
||||||
(SortColumn::Name, "Name"),
|
(SortColumn::Name, "Name"),
|
||||||
(SortColumn::Size, "Size"),
|
(SortColumn::Size, "Size"),
|
||||||
(SortColumn::Progress, "Progress"),
|
(SortColumn::Progress, "Progress"),
|
||||||
@@ -400,7 +423,8 @@ pub fn TorrentTable() -> impl IntoView {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="overflow-y-auto p-3 pb-20 flex-1 grid grid-cols-1 content-start gap-3"> {move || filtered_torrents().into_iter().map(|t| {
|
<div class="overflow-y-auto p-3 pb-20 flex-1 grid grid-cols-1 content-start gap-3">
|
||||||
|
{move || filtered_torrents().into_iter().map(|t| {
|
||||||
let progress_class = if t.percent_complete >= 100.0 { "progress-success" } else { "progress-primary" };
|
let progress_class = if t.percent_complete >= 100.0 { "progress-success" } else { "progress-primary" };
|
||||||
let status_str = format!("{:?}", t.status);
|
let status_str = format!("{:?}", t.status);
|
||||||
let status_badge_class = match t.status {
|
let status_badge_class = match t.status {
|
||||||
|
|||||||
Reference in New Issue
Block a user