summary refs log tree commit diff
path: root/synapse/handlers/room.py
diff options
context:
space:
mode:
authorDaniel Wagner-Hall <dawagner@gmail.com>2015-11-10 12:44:17 +0000
committerDaniel Wagner-Hall <dawagner@gmail.com>2015-11-10 12:44:17 +0000
commit82e8a2d7636a589b107b39b990bcd55ca691880e (patch)
tree48e34214aa6ca33ec695440fbcf7145add9b7523 /synapse/handlers/room.py
parentMerge pull request #357 from matrix-org/rav/SYN-516 (diff)
parentGet display name from identity server, not client (diff)
downloadsynapse-82e8a2d7636a589b107b39b990bcd55ca691880e.tar.xz
Merge pull request #356 from matrix-org/daniel/3pidyetagain
Get display name from identity server, not client
Diffstat (limited to 'synapse/handlers/room.py')
-rw-r--r--synapse/handlers/room.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 8cce8d0e99..834972a580 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -582,7 +582,6 @@ class RoomMemberHandler(BaseHandler):
             medium,
             address,
             id_server,
-            display_name,
             token_id,
             txn_id
     ):
@@ -609,7 +608,6 @@ class RoomMemberHandler(BaseHandler):
         else:
             yield self._make_and_store_3pid_invite(
                 id_server,
-                display_name,
                 medium,
                 address,
                 room_id,
@@ -673,7 +671,6 @@ class RoomMemberHandler(BaseHandler):
     def _make_and_store_3pid_invite(
             self,
             id_server,
-            display_name,
             medium,
             address,
             room_id,
@@ -681,7 +678,7 @@ class RoomMemberHandler(BaseHandler):
             token_id,
             txn_id
     ):
-        token, public_key, key_validity_url = (
+        token, public_key, key_validity_url, display_name = (
             yield self._ask_id_server_for_third_party_invite(
                 id_server,
                 medium,
@@ -725,10 +722,11 @@ class RoomMemberHandler(BaseHandler):
         # TODO: Check for success
         token = data["token"]
         public_key = data["public_key"]
+        display_name = data["display_name"]
         key_validity_url = "%s%s/_matrix/identity/api/v1/pubkey/isvalid" % (
             id_server_scheme, id_server,
         )
-        defer.returnValue((token, public_key, key_validity_url))
+        defer.returnValue((token, public_key, key_validity_url, display_name))
 
 
 class RoomListHandler(BaseHandler):