simo 2.5.21__py3-none-any.whl → 2.5.23__py3-none-any.whl

simo/settings.py

@@ -207,7 +207,8 @@ CACHES = {
         "LOCATION": "redis://127.0.0.1:6379/%d" % REDIS_DB['default_cache'],
         "OPTIONS": {
             "CLIENT_CLASS": "django_redis.client.DefaultClient",
-        }
+        },
+        "TIMEOUT": 300
     },
 }
 

simo/users/admin.py

@@ -4,6 +4,7 @@ from django.utils.safestring import mark_safe
 from django.contrib import messages
 from django.contrib.auth.admin import UserAdmin as OrgUserAdmin
 from django.contrib import admin
+from simo.core.middleware import get_current_instance
 from .models import (
     PermissionsRole, ComponentPermission, User, UserDevice, UserDeviceReportLog,
     InstanceInvitation, InstanceUser, Fingerprint
@@ -58,6 +59,10 @@ class InstanceUserAdmin(admin.ModelAdmin):
         'at_home', 'last_seen', 'last_seen_speed_kmh', 'phone_on_charge',
     )
 
+    def get_queryset(self, request):
+        instance = get_current_instance()
+        return super().get_queryset(request).filter(instance=instance)
+
 
 class InstanceUserInline(admin.TabularInline):
     model = InstanceUser

simo/users/api.py

@@ -204,10 +204,10 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
         if request.META.get('HTTP_HOST', '').endswith('.simo.io'):
             relay = request.META.get('HTTP_HOST')
 
-
+        last_seen_location = None
         user_device.last_seen = timezone.now()
         if location:
-            user_device.last_seen_location = ','.join(
+            last_seen_location = ','.join(
                 [str(i) for i in location]
             ) if location else None
 
@@ -218,24 +218,24 @@ class UserDeviceReport(InstanceMixin, viewsets.GenericViewSet):
             ).exclude(id=user_device.id).update(is_primary=False)
         user_device.save()
 
+        phone_on_charge = False
+        if request.data.get('is_charging'):
+            phone_on_charge = True
         speed_kmh = request.data.get('speed', 0) * 3.6
         for iu in request.user.instance_roles.filter(is_active=True):
             if location:
                 iu.at_home = haversine_distance(
-                    iu.instance.location, user_device.last_seen_location
+                    iu.instance.location, last_seen_location
                 ) < dynamic_settings['users__at_home_radius']
             elif not relay:
                 iu.at_home = True
 
             iu.last_seen = user_device.last_seen
-            iu.last_seen_location = user_device.last_seen_location
+            iu.last_seen_location = last_seen_location
             iu.last_seen_speed_kmh = speed_kmh
-            iu.phone_on_charge = request.data.get('is_charging', False)
+            iu.phone_on_charge = phone_on_charge
             iu.save()
 
-        phone_on_charge = False
-        if request.data.get('is_charging'):
-            phone_on_charge = True
         UserDeviceReportLog.objects.create(
             user_device=user_device, instance=self.instance,
             app_open=request.data.get('app_open', False),

simo/users/auth_backends.py

@@ -99,6 +99,10 @@ class SSOBackend(ModelBackend):
                 user=user, instance=invitation.instance,
                 defaults={'role': invitation.role}
             )
+            user.is_active = True
+
+        if not user.is_active:
+            return
 
         if user_data.get('name'):
             user.name = user_data['name']
@@ -109,6 +113,7 @@ class SSOBackend(ModelBackend):
             user.avatar.save(
                 os.path.basename(user.avatar_url), io.BytesIO(resp.content)
             )
-        user.save()
+        if user.get_dirty_fields():
+            user.save()
 
         return user

simo/users/managers.py

@@ -6,7 +6,4 @@ class ActiveInstanceManager(models.Manager):
 
     def get_queryset(self):
         qs = super().get_queryset()
-        instance = get_current_instance()
-        if instance:
-            return qs.filter(instance=instance)
-        return qs
+        return qs.filter(instance__is_active=True)

simo/users/models.py

@@ -154,7 +154,7 @@ def post_instance_user_save(sender, instance, created, **kwargs):
         dynamic_settings['core__needs_mqtt_acls_rebuild'] = True
 
 
