diff --git a/src/auth/csrf.rs b/src/auth/csrf.rs index d59fa1d..74cb84d 100644 --- a/src/auth/csrf.rs +++ b/src/auth/csrf.rs @@ -1,5 +1,3 @@ -use maud::{PreEscaped, html}; - use super::User; use crate::get_pg; use std::str::FromStr; @@ -7,17 +5,9 @@ use std::str::FromStr; pub trait CSRF { fn get_csrf(&self) -> impl std::future::Future; fn verify_csrf(&self, csrf: &str) -> impl std::future::Future; - fn update_csrf(&self) -> impl std::future::Future>; } impl CSRF for User { - /// Javascript to update the `value` of an element with id `csrf`. - /// - /// This is useful for htmx requests to update the CSRF token in place. - async fn update_csrf(&self) -> PreEscaped { - html! { script { (format!("document.getElementById('csrf').value = '{}';", self.get_csrf().await)) }; } - } - /// Get CSRF Token for the current session async fn get_csrf(&self) -> uuid::Uuid { let res: (uuid::Uuid,) = sqlx::query_as("SELECT csrf FROM user_session WHERE token = $1") @@ -31,7 +21,7 @@ impl CSRF for User { /// Verify CSRF and generate a new one async fn verify_csrf(&self, csrf: &str) -> bool { - if self.get_csrf().await == uuid::Uuid::from_str(csrf).unwrap_or_default() { + if self.get_csrf().await == uuid::Uuid::from_str(csrf).unwrap() { sqlx::query("UPDATE user_session SET csrf = gen_random_uuid() WHERE token = $1") .bind(&self.session) .execute(get_pg!()) diff --git a/src/format.rs b/src/format.rs index 7b60d78..56415e0 100644 --- a/src/format.rs +++ b/src/format.rs @@ -36,23 +36,12 @@ pub fn format_date(date: &chrono::NaiveDate) -> String { /// /// let number = 12345; /// let formatted = format_number(number); -/// assert_eq!(formatted, "12.345"); +/// assert_eq!(formatted, "12345"); /// ``` #[must_use] pub fn format_number(num: i32) -> String { - let mut str = num.to_string(); - let mut result = String::new(); - - str = str.chars().rev().collect(); - - for (i, c) in str.chars().enumerate() { - if i != 0 && i % 3 == 0 { - result.push('.'); - } - result.push(c); - } - - result.chars().rev().collect() + // TODO : Implement custom formatting + num.to_string() } /// Converts a number of seconds into a formatted string in `HH:MM:SS` or `MM:SS` format. diff --git a/src/lib.rs b/src/lib.rs index 44842e3..ffdcff6 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -8,6 +8,7 @@ pub mod page; pub mod request; pub mod result; +// TODO : API Pagination? // TODO : CORS? // Postgres