diff --git a/frontend/sync-client/src/services/types/PingResponse.ts b/frontend/sync-client/src/services/types/ServerConfigResponse.ts similarity index 85% rename from frontend/sync-client/src/services/types/PingResponse.ts rename to frontend/sync-client/src/services/types/ServerConfigResponse.ts index 1bd35bb5..5850ae09 100644 --- a/frontend/sync-client/src/services/types/PingResponse.ts +++ b/frontend/sync-client/src/services/types/ServerConfigResponse.ts @@ -1,9 +1,9 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. /** - * Response to a ping request. + * Server configuration and authentication status. */ -export type PingResponse = { +export type ServerConfigResponse = { /** * Semantic version of the server. */ diff --git a/sync-server/src/server/endpoints.rs b/sync-server/src/server/endpoints.rs index 70724dc0..85bda642 100644 --- a/sync-server/src/server/endpoints.rs +++ b/sync-server/src/server/endpoints.rs @@ -3,10 +3,10 @@ pub mod fetch_document_version_content; pub mod fetch_latest_document_metadata; pub mod fetch_latest_document_version; pub mod get_file_manifest; +pub mod get_server_config; pub mod index; pub mod method_not_allowed; pub mod not_found; -pub mod ping; pub mod put_file_content; pub mod put_file_manifest; mod utils; diff --git a/sync-server/src/server/endpoints/ping.rs b/sync-server/src/server/endpoints/get_server_config.rs similarity index 76% rename from sync-server/src/server/endpoints/ping.rs rename to sync-server/src/server/endpoints/get_server_config.rs index a49c25a0..5a5db56c 100644 --- a/sync-server/src/server/endpoints/ping.rs +++ b/sync-server/src/server/endpoints/get_server_config.rs @@ -9,22 +9,22 @@ use axum_extra::{ use log::debug; use super::VaultPath; -use crate::server::{auth::authenticate_user, responses::PingResponse}; +use crate::server::{auth::authenticate_user, responses::ServerConfigResponse}; use crate::{app_state::AppState, consts::SUPPORTED_API_VERSION, errors::SyncServerError}; #[axum::debug_handler] -pub async fn ping( +pub async fn get_server_config( maybe_auth_header: Option>>, Path(VaultPath(vault_id)): Path, State(state): State, -) -> Result, SyncServerError> { - debug!("Pinging vault `{vault_id}`"); +) -> Result, SyncServerError> { + debug!("Fetching configuration for vault `{vault_id}`"); let is_authenticated = maybe_auth_header.is_some_and(|auth_header| { authenticate_user(&state, auth_header.token(), &vault_id).is_ok() }); - Ok(Json(PingResponse { + Ok(Json(ServerConfigResponse { server_version: env!("CARGO_PKG_VERSION").to_owned(), is_authenticated, mergeable_file_extensions: state.config.server.mergeable_file_extensions.clone(),