From 525bedf8e14327556153d19933efcd488fa61017 Mon Sep 17 00:00:00 2001
From: Andrew Morgan <andrew@amorgan.xyz>
Date: Sun, 9 Jun 2019 20:10:44 +0100
Subject: [PATCH] Fix refs

---
 api/client-server/administrative_contact.yaml |  6 ++++--
 api/client-server/registration.yaml           | 12 ++++++++----
 api/identity/definitions/sid.yaml             | 14 --------------
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/api/client-server/administrative_contact.yaml b/api/client-server/administrative_contact.yaml
index d26e5a960..c19872e88 100644
--- a/api/client-server/administrative_contact.yaml
+++ b/api/client-server/administrative_contact.yaml
@@ -261,7 +261,8 @@ paths:
             Note that this may be an email containing the validation token or
             it may be informing the user of an error.
           schema:
-            - $ref: "../identity/definitions/sid.yaml"
+            type: object
+            $ref: "definitions/sid.yaml"
         403:
           description: |-
             The homeserver does not allow the third party identifier as a
@@ -318,7 +319,8 @@ paths:
           description: |-
             A SMS message was sent to the given phone number.
           schema:
-            - $ref: "../identity/definitions/sid.yaml"
+            type: object
+            $ref: "definitions/sid.yaml"
         403:
           description: |-
             The homeserver does not allow the third party identifier as a
diff --git a/api/client-server/registration.yaml b/api/client-server/registration.yaml
index a2a0d47fc..4ea8b2521 100644
--- a/api/client-server/registration.yaml
+++ b/api/client-server/registration.yaml
@@ -241,7 +241,8 @@ paths:
             Note that this may be an email containing the validation token or it may be informing
             the user of an error.
           schema:
-            - $ref: "../identity/definitions/sid.yaml"
+            type: object
+            $ref: "definitions/sid.yaml"
         403:
           description: The homeserver does not permit the address to be bound.
           schema:
@@ -304,7 +305,8 @@ paths:
             that this may be an SMS message containing the validation token or
             it may be informing the user of an error.
           schema:
-            - $ref: "../identity/definitions/sid.yaml"
+            type: object
+            $ref: "definitions/sid.yaml"
         403:
           description: The homeserver does not permit the address to be bound.
           schema:
@@ -433,7 +435,8 @@ paths:
         200:
           description: An email was sent to the given address.
           schema:
-            - $ref: "../identity/definitions/sid.yaml"
+            type: object
+            $ref: "definitions/sid.yaml"
         403:
           description: |-
             The homeserver does not allow the third party identifier as a
@@ -503,7 +506,8 @@ paths:
         200:
           description: A SMS message was sent to the given phone number.
           schema:
-            - $ref: "../identity/definitions/sid.yaml"
+            type: object
+            $ref: "definitions/sid.yaml"
         403:
           description: |-
             The homeserver does not allow the third party identifier as a
diff --git a/api/identity/definitions/sid.yaml b/api/identity/definitions/sid.yaml
index c09ed3952..c1f1ae646 100644
--- a/api/identity/definitions/sid.yaml
+++ b/api/identity/definitions/sid.yaml
@@ -21,18 +21,4 @@ properties:
       ``[0-9a-zA-Z.=_-]``. Their length must not exceed 255 characters and they
       must not be empty.
     example: "123abc"
-  submit_url:
-    type: string
-    description: |-
-      An optional field containing a URL where the client must
-      submit the validation token to, with identical parameters
-      to the Identity Service API's
-      ``/validate/email/submitToken`` endpoint. The homeserver
-      must send this token to the user (if applicable), which
-      should then be prompted to provide it to the client.
-
-      If this field is not present, the client can assume that
-      verification will happen without the client's
-      involvement.
-    example: "https://example.org/path/to/submitToken"
 required: ['sid']