mirror of
https://github.com/element-hq/matrix-authentication-service.git
synced 2026-03-29 11:00:32 +00:00
Admin API to get the version of the service
This commit is contained in:
@@ -11,7 +11,7 @@ use aide::axum::{
|
||||
routing::{get_with, post_with},
|
||||
};
|
||||
use axum::extract::{FromRef, FromRequestParts};
|
||||
use mas_data_model::{BoxRng, SiteConfig};
|
||||
use mas_data_model::{AppVersion, BoxRng, SiteConfig};
|
||||
use mas_matrix::HomeserverConnection;
|
||||
use mas_policy::PolicyFactory;
|
||||
|
||||
@@ -28,6 +28,7 @@ mod user_emails;
|
||||
mod user_registration_tokens;
|
||||
mod user_sessions;
|
||||
mod users;
|
||||
mod version;
|
||||
|
||||
pub fn router<S>() -> ApiRouter<S>
|
||||
where
|
||||
@@ -35,6 +36,7 @@ where
|
||||
Arc<dyn HomeserverConnection>: FromRef<S>,
|
||||
PasswordManager: FromRef<S>,
|
||||
SiteConfig: FromRef<S>,
|
||||
AppVersion: FromRef<S>,
|
||||
Arc<PolicyFactory>: FromRef<S>,
|
||||
BoxRng: FromRequestParts<S>,
|
||||
CallContext: FromRequestParts<S>,
|
||||
@@ -44,6 +46,10 @@ where
|
||||
"/site-config",
|
||||
get_with(self::site_config::handler, self::site_config::doc),
|
||||
)
|
||||
.api_route(
|
||||
"/version",
|
||||
get_with(self::version::handler, self::version::doc),
|
||||
)
|
||||
.api_route(
|
||||
"/compat-sessions",
|
||||
get_with(self::compat_sessions::list, self::compat_sessions::list_doc),
|
||||
|
||||
62
crates/handlers/src/admin/v1/version.rs
Normal file
62
crates/handlers/src/admin/v1/version.rs
Normal file
@@ -0,0 +1,62 @@
|
||||
// Copyright 2025 New Vector Ltd.
|
||||
//
|
||||
// SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
|
||||
// Please see LICENSE files in the repository root for full details.
|
||||
|
||||
use aide::transform::TransformOperation;
|
||||
use axum::{Json, extract::State};
|
||||
use mas_data_model::AppVersion;
|
||||
use schemars::JsonSchema;
|
||||
use serde::Serialize;
|
||||
|
||||
use crate::admin::call_context::CallContext;
|
||||
|
||||
#[derive(Serialize, JsonSchema)]
|
||||
pub struct Version {
|
||||
/// The semver version of the app
|
||||
pub version: &'static str,
|
||||
}
|
||||
|
||||
pub fn doc(operation: TransformOperation) -> TransformOperation {
|
||||
operation
|
||||
.id("version")
|
||||
.tag("server")
|
||||
.summary("Get the version currently running")
|
||||
.response_with::<200, Json<Version>, _>(|t| t.example(Version { version: "v1.0.0" }))
|
||||
}
|
||||
|
||||
#[tracing::instrument(name = "handler.admin.v1.version", skip_all)]
|
||||
pub async fn handler(
|
||||
_: CallContext,
|
||||
State(AppVersion(version)): State<mas_data_model::AppVersion>,
|
||||
) -> Json<Version> {
|
||||
Json(Version { version })
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use hyper::{Request, StatusCode};
|
||||
use insta::assert_json_snapshot;
|
||||
use sqlx::PgPool;
|
||||
|
||||
use crate::test_utils::{RequestBuilderExt, ResponseExt, TestState, setup};
|
||||
|
||||
#[sqlx::test(migrator = "mas_storage_pg::MIGRATOR")]
|
||||
async fn test_add_user(pool: PgPool) {
|
||||
setup();
|
||||
let mut state = TestState::from_pool(pool).await.unwrap();
|
||||
let token = state.token_with_scope("urn:mas:admin").await;
|
||||
|
||||
let request = Request::get("/api/admin/v1/version").bearer(&token).empty();
|
||||
|
||||
let response = state.request(request).await;
|
||||
|
||||
assert_eq!(response.status(), StatusCode::OK);
|
||||
let body: serde_json::Value = response.json();
|
||||
assert_json_snapshot!(body, @r#"
|
||||
{
|
||||
"version": "v0.0.0-test"
|
||||
}
|
||||
"#);
|
||||
}
|
||||
}
|
||||
@@ -50,6 +50,30 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/admin/v1/version": {
|
||||
"get": {
|
||||
"tags": [
|
||||
"server"
|
||||
],
|
||||
"summary": "Get the version currently running",
|
||||
"operationId": "version",
|
||||
"responses": {
|
||||
"200": {
|
||||
"description": "",
|
||||
"content": {
|
||||
"application/json": {
|
||||
"schema": {
|
||||
"$ref": "#/components/schemas/Version"
|
||||
},
|
||||
"example": {
|
||||
"version": "v1.0.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"/api/admin/v1/compat-sessions": {
|
||||
"get": {
|
||||
"tags": [
|
||||
@@ -3710,6 +3734,18 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"Version": {
|
||||
"type": "object",
|
||||
"required": [
|
||||
"version"
|
||||
],
|
||||
"properties": {
|
||||
"version": {
|
||||
"description": "The semver version of the app",
|
||||
"type": "string"
|
||||
}
|
||||
}
|
||||
},
|
||||
"PaginationParams": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
|
||||
Reference in New Issue
Block a user