diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs index 3b9bc794..67969e84 100644 --- a/backend/sync_server/src/server/create_document.rs +++ b/backend/sync_server/src/server/create_document.rs @@ -11,12 +11,16 @@ use serde::Deserialize; use sync_lib::base64_to_bytes; use super::{ - app_state::AppState, auth::auth, requests::{CreateDocumentVersion, CreateDocumentVersionMultipart}, }; use crate::{ - database::models::{DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId}, + app_state::{ + AppState, + database::models::{ + DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId, + }, + }, errors::{SyncServerError, client_error, server_error}, utils::sanitize_path, }; @@ -77,7 +81,7 @@ pub async fn create_document_json( async fn internal_create_document( auth_header: Authorization, - mut state: AppState, + state: AppState, vault_id: VaultId, document_id: Option, relative_path: String, diff --git a/backend/sync_server/src/server/delete_document.rs b/backend/sync_server/src/server/delete_document.rs index 4d940852..74327198 100644 --- a/backend/sync_server/src/server/delete_document.rs +++ b/backend/sync_server/src/server/delete_document.rs @@ -8,9 +8,14 @@ use axum_jsonschema::Json; use schemars::JsonSchema; use serde::Deserialize; -use super::{app_state::AppState, auth::auth, requests::DeleteDocumentVersion}; +use super::{auth::auth, requests::DeleteDocumentVersion}; use crate::{ - database::models::{DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId}, + app_state::{ + AppState, + database::models::{ + DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId, + }, + }, errors::{SyncServerError, server_error}, utils::sanitize_path, }; @@ -29,7 +34,7 @@ pub async fn delete_document( vault_id, document_id, }): Path, - State(mut state): State, + State(state): State, Json(request): Json, ) -> Result, SyncServerError> { auth(&state, auth_header.token())?; diff --git a/backend/sync_server/src/server/fetch_document_version.rs b/backend/sync_server/src/server/fetch_document_version.rs index be488c18..aab06c85 100644 --- a/backend/sync_server/src/server/fetch_document_version.rs +++ b/backend/sync_server/src/server/fetch_document_version.rs @@ -8,9 +8,12 @@ use axum_jsonschema::Json; use schemars::JsonSchema; use serde::Deserialize; -use super::{app_state::AppState, auth::auth}; +use super::auth::auth; use crate::{ - database::models::{DocumentId, DocumentVersion, VaultId, VaultUpdateId}, + app_state::{ + AppState, + database::models::{DocumentId, DocumentVersion, VaultId, VaultUpdateId}, + }, errors::{SyncServerError, not_found_error, server_error}, }; @@ -30,7 +33,7 @@ pub async fn fetch_document_version( document_id, vault_update_id, }): Path, - State(mut state): State, + State(state): State, ) -> Result, SyncServerError> { auth(&state, auth_header.token())?; diff --git a/backend/sync_server/src/server/fetch_document_version_content.rs b/backend/sync_server/src/server/fetch_document_version_content.rs index 746c9b3a..a2504ba1 100644 --- a/backend/sync_server/src/server/fetch_document_version_content.rs +++ b/backend/sync_server/src/server/fetch_document_version_content.rs @@ -10,9 +10,12 @@ use axum_extra::{ use schemars::JsonSchema; use serde::Deserialize; -use super::{app_state::AppState, auth::auth}; +use super::auth::auth; use crate::{ - database::models::{DocumentId, VaultId, VaultUpdateId}, + app_state::{ + AppState, + database::models::{DocumentId, VaultId, VaultUpdateId}, + }, errors::{SyncServerError, not_found_error, server_error}, }; @@ -32,7 +35,7 @@ pub async fn fetch_document_version_content( document_id, vault_update_id, }): Path, - State(mut state): State, + State(state): State, ) -> Result { auth(&state, auth_header.token())?; diff --git a/backend/sync_server/src/server/fetch_latest_document_version.rs b/backend/sync_server/src/server/fetch_latest_document_version.rs index c9c2fdec..ec777f30 100644 --- a/backend/sync_server/src/server/fetch_latest_document_version.rs +++ b/backend/sync_server/src/server/fetch_latest_document_version.rs @@ -8,9 +8,12 @@ use axum_jsonschema::Json; use schemars::JsonSchema; use serde::Deserialize; -use super::{app_state::AppState, auth::auth}; +use super::auth::auth; use crate::{ - database::models::{DocumentId, DocumentVersion, VaultId}, + app_state::{ + AppState, + database::models::{DocumentId, DocumentVersion, VaultId}, + }, errors::{SyncServerError, not_found_error, server_error}, }; @@ -28,7 +31,7 @@ pub async fn fetch_latest_document_version( vault_id, document_id, }): Path, - State(mut state): State, + State(state): State, ) -> Result, SyncServerError> { auth(&state, auth_header.token())?; diff --git a/backend/sync_server/src/server/fetch_latest_documents.rs b/backend/sync_server/src/server/fetch_latest_documents.rs index 89197c2e..2b4dc841 100644 --- a/backend/sync_server/src/server/fetch_latest_documents.rs +++ b/backend/sync_server/src/server/fetch_latest_documents.rs @@ -7,9 +7,12 @@ use axum_jsonschema::Json; use schemars::JsonSchema; use serde::Deserialize; -use super::{app_state::AppState, auth::auth, responses::FetchLatestDocumentsResponse}; +use super::{auth::auth, responses::FetchLatestDocumentsResponse}; use crate::{ - database::models::{VaultId, VaultUpdateId}, + app_state::{ + AppState, + database::models::{VaultId, VaultUpdateId}, + }, errors::{SyncServerError, server_error}, }; @@ -30,7 +33,7 @@ pub async fn fetch_latest_documents( TypedHeader(auth_header): TypedHeader>, Path(FetchLatestDocumentsPathParams { vault_id }): Path, Query(QueryParams { since_update_id }): Query, - State(mut state): State, + State(state): State, ) -> Result, SyncServerError> { auth(&state, auth_header.token())?; diff --git a/backend/sync_server/src/server/ping.rs b/backend/sync_server/src/server/ping.rs index 1823c9f9..1fe75ee6 100644 --- a/backend/sync_server/src/server/ping.rs +++ b/backend/sync_server/src/server/ping.rs @@ -4,8 +4,8 @@ use axum_extra::{ headers::{Authorization, authorization::Bearer}, }; -use super::{app_state::AppState, auth::auth, responses::PingResponse}; -use crate::errors::SyncServerError; +use super::{auth::auth, responses::PingResponse}; +use crate::{app_state::AppState, errors::SyncServerError}; #[axum::debug_handler] pub async fn ping(