Use the v2 Identity Service API for lookups (MSC2134 + MSC2140) (#5976)

1 files changed, 3 insertions, 1 deletions

diff --git a/synapse/handlers/room.py b/synapse/handlers/room.py
index 6bfd9f1231..3e815d7d46 100644
--- a/synapse/handlers/room.py
+++ b/synapse/handlers/room.py
@@ -596,8 +596,8 @@ class RoomCreationHandler(BaseHandler):
 
         room_id = yield self._generate_room_id(creator_id=user_id, is_public=is_public)
 
+        directory_handler = self.hs.get_handlers().directory_handler
         if room_alias:
-            directory_handler = self.hs.get_handlers().directory_handler
             yield directory_handler.create_association(
                 requester=requester,
                 room_id=room_id,
@@ -683,6 +683,7 @@ class RoomCreationHandler(BaseHandler):
 
         for invite_3pid in invite_3pid_list:
             id_server = invite_3pid["id_server"]
+            id_access_token = invite_3pid.get("id_access_token")  # optional
             address = invite_3pid["address"]
             medium = invite_3pid["medium"]
             yield self.hs.get_room_member_handler().do_3pid_invite(
@@ -694,6 +695,7 @@ class RoomCreationHandler(BaseHandler):
                 requester,
                 txn_id=None,
                 new_room=True,
+                id_access_token=id_access_token,
             )
 
         result = {"room_id": room_id}