wholetrans/docs-matrix-spec
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #114 from matrix-org/daniel/3pidtosigned

Browse source 
Update 3pid invite section to reflect signed property
This commit is contained in:
Daniel Wagner-Hall 2015-10-19 15:52:50 +01:00
commit a9a9067d7e
3 changed files with 35 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
event-schemas/examples/v1/m.room.member
View file

@ -8,7 +8,15 @@
"token": "pc98",
"public_key": "abc123",
"key_validity_url": "https://magic.forest/verifykey",
"signature": "q1w2e3",
"signed": {
"mxid": "@alice:localhost",
"token": "pc98",
"signatures": {
"magic.forest": {
"ed25519:0": "poi098"
}
}
},
"sender": "@zun:zun.soft"
}
},

24
event-schemas/schema/v1/m.room.member
View file

@ -38,16 +38,32 @@
"type": "string",
"description": "A base64-encoded ed25519 key with which token must be signed."
},
"signature": {
"type": "string",
"description": "A base64-encoded signature of token with public_key."
"signed": {
"type": "object",
"title": "signed",
"properties": {
"mxid": {
"type": "string",
"description": "The invited matrix user ID. Must be equal to the user_id property of the event."
},
"token": {
"type": "string",
"description": "The token property of the containing third_party_invite object."
},
"signatures": {
"type": "object",
"description": "A single signature from the verifying server, in the format specified by the Signing Events section.",
"title": "Signatures"
}
},
"required": ["mxid", "signatures", "token"]
},
"sender": {
"type": "string",
"description": "The matrix user ID of the user who send the invite which is being used."
}
},
"required": ["token", "key_validity_url", "public_key", "signature", "sender"]
"required": ["token", "key_validity_url", "public_key", "sender", "signed"]
}
},
"required": ["membership"]