| Value | Description |
authorization_expired | The Device Authorization Grant expired |
device_already_exists | The device ID specified by the new client already exists in the Homeserver provided device list |
device_not_found | The new device is not present in the device list as returned by the Homeserver |
unexpected_message_received | Sent by either device to indicate that they received a message of a type that they weren't expecting |
unsupported_protocol | Sent by a device where no suitable protocol is available or the requested protocol requested is not supported |
user_cancelled | Sent by either new or existing device to indicate that the user has cancelled the login |
|
-|`homeserver`|`string`| When the existing device is sending this it can include the Base URL of the homeserver so that the new device can at least save the user the hassle of typing it in|
+|`homeserver`|`string`| When the existing device is sending this it can include the [server name](https://spec.matrix.org/v1.10/appendices/#server-name) of the Matrix homeserver so that the new device can at least save the user the hassle of typing it in|
Example:
@@ -1308,7 +1312,7 @@ Example:
{
"type":"m.login.failure",
"reason": "unsupported_protocol",
- "homeserver": "https://matrix-client.matrix.org"
+ "homeserver": "matrix.org"
}
```
@@ -1404,9 +1408,9 @@ The QR codes to be displayed and scanned using this format will encode binary st
- two bytes in network byte order (big-endian) indicating the length in bytes of the rendezvous session URL as a UTF-8
string
- the rendezvous session URL as a UTF-8 string
-- If the QR code intent/mode is `0x04` then the homeserver base URL encode as:
- - two bytes in network byte order (big-endian) indicating the length in bytes of the homeserver base URL as a UTF-8 string
- - the homeserver base URL as a UTF-8 string
+- If the QR code intent/mode is `0x04` then the [server name](https://spec.matrix.org/v1.10/appendices/#server-name) of the homeserver encoded as:
+ - two bytes in network byte order (big-endian) indicating the length in bytes of the server name as a UTF-8 string
+ - the server name as a UTF-8 string
For example, if Alice displays a QR code encoding the following binary string:
@@ -1434,15 +1438,15 @@ Which looks as follows as a QR with error correction level Q:
A full example for an existing device using ephemeral public key `2IZoarIZe3gOMAqdSiFHSAcA15KfOasxueUUNwJI7Ws` (base64
encoded), at rendezvous session `https://rendezvous.lab.element.dev/e8da6355-550b-4a32-a193-1619d9830668` on homeserver
-`https://matrix-client.matrix.org` is as follows: (Whitespace is for readability only)
+`matrix.org` is as follows: (Whitespace is for readability only)
```
4D 41 54 52 49 58 02 04
d8 86 68 6a b2 19 7b 78 0e 30 0a 9d 4a 21 47 48 07 00 d7 92 9f 39 ab 31 b9 e5 14 37 02 48 ed 6b
00 47
68 74 74 70 73 3a 2f 2f 72 65 6e 64 65 7a 76 6f 75 73 2e 6c 61 62 2e 65 6c 65 6d 65 6e 74 2e 64 65 76 2f 65 38 64 61 36 33 35 35 2d 35 35 30 62 2d 34 61 33 32 2d 61 31 39 33 2d 31 36 31 39 64 39 38 33 30 36 36 38
-00 20
-68 74 74 70 73 3a 2f 2f 6d 61 74 72 69 78 2d 63 6c 69 65 6e 74 2e 6d 61 74 72 69 78 2e 6f 72 67
+00 0A
+6d 61 74 72 69 78 2e 6f 72 67
```
Which looks as follows as a QR with error correction level Q:
diff --git a/proposals/images/4108-qr-mode04.png b/proposals/images/4108-qr-mode04.png
index 68dc9c93b..b01ee1e36 100644
Binary files a/proposals/images/4108-qr-mode04.png and b/proposals/images/4108-qr-mode04.png differ