Fix check of the association between a 3PID invite and the subsequent m.room.member event in the 3rd party rules

1 files changed, 7 insertions, 1 deletions

diff --git a/synapse/third_party_rules/access_rules.py b/synapse/third_party_rules/access_rules.py

index c8698c66cc..521b0347a4 100644
--- a/synapse/third_party_rules/access_rules.py
+++ b/synapse/third_party_rules/access_rules.py
@@ -454,5 +454,11 @@ class RoomAccessRules(object):
              invite (EventBase): The m.room.member event with "invite" membership.
              threepid_invite_token (str): The state key from the 3PID invite.
         """
-        token = invite.content.get("third_party_signed", {}).get("token", "")
+        if "third_party_signed" in invite.content:
+            token = invite.content.get("third_party_signed", {}).get("token", "")
+        else:
+            token = invite.content.get(
+                "third_party_invite", {},
+            ).get("signed", {}).get("token", "")
+
         return token == threepid_invite_token