Change imports
This commit is contained in:
parent
2444f5c0a0
commit
5eaaca536f
7 changed files with 41 additions and 20 deletions
|
|
@ -11,12 +11,16 @@ use serde::Deserialize;
|
||||||
use sync_lib::base64_to_bytes;
|
use sync_lib::base64_to_bytes;
|
||||||
|
|
||||||
use super::{
|
use super::{
|
||||||
app_state::AppState,
|
|
||||||
auth::auth,
|
auth::auth,
|
||||||
requests::{CreateDocumentVersion, CreateDocumentVersionMultipart},
|
requests::{CreateDocumentVersion, CreateDocumentVersionMultipart},
|
||||||
};
|
};
|
||||||
use crate::{
|
use crate::{
|
||||||
database::models::{DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId},
|
app_state::{
|
||||||
|
AppState,
|
||||||
|
database::models::{
|
||||||
|
DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId,
|
||||||
|
},
|
||||||
|
},
|
||||||
errors::{SyncServerError, client_error, server_error},
|
errors::{SyncServerError, client_error, server_error},
|
||||||
utils::sanitize_path,
|
utils::sanitize_path,
|
||||||
};
|
};
|
||||||
|
|
@ -77,7 +81,7 @@ pub async fn create_document_json(
|
||||||
|
|
||||||
async fn internal_create_document(
|
async fn internal_create_document(
|
||||||
auth_header: Authorization<Bearer>,
|
auth_header: Authorization<Bearer>,
|
||||||
mut state: AppState,
|
state: AppState,
|
||||||
vault_id: VaultId,
|
vault_id: VaultId,
|
||||||
document_id: Option<DocumentId>,
|
document_id: Option<DocumentId>,
|
||||||
relative_path: String,
|
relative_path: String,
|
||||||
|
|
|
||||||
|
|
@ -8,9 +8,14 @@ use axum_jsonschema::Json;
|
||||||
use schemars::JsonSchema;
|
use schemars::JsonSchema;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
||||||
use super::{app_state::AppState, auth::auth, requests::DeleteDocumentVersion};
|
use super::{auth::auth, requests::DeleteDocumentVersion};
|
||||||
use crate::{
|
use crate::{
|
||||||
database::models::{DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId},
|
app_state::{
|
||||||
|
AppState,
|
||||||
|
database::models::{
|
||||||
|
DocumentId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId,
|
||||||
|
},
|
||||||
|
},
|
||||||
errors::{SyncServerError, server_error},
|
errors::{SyncServerError, server_error},
|
||||||
utils::sanitize_path,
|
utils::sanitize_path,
|
||||||
};
|
};
|
||||||
|
|
@ -29,7 +34,7 @@ pub async fn delete_document(
|
||||||
vault_id,
|
vault_id,
|
||||||
document_id,
|
document_id,
|
||||||
}): Path<DeleteDocumentPathParams>,
|
}): Path<DeleteDocumentPathParams>,
|
||||||
State(mut state): State<AppState>,
|
State(state): State<AppState>,
|
||||||
Json(request): Json<DeleteDocumentVersion>,
|
Json(request): Json<DeleteDocumentVersion>,
|
||||||
) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
|
) -> Result<Json<DocumentVersionWithoutContent>, SyncServerError> {
|
||||||
auth(&state, auth_header.token())?;
|
auth(&state, auth_header.token())?;
|
||||||
|
|
|
||||||
|
|
@ -8,9 +8,12 @@ use axum_jsonschema::Json;
|
||||||
use schemars::JsonSchema;
|
use schemars::JsonSchema;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
||||||
use super::{app_state::AppState, auth::auth};
|
use super::auth::auth;
|
||||||
use crate::{
|
use crate::{
|
||||||
database::models::{DocumentId, DocumentVersion, VaultId, VaultUpdateId},
|
app_state::{
|
||||||
|
AppState,
|
||||||
|
database::models::{DocumentId, DocumentVersion, VaultId, VaultUpdateId},
|
||||||
|
},
|
||||||
errors::{SyncServerError, not_found_error, server_error},
|
errors::{SyncServerError, not_found_error, server_error},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -30,7 +33,7 @@ pub async fn fetch_document_version(
|
||||||
document_id,
|
document_id,
|
||||||
vault_update_id,
|
vault_update_id,
|
||||||
}): Path<FetchDocumentVersionPathParams>,
|
}): Path<FetchDocumentVersionPathParams>,
|
||||||
State(mut state): State<AppState>,
|
State(state): State<AppState>,
|
||||||
) -> Result<Json<DocumentVersion>, SyncServerError> {
|
) -> Result<Json<DocumentVersion>, SyncServerError> {
|
||||||
auth(&state, auth_header.token())?;
|
auth(&state, auth_header.token())?;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10,9 +10,12 @@ use axum_extra::{
|
||||||
use schemars::JsonSchema;
|
use schemars::JsonSchema;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
||||||
use super::{app_state::AppState, auth::auth};
|
use super::auth::auth;
|
||||||
use crate::{
|
use crate::{
|
||||||
database::models::{DocumentId, VaultId, VaultUpdateId},
|
app_state::{
|
||||||
|
AppState,
|
||||||
|
database::models::{DocumentId, VaultId, VaultUpdateId},
|
||||||
|
},
|
||||||
errors::{SyncServerError, not_found_error, server_error},
|
errors::{SyncServerError, not_found_error, server_error},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -32,7 +35,7 @@ pub async fn fetch_document_version_content(
|
||||||
document_id,
|
document_id,
|
||||||
vault_update_id,
|
vault_update_id,
|
||||||
}): Path<FetchDocumentVersionContentPathParams>,
|
}): Path<FetchDocumentVersionContentPathParams>,
|
||||||
State(mut state): State<AppState>,
|
State(state): State<AppState>,
|
||||||
) -> Result<Bytes, SyncServerError> {
|
) -> Result<Bytes, SyncServerError> {
|
||||||
auth(&state, auth_header.token())?;
|
auth(&state, auth_header.token())?;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -8,9 +8,12 @@ use axum_jsonschema::Json;
|
||||||
use schemars::JsonSchema;
|
use schemars::JsonSchema;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
||||||
use super::{app_state::AppState, auth::auth};
|
use super::auth::auth;
|
||||||
use crate::{
|
use crate::{
|
||||||
database::models::{DocumentId, DocumentVersion, VaultId},
|
app_state::{
|
||||||
|
AppState,
|
||||||
|
database::models::{DocumentId, DocumentVersion, VaultId},
|
||||||
|
},
|
||||||
errors::{SyncServerError, not_found_error, server_error},
|
errors::{SyncServerError, not_found_error, server_error},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -28,7 +31,7 @@ pub async fn fetch_latest_document_version(
|
||||||
vault_id,
|
vault_id,
|
||||||
document_id,
|
document_id,
|
||||||
}): Path<FetchLatestDocumentVersionPathParams>,
|
}): Path<FetchLatestDocumentVersionPathParams>,
|
||||||
State(mut state): State<AppState>,
|
State(state): State<AppState>,
|
||||||
) -> Result<Json<DocumentVersion>, SyncServerError> {
|
) -> Result<Json<DocumentVersion>, SyncServerError> {
|
||||||
auth(&state, auth_header.token())?;
|
auth(&state, auth_header.token())?;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,9 +7,12 @@ use axum_jsonschema::Json;
|
||||||
use schemars::JsonSchema;
|
use schemars::JsonSchema;
|
||||||
use serde::Deserialize;
|
use serde::Deserialize;
|
||||||
|
|
||||||
use super::{app_state::AppState, auth::auth, responses::FetchLatestDocumentsResponse};
|
use super::{auth::auth, responses::FetchLatestDocumentsResponse};
|
||||||
use crate::{
|
use crate::{
|
||||||
database::models::{VaultId, VaultUpdateId},
|
app_state::{
|
||||||
|
AppState,
|
||||||
|
database::models::{VaultId, VaultUpdateId},
|
||||||
|
},
|
||||||
errors::{SyncServerError, server_error},
|
errors::{SyncServerError, server_error},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
@ -30,7 +33,7 @@ pub async fn fetch_latest_documents(
|
||||||
TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
|
TypedHeader(auth_header): TypedHeader<Authorization<Bearer>>,
|
||||||
Path(FetchLatestDocumentsPathParams { vault_id }): Path<FetchLatestDocumentsPathParams>,
|
Path(FetchLatestDocumentsPathParams { vault_id }): Path<FetchLatestDocumentsPathParams>,
|
||||||
Query(QueryParams { since_update_id }): Query<QueryParams>,
|
Query(QueryParams { since_update_id }): Query<QueryParams>,
|
||||||
State(mut state): State<AppState>,
|
State(state): State<AppState>,
|
||||||
) -> Result<Json<FetchLatestDocumentsResponse>, SyncServerError> {
|
) -> Result<Json<FetchLatestDocumentsResponse>, SyncServerError> {
|
||||||
auth(&state, auth_header.token())?;
|
auth(&state, auth_header.token())?;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,8 +4,8 @@ use axum_extra::{
|
||||||
headers::{Authorization, authorization::Bearer},
|
headers::{Authorization, authorization::Bearer},
|
||||||
};
|
};
|
||||||
|
|
||||||
use super::{app_state::AppState, auth::auth, responses::PingResponse};
|
use super::{auth::auth, responses::PingResponse};
|
||||||
use crate::errors::SyncServerError;
|
use crate::{app_state::AppState, errors::SyncServerError};
|
||||||
|
|
||||||
#[axum::debug_handler]
|
#[axum::debug_handler]
|
||||||
pub async fn ping(
|
pub async fn ping(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue