[fix] Invalidate org membership cache when organization is_active flag is changed #357

openwisp_users/apps.py

@@ -98,11 +98,18 @@ def set_default_settings(self):
     def connect_receivers(self):
         OrganizationUser = load_model('openwisp_users', 'OrganizationUser')
         OrganizationOwner = load_model('openwisp_users', 'OrganizationOwner')
+        Organization = load_model('openwisp_users', 'Organization')
         signal_tuples = [
             (post_save, 'post_save'),
             (post_delete, 'post_delete'),
         ]
 
+        pre_save.connect(
+            self.handle_organization_update,
+            sender=Organization,
+            dispatch_uid='handle_organization_is_active_change',
+        )
+
         for model in [OrganizationUser, OrganizationOwner]:
             for signal, name in signal_tuples:
                 signal.connect(
@@ -130,6 +137,17 @@ def connect_receivers(self):
             dispatch_uid='make_first_org_user_org_owner',
         )
 
+    @classmethod
+    def handle_organization_update(cls, instance, **kwargs):
+        try:
+            old_instance = instance._meta.model.objects.get(pk=instance.pk)
+        except instance._meta.model.DoesNotExist:
+            return
+        from .tasks import organization_update_task
+
+        if instance.is_active != old_instance.is_active:
+            organization_update_task.delay(instance.pk)
+
     @classmethod
     def pre_save_update_organizations_dict(cls, instance, **kwargs):
         """

openwisp_users/tasks.py

@@ -12,6 +12,7 @@
 from django.utils.timezone import now, timedelta
 from django.utils.translation import gettext_lazy as _
 from openwisp_utils.admin_theme.email import send_email
+from swapper import load_model
 
 from . import settings as app_settings
 
@@ -83,3 +84,19 @@ def password_expiration_email():
             sleep(random.randint(1, 2))
         else:
             email_counts += 1
+
+
+@shared_task
+def organization_update_task(organization_pk):
+    """
+    Invalidates cache of users when organization become inactive
+    """
+    OrganizationUsers = load_model('openwisp_users', 'OrganizationUser')
+    qs = OrganizationUsers.objects.filter(
+        organization_id=organization_pk
+    ).select_related('user')
+    User = get_user_model()
+    for user in qs.iterator():
+        if not isinstance(user, User):
+            user = user.user
+        user._invalidate_user_organizations_dict()

openwisp_users/tests/test_models.py

@@ -185,6 +185,16 @@ def test_invalidate_cache_org_user_user_changed(self):
         self.assertEqual(user1.is_member(org), False)
         self.assertEqual(user2.is_member(org), True)
 
+    def test_invalidate_cache_org_status_changed(self):
+        org = self._create_org(name='testorg1')
+        user1 = self._create_user(username='testuser1', email='[email protected]')
+        self._create_org_user(user=user1, organization=org)
+        self.assertEqual(user1.is_member(org), True)
+        org.is_active = False
+        org.full_clean()
+        org.save()
+        self.assertEqual(user1.is_member(org), False)
+
     def test_organizations_managed(self):
         user = self._create_user(username='organizations_pk')
         self.assertEqual(user.organizations_managed, [])