Merge 70f6749c92 into 9d063c8d2d

Add m.login.terms to enumeration of authentication types (#2233 )
Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>
2026-03-04 10:44:10 +01:00 · 2025-10-28 19:16:00 -04:00 · 2025-10-28 19:05:59 -04:00 · 2025-10-24 10:19:19 +00:00 · 2025-09-11 02:19:33 +02:00 · 2025-09-11 02:19:33 +02:00
6 changed files with 12 additions and 6 deletions
--- a/changelogs/client_server/newsfragments/2233.clarification
+++ b/changelogs/client_server/newsfragments/2233.clarification
@ -0,0 +1 @@
+Add `m.login.terms` to enumeration of authentication types.
--- a/changelogs/internal/newsfragments/2238.clarification
+++ b/changelogs/internal/newsfragments/2238.clarification
@ -0,0 +1 @@
+Silence failing redocly-cli rule.
--- a/changelogs/server_server/newsfragments/2191.clarification
+++ b/changelogs/server_server/newsfragments/2191.clarification
@ -0,0 +1 @@
+Clarify what the minimum_valid_until_ts field means when it is set in key queries.
--- a/content/client-server-api/_index.md
+++ b/content/client-server-api/_index.md
@ -906,6 +906,7 @@ This specification defines the following auth types:
 -   `m.login.msisdn`
 -   `m.login.dummy`
 -   `m.login.registration_token`
+-   {{% added-in v="1.11" %}} `m.login.terms`

 ###### Password-based

--- a/data/api/server-server/keys_query.yaml
+++ b/data/api/server-server/keys_query.yaml
@ -34,8 +34,8 @@ paths:
        - in: query
          name: minimum_valid_until_ts
          description: |-
-            A millisecond POSIX timestamp in milliseconds indicating when the returned
-            certificates will need to be valid until to be useful to the requesting server.
+            A millisecond POSIX timestamp. The returned keys MUST be valid
+            until at least this timestamp.

            If not supplied, the current time as determined by the notary server is used.
          required: false
@ -98,9 +98,8 @@ paths:
                          type: integer
                          format: int64
                          description: |-
-                            A millisecond POSIX timestamp in milliseconds indicating when
-                            the returned certificates will need to be valid until to be
-                            useful to the requesting server.
+                            A millisecond POSIX timestamp. The returned keys
+                            MUST be valid until at least this timestamp.

                            If not supplied, the current time as determined by the notary
                            server is used.
--- a/redocly.yaml
+++ b/redocly.yaml
@ -8,4 +8,7 @@ rules:
  no-invalid-media-type-examples: off
  no-path-trailing-slash: off
  operation-2xx-response: off
-  spec-strict-refs: error
+  spec-strict-refs: error
+  # $ref in examples are not spec-compliant, yet we find them useful. Disable this rule
+  # and instead check example schema using `check-event-schema-examples.py`
+  no-invalid-schema-examples: off
Author	SHA1	Message	Date
famfo	b38427ca40	Merge `70f6749c92` into `9d063c8d2d`	2025-10-28 19:16:00 -04:00
Johannes Marbach	9d063c8d2d	Add m.login.terms to enumeration of authentication types (#2233 ) Some checks are pending Spec / 🔎 Validate OpenAPI specifications (push) Waiting to run Details Spec / 🔎 Check Event schema examples (push) Waiting to run Details Spec / 🔎 Check OpenAPI definitions examples (push) Waiting to run Details Spec / 🔎 Check JSON Schemas inline examples (push) Waiting to run Details Spec / ⚙️ Calculate baseURL for later jobs (push) Waiting to run Details Spec / 🐍 Build OpenAPI definitions (push) Blocked by required conditions Details Spec / 📢 Run towncrier for changelog (push) Waiting to run Details Spec / 📖 Build the spec (push) Blocked by required conditions Details Spec / 🔎 Validate generated HTML (push) Blocked by required conditions Details Spec / 📖 Build the historical backup spec (push) Blocked by required conditions Details Spell Check / Spell Check with Typos (push) Waiting to run Details Signed-off-by: Johannes Marbach <n0-0ne+github@mailbox.org>	2025-10-28 19:05:59 -04:00
Kévin Commaille	74a0d5f289	Silence redocly-cli rule checking examples (#2238 ) Some checks failed Spec / 🔎 Validate OpenAPI specifications (push) Has been cancelled Details Spec / 🔎 Check Event schema examples (push) Has been cancelled Details Spec / 🔎 Check OpenAPI definitions examples (push) Has been cancelled Details Spec / 🔎 Check JSON Schemas inline examples (push) Has been cancelled Details Spec / ⚙️ Calculate baseURL for later jobs (push) Has been cancelled Details Spec / 📢 Run towncrier for changelog (push) Has been cancelled Details Spell Check / Spell Check with Typos (push) Has been cancelled Details Spec / 🐍 Build OpenAPI definitions (push) Has been cancelled Details Spec / 📖 Build the spec (push) Has been cancelled Details Spec / 🔎 Validate generated HTML (push) Has been cancelled Details Spec / 📖 Build the historical backup spec (push) Has been cancelled Details Co-authored-by: Andrew Morgan <1342360+anoadragon453@users.noreply.github.com>	2025-10-24 10:19:19 +00:00
famfo	70f6749c92	changelogs/s2s: add minimum_valid_until_ts clarification	2025-09-11 02:19:33 +02:00
famfo	1583a12cec	s2s/keys: clarify minimum_valid_until_ts query Signed-off-by: famfo <famfo@famfo.xyz>	2025-09-11 02:19:33 +02:00
				`@ -0,0 +1 @@`
				Add `m.login.terms` to enumeration of authentication types.
				`@ -0,0 +1 @@`
				`Clarify what the minimum_valid_until_ts field means when it is set in key queries.`