From c665f7fcb64176cf9659e4910bc89f595acb15c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Sat, 11 Jun 2022 17:47:20 +0200 Subject: [PATCH 1/3] refresh_token is omitted if inhibit_login is true MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- data/api/client-server/registration.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/api/client-server/registration.yaml b/data/api/client-server/registration.yaml index 21fc1b84..f48385e9 100644 --- a/data/api/client-server/registration.yaml +++ b/data/api/client-server/registration.yaml @@ -165,7 +165,7 @@ paths: obtain a new access token when it expires by calling the `/refresh` endpoint. - Omitted if the `inhibit_login` option is false. + Omitted if the `inhibit_login` option is true. x-addedInMatrixVersion: "1.3" expires_in_ms: type: integer @@ -177,7 +177,7 @@ paths: to obtain a new access token. If not given, the client can assume that the access token will not expire. - Omitted if the `inhibit_login` option is false. + Omitted if the `inhibit_login` option is true. x-addedInMatrixVersion: "1.3" home_server: type: string From 86f984b1b6b41ff9b7ec0313a9728c363445695c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?K=C3=A9vin=20Commaille?= Date: Sat, 11 Jun 2022 17:52:48 +0200 Subject: [PATCH 2/3] Changelog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Kévin Commaille --- changelogs/client_server/newsfragments/1113.clarification | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelogs/client_server/newsfragments/1113.clarification diff --git a/changelogs/client_server/newsfragments/1113.clarification b/changelogs/client_server/newsfragments/1113.clarification new file mode 100644 index 00000000..3ccb2333 --- /dev/null +++ b/changelogs/client_server/newsfragments/1113.clarification @@ -0,0 +1 @@ +Fix various typos throughout the specification. From 3fbaced8be564c941a3e710c0f8eb70231ce3225 Mon Sep 17 00:00:00 2001 From: Hubert Chathi Date: Mon, 13 Jun 2022 05:27:17 -0400 Subject: [PATCH 3/3] Merge changelog with changelog for #1056 --- changelogs/client_server/newsfragments/1113.clarification | 1 - changelogs/client_server/newsfragments/1113.feature | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 changelogs/client_server/newsfragments/1113.clarification create mode 100644 changelogs/client_server/newsfragments/1113.feature diff --git a/changelogs/client_server/newsfragments/1113.clarification b/changelogs/client_server/newsfragments/1113.clarification deleted file mode 100644 index 3ccb2333..00000000 --- a/changelogs/client_server/newsfragments/1113.clarification +++ /dev/null @@ -1 +0,0 @@ -Fix various typos throughout the specification. diff --git a/changelogs/client_server/newsfragments/1113.feature b/changelogs/client_server/newsfragments/1113.feature new file mode 100644 index 00000000..2f8febb7 --- /dev/null +++ b/changelogs/client_server/newsfragments/1113.feature @@ -0,0 +1 @@ +Add refresh tokens, per [MSC2918](https://github.com/matrix-org/matrix-spec-proposals/pull/2918).