diff --git a/src/api/client/oidc/discovery.rs b/src/api/client/oidc/discovery.rs index f21bc23cb..e4c49b653 100644 --- a/src/api/client/oidc/discovery.rs +++ b/src/api/client/oidc/discovery.rs @@ -9,7 +9,7 @@ use ruma::{ self, msc2965::{ AccountManagementAction, AuthorizationServerMetadata, CodeChallengeMethod, - GrantType, Prompt, Response, ResponseMode, ResponseType, + GrantType, Prompt, ResponseMode, ResponseType, }, }, error::{ @@ -28,8 +28,8 @@ use crate::{Ruma, RumaResponse, conduwuit::Error}; /// with 404/M_UNRECOGNIZED. pub(crate) async fn get_auth_metadata( State(services): State, - _body: Ruma, -) -> Result> { + _body: Ruma, +) -> Result> { let unrecognized_error = Err(Error::Ruma(ClientError::new( http::StatusCode::NOT_FOUND, ClientErrorBody::Standard { @@ -52,6 +52,7 @@ pub(crate) async fn get_auth_metadata( .unwrap(), ); + // Build up metadata with primitives from ruma::api::client::msc2965. let metadata = AuthorizationServerMetadata { issuer: issuer.clone(), authorization_endpoint: issuer diff --git a/src/core/config/check.rs b/src/core/config/check.rs index 29f0d615e..b763df0dc 100644 --- a/src/core/config/check.rs +++ b/src/core/config/check.rs @@ -293,7 +293,7 @@ pub fn check(config: &Config) -> Result { if auth.enable_oidc_login && config.well_known.client.is_none() { return Err!(Config( "auth.enable_oidc_login", - "Oidc authentication is enabled but the well-known client is not set." + "OIDC authentication is enabled but the well-known client is not set." )); } } diff --git a/src/core/config/mod.rs b/src/core/config/mod.rs index d10cd872c..f88643de6 100644 --- a/src/core/config/mod.rs +++ b/src/core/config/mod.rs @@ -104,6 +104,7 @@ pub struct Config { #[serde(default)] pub tls: TlsConfig, + // external structure; separate section pub auth: Option, /// The UNIX socket conduwuit will listen on.