diff options
Diffstat (limited to 'crates/turtle/src/atuin_server/handlers')
9 files changed, 40 insertions, 40 deletions
diff --git a/crates/turtle/src/atuin_server/handlers/health.rs b/crates/turtle/src/atuin_server/handlers/health.rs index aebd1e8f..d39f7aa5 100644 --- a/crates/turtle/src/atuin_server/handlers/health.rs +++ b/crates/turtle/src/atuin_server/handlers/health.rs @@ -3,11 +3,11 @@ use axum::{Json, http, response::IntoResponse}; use serde::Serialize; #[derive(Serialize)] -pub struct HealthResponse { - pub status: &'static str, +pub(crate) struct HealthResponse { + pub(crate) status: &'static str, } -pub async fn health_check() -> impl IntoResponse { +pub(crate) async fn health_check() -> impl IntoResponse { ( http::StatusCode::OK, Json(HealthResponse { status: "healthy" }), diff --git a/crates/turtle/src/atuin_server/handlers/history.rs b/crates/turtle/src/atuin_server/handlers/history.rs index 7f09161b..e5057bcb 100644 --- a/crates/turtle/src/atuin_server/handlers/history.rs +++ b/crates/turtle/src/atuin_server/handlers/history.rs @@ -23,7 +23,7 @@ use crate::atuin_server_database::{ use crate::atuin_common::api::*; #[instrument(skip_all, fields(user.id = user.id))] -pub async fn count<DB: Database>( +pub(crate) async fn count<DB: Database>( UserAuth(user): UserAuth, state: State<AppState<DB>>, ) -> Result<Json<CountResponse>, ErrorResponseStatus<'static>> { @@ -43,7 +43,7 @@ pub async fn count<DB: Database>( } #[instrument(skip_all, fields(user.id = user.id))] -pub async fn list<DB: Database>( +pub(crate) async fn list<DB: Database>( req: Query<SyncHistoryRequest>, UserAuth(user): UserAuth, headers: HeaderMap, @@ -101,7 +101,7 @@ pub async fn list<DB: Database>( } #[instrument(skip_all, fields(user.id = user.id))] -pub async fn delete<DB: Database>( +pub(crate) async fn delete<DB: Database>( UserAuth(user): UserAuth, state: State<AppState<DB>>, Json(req): Json<DeleteHistoryRequest>, @@ -123,7 +123,7 @@ pub async fn delete<DB: Database>( } #[instrument(skip_all, fields(user.id = user.id))] -pub async fn add<DB: Database>( +pub(crate) async fn add<DB: Database>( UserAuth(user): UserAuth, state: State<AppState<DB>>, Json(req): Json<Vec<AddHistoryRequest>>, @@ -174,7 +174,7 @@ pub async fn add<DB: Database>( } #[derive(serde::Deserialize, Debug)] -pub struct CalendarQuery { +pub(crate) struct CalendarQuery { #[serde(default = "serde_calendar::zero")] year: i32, #[serde(default = "serde_calendar::one")] @@ -187,21 +187,21 @@ pub struct CalendarQuery { mod serde_calendar { use time::UtcOffset; - pub fn zero() -> i32 { + pub(crate) fn zero() -> i32 { 0 } - pub fn one() -> u8 { + pub(crate) fn one() -> u8 { 1 } - pub fn utc() -> UtcOffset { + pub(crate) fn utc() -> UtcOffset { UtcOffset::UTC } } #[instrument(skip_all, fields(user.id = user.id))] -pub async fn calendar<DB: Database>( +pub(crate) async fn calendar<DB: Database>( Path(focus): Path<String>, Query(params): Query<CalendarQuery>, UserAuth(user): UserAuth, diff --git a/crates/turtle/src/atuin_server/handlers/mod.rs b/crates/turtle/src/atuin_server/handlers/mod.rs index 7722d03e..322324c4 100644 --- a/crates/turtle/src/atuin_server/handlers/mod.rs +++ b/crates/turtle/src/atuin_server/handlers/mod.rs @@ -4,16 +4,16 @@ use axum::{Json, extract::State, http, response::IntoResponse}; use crate::atuin_server::router::AppState; -pub mod health; -pub mod history; -pub mod record; -pub mod status; -pub mod user; -pub mod v0; +pub(crate) mod health; +pub(crate) mod history; +pub(crate) mod record; +pub(crate) mod status; +pub(crate) mod user; +pub(crate) mod v0; const VERSION: &str = env!("CARGO_PKG_VERSION"); -pub async fn index<DB: Database>(state: State<AppState<DB>>) -> Json<IndexResponse> { +pub(crate) async fn index<DB: Database>(state: State<AppState<DB>>) -> Json<IndexResponse> { let homage = r#""Through the fathomless deeps of space swims the star turtle Great A'Tuin, bearing on its back the four giant elephants who carry on their shoulders the mass of the Discworld." -- Sir Terry Pratchett"#; let version = state @@ -34,12 +34,12 @@ impl IntoResponse for ErrorResponseStatus<'_> { } } -pub struct ErrorResponseStatus<'a> { - pub error: ErrorResponse<'a>, - pub status: http::StatusCode, +pub(crate) struct ErrorResponseStatus<'a> { + pub(crate) error: ErrorResponse<'a>, + pub(crate) status: http::StatusCode, } -pub trait RespExt<'a> { +pub(crate) trait RespExt<'a> { fn with_status(self, status: http::StatusCode) -> ErrorResponseStatus<'a>; fn reply(reason: &'a str) -> Self; } diff --git a/crates/turtle/src/atuin_server/handlers/record.rs b/crates/turtle/src/atuin_server/handlers/record.rs index 63325606..39060423 100644 --- a/crates/turtle/src/atuin_server/handlers/record.rs +++ b/crates/turtle/src/atuin_server/handlers/record.rs @@ -8,7 +8,7 @@ use crate::atuin_server::router::UserAuth; use crate::atuin_common::record::{EncryptedData, Record}; #[instrument(skip_all, fields(user.id = user.id))] -pub async fn post(UserAuth(user): UserAuth) -> Result<(), ErrorResponseStatus<'static>> { +pub(crate) async fn post(UserAuth(user): UserAuth) -> Result<(), ErrorResponseStatus<'static>> { // anyone who has actually used the old record store (a very small number) will see this error // upon trying to sync. // 1. The status endpoint will say that the server has nothing @@ -24,7 +24,7 @@ pub async fn post(UserAuth(user): UserAuth) -> Result<(), ErrorResponseStatus<'s } #[instrument(skip_all, fields(user.id = user.id))] -pub async fn index(UserAuth(user): UserAuth) -> axum::response::Response { +pub(crate) async fn index(UserAuth(user): UserAuth) -> axum::response::Response { let ret = json!({ "hosts": {} }); @@ -33,7 +33,7 @@ pub async fn index(UserAuth(user): UserAuth) -> axum::response::Response { } #[instrument(skip_all, fields(user.id = user.id))] -pub async fn next( +pub(crate) async fn next( UserAuth(user): UserAuth, ) -> Result<Json<Vec<Record<EncryptedData>>>, ErrorResponseStatus<'static>> { let records = Vec::new(); diff --git a/crates/turtle/src/atuin_server/handlers/status.rs b/crates/turtle/src/atuin_server/handlers/status.rs index 0cf2ca1e..59be1e5c 100644 --- a/crates/turtle/src/atuin_server/handlers/status.rs +++ b/crates/turtle/src/atuin_server/handlers/status.rs @@ -10,7 +10,7 @@ use crate::atuin_common::api::*; const VERSION: &str = env!("CARGO_PKG_VERSION"); #[instrument(skip_all, fields(user.id = user.id))] -pub async fn status<DB: Database>( +pub(crate) async fn status<DB: Database>( UserAuth(user): UserAuth, state: State<AppState<DB>>, ) -> Result<Json<StatusResponse>, ErrorResponseStatus<'static>> { diff --git a/crates/turtle/src/atuin_server/handlers/user.rs b/crates/turtle/src/atuin_server/handlers/user.rs index 01b72202..7708d43e 100644 --- a/crates/turtle/src/atuin_server/handlers/user.rs +++ b/crates/turtle/src/atuin_server/handlers/user.rs @@ -29,7 +29,7 @@ use reqwest::header::CONTENT_TYPE; use crate::atuin_common::{api::*, utils::crypto_random_string}; -pub fn verify_str(hash: &str, password: &str) -> bool { +pub(crate) fn verify_str(hash: &str, password: &str) -> bool { let arg2 = Argon2::new(Algorithm::Argon2id, Version::V0x13, Params::default()); let Ok(hash) = PasswordHash::new(hash) else { return false; @@ -63,7 +63,7 @@ async fn send_register_hook(url: &str, username: String, registered: String) { } #[instrument(skip_all, fields(user.username = username.as_str()))] -pub async fn get<DB: Database>( +pub(crate) async fn get<DB: Database>( Path(username): Path<String>, state: State<AppState<DB>>, ) -> Result<Json<UserResponse>, ErrorResponseStatus<'static>> { @@ -87,7 +87,7 @@ pub async fn get<DB: Database>( } #[instrument(skip_all)] -pub async fn register<DB: Database>( +pub(crate) async fn register<DB: Database>( state: State<AppState<DB>>, Json(register): Json<RegisterRequest>, ) -> Result<Json<RegisterResponse>, ErrorResponseStatus<'static>> { @@ -163,7 +163,7 @@ pub async fn register<DB: Database>( } #[instrument(skip_all, fields(user.id = user.id))] -pub async fn delete<DB: Database>( +pub(crate) async fn delete<DB: Database>( UserAuth(user): UserAuth, state: State<AppState<DB>>, ) -> Result<Json<DeleteUserResponse>, ErrorResponseStatus<'static>> { @@ -183,7 +183,7 @@ pub async fn delete<DB: Database>( } #[instrument(skip_all, fields(user.id = user.id, change_password))] -pub async fn change_password<DB: Database>( +pub(crate) async fn change_password<DB: Database>( UserAuth(mut user): UserAuth, state: State<AppState<DB>>, Json(change_password): Json<ChangePasswordRequest>, @@ -213,7 +213,7 @@ pub async fn change_password<DB: Database>( } #[instrument(skip_all, fields(user.username = login.username.as_str()))] -pub async fn login<DB: Database>( +pub(crate) async fn login<DB: Database>( state: State<AppState<DB>>, login: Json<LoginRequest>, ) -> Result<Json<LoginResponse>, ErrorResponseStatus<'static>> { diff --git a/crates/turtle/src/atuin_server/handlers/v0/me.rs b/crates/turtle/src/atuin_server/handlers/v0/me.rs index a1e2db46..1f5f5016 100644 --- a/crates/turtle/src/atuin_server/handlers/v0/me.rs +++ b/crates/turtle/src/atuin_server/handlers/v0/me.rs @@ -7,7 +7,7 @@ use crate::atuin_server::router::UserAuth; use crate::atuin_common::api::*; #[instrument(skip_all, fields(user.id = user.id))] -pub async fn get( +pub(crate) async fn get( UserAuth(user): UserAuth, ) -> Result<Json<MeResponse>, ErrorResponseStatus<'static>> { Ok(Json(MeResponse { diff --git a/crates/turtle/src/atuin_server/handlers/v0/record.rs b/crates/turtle/src/atuin_server/handlers/v0/record.rs index 9b147a52..2cc09118 100644 --- a/crates/turtle/src/atuin_server/handlers/v0/record.rs +++ b/crates/turtle/src/atuin_server/handlers/v0/record.rs @@ -12,7 +12,7 @@ use crate::atuin_server_database::Database; use crate::atuin_common::record::{EncryptedData, HostId, Record, RecordIdx, RecordStatus}; #[instrument(skip_all, fields(user.id = user.id))] -pub async fn post<DB: Database>( +pub(crate) async fn post<DB: Database>( UserAuth(user): UserAuth, state: State<AppState<DB>>, Json(records): Json<Vec<Record<EncryptedData>>>, @@ -51,7 +51,7 @@ pub async fn post<DB: Database>( } #[instrument(skip_all, fields(user.id = user.id))] -pub async fn index<DB: Database>( +pub(crate) async fn index<DB: Database>( UserAuth(user): UserAuth, state: State<AppState<DB>>, ) -> Result<Json<RecordStatus>, ErrorResponseStatus<'static>> { @@ -76,7 +76,7 @@ pub async fn index<DB: Database>( } #[derive(Deserialize)] -pub struct NextParams { +pub(crate) struct NextParams { host: HostId, tag: String, start: Option<RecordIdx>, @@ -84,7 +84,7 @@ pub struct NextParams { } #[instrument(skip_all, fields(user.id = user.id))] -pub async fn next<DB: Database>( +pub(crate) async fn next<DB: Database>( params: Query<NextParams>, UserAuth(user): UserAuth, state: State<AppState<DB>>, diff --git a/crates/turtle/src/atuin_server/handlers/v0/store.rs b/crates/turtle/src/atuin_server/handlers/v0/store.rs index cd184546..8269d6b3 100644 --- a/crates/turtle/src/atuin_server/handlers/v0/store.rs +++ b/crates/turtle/src/atuin_server/handlers/v0/store.rs @@ -10,10 +10,10 @@ use crate::atuin_server::{ use crate::atuin_server_database::Database; #[derive(Deserialize)] -pub struct DeleteParams {} +pub(crate) struct DeleteParams {} #[instrument(skip_all, fields(user.id = user.id))] -pub async fn delete<DB: Database>( +pub(crate) async fn delete<DB: Database>( _params: Query<DeleteParams>, UserAuth(user): UserAuth, state: State<AppState<DB>>, |