matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-31 09:24:31 +03:00
Code Activity

Allow a trailing slash on the compat SSO route

Browse Source
This commit is contained in:
Quentin Gliech
2023-08-08 18:53:14 +02:00
parent 79ad2dbc65
commit dc711f8ecb
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/handlers/src/lib.rs
View File

@ -329,6 +329,10 @@ where
mas_router::CompatLoginSsoRedirectIdp::route(), mas_router::CompatLoginSsoRedirectIdp::route(),
get(self::compat::login_sso_redirect::get), get(self::compat::login_sso_redirect::get),
) )
.route(
mas_router::CompatLoginSsoRedirectSlash::route(),
get(self::compat::login_sso_redirect::get),
)
.route( .route(
mas_router::CompatLoginSsoComplete::route(), mas_router::CompatLoginSsoComplete::route(),
get(self::compat::login_sso_complete::get).post(self::compat::login_sso_complete::post), get(self::compat::login_sso_complete::get).post(self::compat::login_sso_complete::post),

14
crates/router/src/endpoints.rs
View File

@ -481,14 +481,24 @@ impl SimpleRoute for CompatRefresh {
const PATH: &'static str = "/_matrix/client/:version/refresh"; const PATH: &'static str = "/_matrix/client/:version/refresh";
} }
/// `POST /_matrix/client/v3/login/sso/redirect` /// `GET /_matrix/client/v3/login/sso/redirect`
pub struct CompatLoginSsoRedirect; pub struct CompatLoginSsoRedirect;
impl SimpleRoute for CompatLoginSsoRedirect { impl SimpleRoute for CompatLoginSsoRedirect {
const PATH: &'static str = "/_matrix/client/:version/login/sso/redirect"; const PATH: &'static str = "/_matrix/client/:version/login/sso/redirect";
} }
/// `POST /_matrix/client/v3/login/sso/redirect/:idp` /// `GET /_matrix/client/v3/login/sso/redirect/`
///
/// This is a workaround for the fact some clients (Element iOS) sends a
/// trailing slash, even though it's not in the spec.
pub struct CompatLoginSsoRedirectSlash;
impl SimpleRoute for CompatLoginSsoRedirectSlash {
const PATH: &'static str = "/_matrix/client/:version/login/sso/redirect/";
}
/// `GET /_matrix/client/v3/login/sso/redirect/:idp`
pub struct CompatLoginSsoRedirectIdp; pub struct CompatLoginSsoRedirectIdp;
impl SimpleRoute for CompatLoginSsoRedirectIdp { impl SimpleRoute for CompatLoginSsoRedirectIdp {