aboutsummaryrefslogtreecommitdiffstats
path: root/atuin-server/src/handlers
diff options
context:
space:
mode:
Diffstat (limited to 'atuin-server/src/handlers')
-rw-r--r--atuin-server/src/handlers/history.rs22
-rw-r--r--atuin-server/src/handlers/mod.rs3
-rw-r--r--atuin-server/src/handlers/user.rs15
3 files changed, 23 insertions, 17 deletions
diff --git a/atuin-server/src/handlers/history.rs b/atuin-server/src/handlers/history.rs
index aca9ecc6..2b107907 100644
--- a/atuin-server/src/handlers/history.rs
+++ b/atuin-server/src/handlers/history.rs
@@ -1,16 +1,20 @@
-use axum::extract::Query;
-use axum::{extract::Path, Extension, Json};
-use http::StatusCode;
use std::collections::HashMap;
-use tracing::{debug, error, instrument};
-
-use crate::database::{Database, Postgres};
-use crate::models::{NewHistory, User};
-use atuin_common::api::*;
-use crate::calendar::{TimePeriod, TimePeriodInfo};
+use axum::{
+ extract::{Path, Query},
+ Extension, Json,
+};
+use http::StatusCode;
+use tracing::{debug, error, instrument};
use super::{ErrorResponse, ErrorResponseStatus};
+use crate::{
+ calendar::{TimePeriod, TimePeriodInfo},
+ database::{Database, Postgres},
+ models::{NewHistory, User},
+};
+
+use atuin_common::api::*;
#[instrument(skip_all, fields(user.id = user.id))]
pub async fn count(
diff --git a/atuin-server/src/handlers/mod.rs b/atuin-server/src/handlers/mod.rs
index 9e6659e2..cfe08bc5 100644
--- a/atuin-server/src/handlers/mod.rs
+++ b/atuin-server/src/handlers/mod.rs
@@ -1,6 +1,7 @@
+use std::borrow::Cow;
+
use axum::{response::IntoResponse, Json};
use serde::{Deserialize, Serialize};
-use std::borrow::Cow;
pub mod history;
pub mod user;
diff --git a/atuin-server/src/handlers/user.rs b/atuin-server/src/handlers/user.rs
index a57269a0..42e2b5c1 100644
--- a/atuin-server/src/handlers/user.rs
+++ b/atuin-server/src/handlers/user.rs
@@ -1,18 +1,19 @@
use std::borrow::Borrow;
-use atuin_common::api::*;
-use axum::extract::Path;
-use axum::{Extension, Json};
+use axum::{extract::Path, Extension, Json};
use http::StatusCode;
use sodiumoxide::crypto::pwhash::argon2id13;
use tracing::{debug, error, instrument};
use uuid::Uuid;
-use crate::database::{Database, Postgres};
-use crate::models::{NewSession, NewUser};
-use crate::settings::Settings;
-
use super::{ErrorResponse, ErrorResponseStatus};
+use crate::{
+ database::{Database, Postgres},
+ models::{NewSession, NewUser},
+ settings::Settings,
+};
+
+use atuin_common::api::*;
pub fn verify_str(secret: &str, verify: &str) -> bool {
sodiumoxide::init().unwrap();