From 5541bf14178ddfd5258b14badb76296cbd4e68a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Fri, 19 Dec 2025 10:35:09 +0100 Subject: [PATCH] Bump Matrix version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- content/client-server-api/_index.md | 6 ++++-- data/api/client-server/account_deactivation.yaml | 2 +- data/api/client-server/definitions/sso_login_flow.yaml | 2 +- data/api/client-server/device_management.yaml | 4 ++-- data/api/client-server/registration.yaml | 2 +- data/api/client-server/sso_login_redirect.yaml | 4 ++-- 6 files changed, 11 insertions(+), 9 deletions(-) diff --git a/content/client-server-api/_index.md b/content/client-server-api/_index.md index 82aeaac8..5a611587 100644 --- a/content/client-server-api/_index.md +++ b/content/client-server-api/_index.md @@ -482,7 +482,7 @@ user management by [application services](application-service-api/#server-admin- {{% /boxes/note %}} {{% boxes/note %}} -{{% added-in v="1.17" %}} +{{% added-in v="1.18" %}} A compatibility layer is available to ease the transition from the legacy API to the OAuth 2.0 API for clients that only support the legacy API called [OAuth 2.0 aware clients](#oauth-20-aware-clients). @@ -1520,7 +1520,7 @@ client supports it, the client should redirect the user to the is complete, the client will need to submit a `/login` request matching `m.login.token`. -{{% added-in v="1.17" %}} [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients) +{{% added-in v="1.18" %}} [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients) MUST only offer the `m.login.sso` flow to the user when `oauth_aware_preferred` is set to `true` and MUST add the `action=login` parameter to the SSO redirect endpoint. @@ -1617,6 +1617,8 @@ MAY reject weak passwords with an error code `M_WEAK_PASSWORD`. #### OAuth 2.0 aware clients +{{% added-in v="1.18" %}} + This is a compatibility layer that allows clients that only support the legacy API to make some less-invasive changes to improve the user experience when talking to a homeserver that is using the OAuth 2.0 API without actually having diff --git a/data/api/client-server/account_deactivation.yaml b/data/api/client-server/account_deactivation.yaml index c7f68f67..2275fdff 100644 --- a/data/api/client-server/account_deactivation.yaml +++ b/data/api/client-server/account_deactivation.yaml @@ -37,7 +37,7 @@ paths: identity server instead. {{% boxes/warning %}} - {{% added-in v="1.17" %}} [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients) + {{% added-in v="1.18" %}} [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients) MUST NOT use this endpoint when the server supports the [OAuth 2.0 API](/client-server-api/#oauth-20-api). Instead they MUST refer the user to the [account management URL](/client-server-api/#oauth-20-account-management), if available, and MAY use the `action=org.matrix.account_deactivate` diff --git a/data/api/client-server/definitions/sso_login_flow.yaml b/data/api/client-server/definitions/sso_login_flow.yaml index 28d173a0..714cbcab 100644 --- a/data/api/client-server/definitions/sso_login_flow.yaml +++ b/data/api/client-server/definitions/sso_login_flow.yaml @@ -88,7 +88,7 @@ properties: required: ['id', 'name'] oauth_aware_preferred: type: boolean - x-addedInMatrixVersion: "1.17" + x-addedInMatrixVersion: "1.18" description: | Whether the `m.login.sso` flow is preferred over other flows for [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients). diff --git a/data/api/client-server/device_management.yaml b/data/api/client-server/device_management.yaml index da54c111..1f66f856 100644 --- a/data/api/client-server/device_management.yaml +++ b/data/api/client-server/device_management.yaml @@ -144,7 +144,7 @@ paths: {{% /boxes/warning %}} {{% boxes/warning %}} - {{% added-in v="1.17" %}} [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients) + {{% added-in v="1.18" %}} [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients) MUST NOT use this endpoint when the server supports the [OAuth 2.0 API](/client-server-api/#oauth-20-api). Instead they MUST refer the user to the [account management URL](/client-server-api/#oauth-20-account-management), if available, with the `action=org.matrix.device_delete` and `device_id={deviceId}` parameters. @@ -208,7 +208,7 @@ paths: {{% /boxes/warning %}} {{% boxes/warning %}} - {{% added-in v="1.17" %}} [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients) + {{% added-in v="1.18" %}} [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients) MUST NOT use this endpoint when the server supports the [OAuth 2.0 API](/client-server-api/#oauth-20-api). Instead they MUST refer the user to the [account management URL](/client-server-api/#oauth-20-account-management), if available. diff --git a/data/api/client-server/registration.yaml b/data/api/client-server/registration.yaml index 535689da..0e88870a 100644 --- a/data/api/client-server/registration.yaml +++ b/data/api/client-server/registration.yaml @@ -62,7 +62,7 @@ paths: [Matrix specification](/appendices/#user-identifiers). {{% boxes/warning %}} - {{% added-in v="1.17" %}} [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients) + {{% added-in v="1.18" %}} [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients) MUST NOT use this endpoint when the server offers the [`m.login.sso` authentication flow](/client-server-api/#client-login-via-sso) with `oauth_aware_preferred` set to `true`. Instead they MUST add the diff --git a/data/api/client-server/sso_login_redirect.yaml b/data/api/client-server/sso_login_redirect.yaml index c9ab99b9..ec110aa7 100644 --- a/data/api/client-server/sso_login_redirect.yaml +++ b/data/api/client-server/sso_login_redirect.yaml @@ -39,7 +39,7 @@ paths: type: string - in: query name: action - x-addedInMatrixVersion: "1.17" + x-addedInMatrixVersion: "1.18" description: |- The action that the user wishes to take at the SSO redirect, for [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients). @@ -94,7 +94,7 @@ paths: type: string - in: query name: action - x-addedInMatrixVersion: "1.17" + x-addedInMatrixVersion: "1.18" description: |- The action that the user wishes to take at the SSO redirect, for [OAuth 2.0 aware clients](/client-server-api/#oauth-20-aware-clients).