diff options
Diffstat (limited to 'atuin-server/src/handlers')
-rw-r--r-- | atuin-server/src/handlers/history.rs | 4 | ||||
-rw-r--r-- | atuin-server/src/handlers/mod.rs | 2 | ||||
-rw-r--r-- | atuin-server/src/handlers/user.rs | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/atuin-server/src/handlers/history.rs b/atuin-server/src/handlers/history.rs index aca9ecc6..fb16d845 100644 --- a/atuin-server/src/handlers/history.rs +++ b/atuin-server/src/handlers/history.rs @@ -6,7 +6,9 @@ use tracing::{debug, error, instrument}; use crate::database::{Database, Postgres}; use crate::models::{NewHistory, User}; -use atuin_common::api::*; +use atuin_common::api::{ + AddHistoryRequest, CountResponse, SyncHistoryRequest, SyncHistoryResponse, +}; use crate::calendar::{TimePeriod, TimePeriodInfo}; diff --git a/atuin-server/src/handlers/mod.rs b/atuin-server/src/handlers/mod.rs index 9e6659e2..7d1c3adc 100644 --- a/atuin-server/src/handlers/mod.rs +++ b/atuin-server/src/handlers/mod.rs @@ -26,7 +26,7 @@ pub struct ErrorResponseStatus<'a> { } impl<'a> ErrorResponse<'a> { - pub fn with_status(self, status: http::StatusCode) -> ErrorResponseStatus<'a> { + pub const fn with_status(self, status: http::StatusCode) -> ErrorResponseStatus<'a> { ErrorResponseStatus { error: self, status, diff --git a/atuin-server/src/handlers/user.rs b/atuin-server/src/handlers/user.rs index a57269a0..35ca3812 100644 --- a/atuin-server/src/handlers/user.rs +++ b/atuin-server/src/handlers/user.rs @@ -1,6 +1,8 @@ use std::borrow::Borrow; -use atuin_common::api::*; +use atuin_common::api::{ + LoginRequest, LoginResponse, RegisterRequest, RegisterResponse, UserResponse, +}; use axum::extract::Path; use axum::{Extension, Json}; use http::StatusCode; @@ -15,8 +17,6 @@ use crate::settings::Settings; use super::{ErrorResponse, ErrorResponseStatus}; pub fn verify_str(secret: &str, verify: &str) -> bool { - sodiumoxide::init().unwrap(); - let mut padded = [0_u8; 128]; secret.as_bytes().iter().enumerate().for_each(|(i, val)| { padded[i] = *val; |