- Clear caches before sending group user added/removed events

zopefoundation · Aug 20, 2020 · b5d2b8f · b5d2b8f
1 parent e2b89f1
commit b5d2b8f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,6 +4,10 @@ Change Log
 2.5 (unreleased)
 ----------------
 
+- Clear caches before sending group user added/removed events
+  (`#71
+   <https://github.com/zopefoundation/Products.PluggableAuthService/issues/71>`_)
+
 - Prevent creation of users/groups/roles with empty ID in the ZODB
   (`#70
    <https://github.com/zopefoundation/Products.PluggableAuthService/issues/70>`_)

diff --git a/Products/PluggableAuthService/plugins/ZODBGroupManager.py b/Products/PluggableAuthService/plugins/ZODBGroupManager.py
@@ -274,8 +274,8 @@ def addPrincipalToGroup(self, principal_id, group_id):
         if not already:
             new = current + (group_id,)
             self._principal_groups[principal_id] = new
-            notify(PrincipalAddedToGroup(principal_id, group_id))
             self._invalidatePrincipalCache(principal_id)
+            notify(PrincipalAddedToGroup(principal_id, group_id))
 
         return not already
 
@@ -301,8 +301,8 @@ def removePrincipalFromGroup(self, principal_id, group_id):
 
         if already:
             self._principal_groups[principal_id] = new
-            notify(PrincipalRemovedFromGroup(principal_id, group_id))
             self._invalidatePrincipalCache(principal_id)
+            notify(PrincipalRemovedFromGroup(principal_id, group_id))
 
         return already