Merge 70f6749c92 into d968774fb7

Missing quotation marks: Fix JSON formatting in application-service-api.md (#2213 )
changelogs/s2s: add minimum_valid_until_ts clarification
2026-04-21 10:24:08 +02:00 · 2025-09-24 10:27:08 +01:00 · 2025-09-23 15:49:27 +00:00 · 2025-09-11 02:19:33 +02:00 · 2025-09-11 02:19:33 +02:00
4 changed files with 9 additions and 8 deletions
--- a/changelogs/application_service/newsfragments/2213.clarification
+++ b/changelogs/application_service/newsfragments/2213.clarification
@ -0,0 +1 @@
+Fix JSON formatting in the "Server admin style permissions" examples.
--- 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/application-service-api.md
+++ b/content/application-service-api.md
@ -438,8 +438,8 @@ user ID without a password.

    Content:
    {
-      type: "m.login.application_service",
-      username: "_irc_example"
+      "type": "m.login.application_service",
+      "username": "_irc_example"
    }

 Similarly, logging in as users needs API changes in order to allow the AS to
@ -454,7 +454,7 @@ log in without needing the user's password. This is achieved by including the

    Content:
    {
-      type: "m.login.application_service",
+      "type": "m.login.application_service",
      "identifier": {
        "type": "m.id.user",
        "user": "_irc_example"
--- 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.
Author	SHA1	Message	Date
famfo	6787439e11	Merge `70f6749c92` into `d968774fb7`	2025-09-24 10:27:08 +01:00
Christian Paul	d968774fb7	Missing quotation marks: Fix JSON formatting in application-service-api.md (#2213 ) 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	2025-09-23 15:49:27 +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 @@`
				`Fix JSON formatting in the "Server admin style permissions" examples.`
				`@ -0,0 +1 @@`
				`Clarify what the minimum_valid_until_ts field means when it is set in key queries.`