-class User(AbstractBaseUser, SimoAdminMixin):
+class User(DirtyFieldsMixin, AbstractBaseUser, SimoAdminMixin):
     name = models.CharField(_('name'), max_length=150)
     email = models.EmailField(_('email address'), unique=True)
     avatar = ThumbnailerImageField(
@@ -294,7 +294,7 @@ class User(AbstractBaseUser, SimoAdminMixin):
             else:
                 instances = Instance.objects.filter(id__in=[
                     r.instance.id for r in self.instance_roles.filter(
-                        is_active=True, instance__isnull=False
+                        is_active=True
                     )
                 ], is_active=True)
             cache.set(cache_key, instances, 10)
@@ -306,26 +306,30 @@ class User(AbstractBaseUser, SimoAdminMixin):
             role__in=self.roles.all()
         )
 
+
     @property
     def is_active(self):
-        instance = get_current_instance()
-        if not instance:
-            cache_key = f'user-{self.id}_is_active'
-        else:
-            cache_key = f'user-{self.id}_is_active_instance-{instance.id}'
+        cache_key = f'user-{self.id}_is_active'
         cached_value = cache.get(cache_key)
         if cached_value is None:
-            if self.is_master and not self.instance_roles.all():
-                # Master who have no roles on any instance are in GOD mode!
-                # It can not be disabled by anybody, nor it is seen by anybody. :)
-                cached_value = True
-            elif instance:
-                cached_value = bool(
-                    self.instance_roles.filter(
-                        instance=instance, is_active=True
-                    ).first()
-                )
+            if self.is_master:
+                if not self.instance_roles.all().count():
+                    # Master who have no roles on any instance are in GOD mode!
+                    # It can not be disabled by anybody, nor it is seen by anybody. :)
+                    cached_value = True
+                else:
+                    # Masters who have roles on instances but are all disabled
+                    # on all instances are then fully disabled
+                    # Common scenario is - installer made smart home installation
+                    # owner disabled installer once everything is done, so that
+                    # installer no longer has any access to his home, however
+                    # home owner can enable back installer at any time so that
+                    # he could make any additional necessary changes.
+                    cached_value = bool(
+                        self.instance_roles.filter(is_active=True).count()
+                    )
             else:
+                # user is considered active if he is active on at least one instance
                 cached_value = bool(
                     self.instance_roles.filter(is_active=True).count()
                 )

