Merge pull request #2124 from matrix-org/travis/fix-id-server-param

Remove incorrect id_server param from IS spec

api/client-server/administrative_contact.yaml

@@ -246,7 +246,7 @@ paths:
           name: body
           required: true
           schema:
-            $ref: "../identity/definitions/request_email_validation.yaml"
+            $ref: "./definitions/request_email_validation.yaml"
       responses:
         200:
           description: |-
@@ -297,7 +297,7 @@ paths:
           name: body
           required: true
           schema:
-            $ref: "../identity/definitions/request_msisdn_validation.yaml"
+            $ref: "./definitions/request_msisdn_validation.yaml"
       responses:
         200:
           description: An SMS message was sent to the given phone number.

api/client-server/definitions/request_email_validation.yaml

@@ -0,0 +1,26 @@
+# Copyright 2019 The Matrix.org Foundation C.I.C.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+type: object
+allOf:
+- $ref: "../../identity/definitions/request_email_validation.yaml"
+- type: object
+  properties:
+    id_server:
+      type: string
+      description: |-
+        The hostname of the identity server to communicate with. May optionally
+        include a port. This parameter is ignored when the homeserver handles
+        3PID verification.
+      example: "id.example.com"
+  required: ["id_server"]

api/client-server/definitions/request_msisdn_validation.yaml

@@ -0,0 +1,26 @@
+# Copyright 2019 The Matrix.org Foundation C.I.C.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+type: object
+allOf:
+- $ref: "../../identity/definitions/request_msisdn_validation.yaml"
+- type: object
+  properties:
+    id_server:
+      type: string
+      description: |-
+        The hostname of the identity server to communicate with. May optionally
+        include a port. This parameter is ignored when the homeserver handles
+        3PID verification.
+      example: "id.example.com"
+  required: ["id_server"]

api/client-server/registration.yaml

@@ -242,7 +242,7 @@ paths:
           name: body
           required: true
           schema:
-            $ref: "../identity/definitions/request_email_validation.yaml"
+            $ref: "./definitions/request_email_validation.yaml"
       responses:
         200:
           description: |-
@@ -295,7 +295,7 @@ paths:
           name: body
           required: true
           schema:
-            $ref: "../identity/definitions/request_msisdn_validation.yaml"
+            $ref: "./definitions/request_msisdn_validation.yaml"
       responses:
         200:
           description: |-
@@ -417,7 +417,7 @@ paths:
           name: body
           required: true
           schema:
-            $ref: "../identity/definitions/request_email_validation.yaml"
+            $ref: "./definitions/request_email_validation.yaml"
       responses:
         200:
           description: An email was sent to the given address.

api/identity/definitions/request_email_validation.yaml

@@ -49,11 +49,4 @@ properties:
       redirect the user to this URL. This option is ignored when submitting
       3PID validation information through a POST request.
     example: "https://example.org/congratulations.html"
-  id_server:
-    type: string
-    description: |-
-      The hostname of the identity server to communicate with. May optionally
-      include a port. This parameter is ignored when the homeserver handles
-      3PID verification.
-    example: "id.example.com"
-required: ["client_secret", "email", "send_attempt", "id_server"]
+required: ["client_secret", "email", "send_attempt"]

api/identity/definitions/request_msisdn_validation.yaml

@@ -55,11 +55,4 @@ properties:
       redirect the user to this URL. This option is ignored when submitting
       3PID validation information through a POST request.
     example: "https://example.org/congratulations.html"
-  id_server:
-    type: string
-    description: |-
-      The hostname of the identity server to communicate with. May optionally
-      include a port. This parameter is ignored when the homeserver handles
-      3PID verification.
-    example: "id.example.com"
-required: ["client_secret", "country", "phone_number", "send_attempt", "id_server"]
+required: ["client_secret", "country", "phone_number", "send_attempt"]

changelogs/identity_service/newsfragments/2124.clarification

@@ -0,0 +1 @@
+Remove incorrect ``id_server`` parameter from ``/requestToken`` endpoints.