Make context.auth_events grap auth events from current state. Otherwise auth is wrong.

1 files changed, 7 insertions, 1 deletions

diff --git a/synapse/api/auth.py b/synapse/api/auth.py

index 96963d7434..4873cf9d1f 100644
--- a/synapse/api/auth.py
+++ b/synapse/api/auth.py
@@ -28,6 +28,12 @@ import logging
 logger = logging.getLogger(__name__)
 
 
+AuthEventTypes = (
+    EventTypes.Create, EventTypes.Member, EventTypes.PowerLevels,
+    EventTypes.JoinRules,
+)
+
+
 class Auth(object):
 
     def __init__(self, hs):
@@ -427,7 +433,7 @@ class Auth(object):
         context.auth_events = {
             k: v
             for k, v in context.current_state.items()
-            if v.event_id in auth_ids
+            if v.type in AuthEventTypes
         }
 
     def compute_auth_events(self, event, current_state):