{simo-2.5.21.dist-info → simo-2.5.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 2.5.21
+Version: 2.5.23
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io

{simo-2.5.21.dist-info → simo-2.5.23.dist-info}/RECORD

@@ -2,13 +2,13 @@ simo/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 simo/asgi.py,sha256=L8CUVZLM32IMzWDZ4IShdDN-m69t7oxAUeHods4-xNM,822
 simo/celeryc.py,sha256=eab7_e9rw0c__DCeoUFUh_tjAGVlulxVrk75BaJf57Q,1512
 simo/conf.py,sha256=H2BhXAV8MEDVXF8AbkaLSfR4ULd-9_bS4bnhE5sE5fg,112
-simo/settings.py,sha256=BcirAAKau1KiJ5qKTD0ni8hTk3jHAASBcUCBNZPGNCk,6962
+simo/settings.py,sha256=tB7rqHA1QHyb4c_nNNnGD_JkqCWmz7XbS_N3Qq5YacY,6986
 simo/urls.py,sha256=fRmAsNQ_pzFloimLmxNeDcR6hHRJ3rOoZ3kGy8zOQ_A,2402
 simo/__pycache__/__init__.cpython-38.pyc,sha256=j81de0BqHMr6bs0C7cuYrXl7HwtK_vv8hDEtAdSwDJc,153
 simo/__pycache__/asgi.cpython-38.pyc,sha256=5W_YSKOIrRd6NQQuJDuA3Yuj688GzirXVVOyLe8wJIQ,845
 simo/__pycache__/celeryc.cpython-38.pyc,sha256=eSRoaKwfYlxVaxAiwqpQ2ndEcx7W-VpZtbxRFSV8UYg,1653
 simo/__pycache__/conf.cpython-38.pyc,sha256=MYP2yk3ULxiYwZsZR6tCLjKnU-z03A3avzQzIn66y3k,273
-simo/__pycache__/settings.cpython-38.pyc,sha256=Mi9iweMgAZ16ppKmiK0eFSDYsrY6XRHFpXXHK8is-Pc,6110
+simo/__pycache__/settings.cpython-38.pyc,sha256=KxcUZqNnr1y6QxvcBLoLm_sk-vwbLsJHPvSD6XadAMs,6128
 simo/__pycache__/urls.cpython-38.pyc,sha256=u0x6EqT8S1YfDOSPgbI8Kf-RDlveY9OV-EDXMYKAQ7w,2125
 simo/__pycache__/wsgi.cpython-38.pyc,sha256=TpRxO7VM_ql31hbKphVdanydC5RI1nHB4l0QA2pdWxo,322
 simo/backups/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -10442,15 +10442,15 @@ simo/notifications/migrations/__pycache__/0002_notification_instance.cpython-38.
 simo/notifications/migrations/__pycache__/0003_alter_notification_instance.cpython-38.pyc,sha256=awhD1F9RyK_706zVNM5io3WT_konFkKQgL7D5MkONwk,851
 simo/notifications/migrations/__pycache__/__init__.cpython-38.pyc,sha256=YMBRHVon2nWDtIUbghckjnC12sIg_ykPWhV5aM0tto4,178
 simo/users/__init__.py,sha256=6a7uBpCWB_DR7p54rbHusc0xvi1qfT1ZCCQGb6TiBh8,52
-simo/users/admin.py,sha256=WDRJJtEkbYBQFtLg_5VOIlBV0eeJhgmrsFL51ttme0w,6760
-simo/users/api.py,sha256=wMX7zknPSgEe4Rd-N6313SVFrx7QMwZXKZ1lX3qtMjI,12153
+simo/users/admin.py,sha256=9P0iIGAep2R1AUvZnROsRULbxwCYK9pCfSJ2X4aLLBg,6965
+simo/users/api.py,sha256=xe__HFxzOaKgrh75PFpP4nkSs5DvmJp8QvMDNhP5kLU,12127
 simo/users/apps.py,sha256=cq0A8-U1HALEwev0TicgFhr4CAu7Icz8rwq0HfOaL4E,207
-simo/users/auth_backends.py,sha256=1gy1-R1U8AOixJ3Ou2LTILjKOHTUxavm_zDiQtCAA9Q,4040
+simo/users/auth_backends.py,sha256=EErYrGti3TIlYH9Bxj0UFs5EKsbYMV4FP4wGfpdHtts,4165
 simo/users/auto_urls.py,sha256=lcJvteBsbHQMJieZpDz-63tDYejLApqsW3CUnDakd7k,272
 simo/users/dynamic_settings.py,sha256=sEIsi4yJw3kH46Jq_aOkSuK7QTfQACGUE-lkyBogCaM,570
-simo/users/managers.py,sha256=Dm21Avmu38-h8MsZ5ljtpgKihMGUBU4hHGpiPvp4NtM,323
+simo/users/managers.py,sha256=OHgEP85MBtdkdYxdstBd8RavTBT8F_2WyDxUJ9aCqqM,246
 simo/users/middleware.py,sha256=GMCrnWSc_2qCleyQIkfQGdL-pU-UTEcSg1wPvIKZ9uk,1210
-simo/users/models.py,sha256=rWjhWDh7PdUTHIg8E7zZHeArxNCHdcrA4RwHkCaZgV0,18973
+simo/users/models.py,sha256=KcIanqB8xvgvTO_jAUJpoN6JSRJha_DhIDSs4lniFXA,19402
 simo/users/permissions.py,sha256=IwtYS8yQdupWbYKR9VimSRDV3qCJ2jXP57Lyjpb2EQM,242
 simo/users/serializers.py,sha256=zzw1KONTnaTNBaU0r4rNVxJ827KzD6Z5LuQt27ZsQ98,2516
 simo/users/sso_urls.py,sha256=gQOaPvGMYFD0NCVSwyoWO-mTEHe5j9sbzV_RK7kdvp0,251
@@ -10459,15 +10459,15 @@ simo/users/tasks.py,sha256=HJAqiyWGsaN3wSfquU0UyQ20jL-njXeaaTOdDT3TQ3s,979
 simo/users/utils.py,sha256=1HGSZyHRqQvdJ4RtAiZDg1juvgG8aOlrGXR7CcvsyQc,1886
 simo/users/views.py,sha256=dOQVvmlHG7ihWKJLFUBcqKOA0UDctlMKR0pTc36JZqg,3487
 simo/users/__pycache__/__init__.cpython-38.pyc,sha256=VFoDJE_SKKaPqqYaaBYd1Ndb1hjakkTo_u0EG_XJ1GM,211
-simo/users/__pycache__/admin.cpython-38.pyc,sha256=5LEDivt0AydPmqk9PCKvlKRRtc3QBxA6hZgcy_8bEQU,7680
-simo/users/__pycache__/api.cpython-38.pyc,sha256=2BBBoY8SwvTTL6-bCGjY-Dm8ao5NHRGyJ8WB7EPR9cw,10223
+simo/users/__pycache__/admin.cpython-38.pyc,sha256=xZ_PgvobRrbqSuNgR2z2ZNm1Ec7MlvswLp7wiUxw5KQ,7937
+simo/users/__pycache__/api.cpython-38.pyc,sha256=laiJ17ZN-Bj8fL-AjKpcjPm0hOVEd83vYkOqxfmHa7c,10218
 simo/users/__pycache__/apps.cpython-38.pyc,sha256=dgbWL8CxzzISJQTmq_4IztPJ2UzykNVdqA2Ae1PmeGk,605
 simo/users/__pycache__/auth_backends.cpython-38.pyc,sha256=n5nx2QSXNj2idzRcGE6bAagMN-8qxoCs580H1EFZXls,3105
 simo/users/__pycache__/auto_urls.cpython-38.pyc,sha256=K-3sz2h-cEitoflSmZk1t0eUg5mQMMGLNZFREVwG7_o,430
 simo/users/__pycache__/dynamic_settings.cpython-38.pyc,sha256=6F8JBjZkHykySnmZjNEzjS0ijbmPdcp9yUAZ5kqq_Fo,864
-simo/users/__pycache__/managers.cpython-38.pyc,sha256=oAy5mRBI-FQWgx9xgQsHmCiknKqojuVY363mfEVK0i8,697
+simo/users/__pycache__/managers.cpython-38.pyc,sha256=O0Y8ABp42RAosrbODmYsPMaj9AyOPyJ-aqzuO0Qpi2s,679
 simo/users/__pycache__/middleware.cpython-38.pyc,sha256=Tj4nVEAvxEW3xA63fBRiJWRJpz_M848ZOqbHioc_IPE,1149
-simo/users/__pycache__/models.cpython-38.pyc,sha256=LJqRXBisLbNPzXU19iIZ81Zd6DQQGi-5woHjQlXvdXM,17578
+simo/users/__pycache__/models.cpython-38.pyc,sha256=RDZ7bjfjTQV0rJxEVM8dfaxD5oKmoOWViAtIPpQmNQg,17472
 simo/users/__pycache__/permissions.cpython-38.pyc,sha256=ez5NxoL_JUeeH6GsKhvFreuA3FCBgGf9floSypdXUtM,633
 simo/users/__pycache__/serializers.cpython-38.pyc,sha256=Dy8RAcwNkNSXoJHvLp8fozURyHCtucqpSPyqZtbnMZc,3732
 simo/users/__pycache__/sso_urls.cpython-38.pyc,sha256=uAwDozpOmrhUald-8tOHANILXkH7-TI8fNYXOtPkSY8,402
@@ -10561,9 +10561,9 @@ simo/users/templates/invitations/expired_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCe
 simo/users/templates/invitations/expired_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_msg.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 simo/users/templates/invitations/taken_suggestion.html,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-simo-2.5.21.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
-simo-2.5.21.dist-info/METADATA,sha256=kpfxTB9swlXMBR86cbL_O3uyNJIOU0IB_1hn-RixSvA,1924
-simo-2.5.21.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-simo-2.5.21.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
-simo-2.5.21.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
-simo-2.5.21.dist-info/RECORD,,
+simo-2.5.23.dist-info/LICENSE.md,sha256=M7wm1EmMGDtwPRdg7kW4d00h1uAXjKOT3HFScYQMeiE,34916
+simo-2.5.23.dist-info/METADATA,sha256=-vWzMgKAjan4BPPOY4e0LcmrR0BJljvaEH9uf52c1ks,1924
+simo-2.5.23.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+simo-2.5.23.dist-info/entry_points.txt,sha256=S9PwnUYmTSW7681GKDCxUbL0leRJIaRk6fDQIKgbZBA,135
+simo-2.5.23.dist-info/top_level.txt,sha256=GmS1hrAbpVqn9OWZh6UX82eIOdRLgYA82RG9fe8v4Rs,5
+simo-2.5.23.dist-info/RECORD,,