simo 1.7.19__py3-none-any.whl → 2.0.0__py3-none-any.whl

simo/users/admin.py

@@ -6,7 +6,7 @@ from django.contrib.auth.admin import UserAdmin as OrgUserAdmin
 from django.contrib import admin
 from .models import (
     PermissionsRole, ComponentPermission, User, UserDevice, UserDeviceReportLog,
-    InstanceInvitation, InstanceUser
+    InstanceInvitation, InstanceUser, Fingerprint
 )
 
 
@@ -211,4 +211,11 @@ class InstanceInvitationAdmin(admin.ModelAdmin):
                 "No invitations were sent."
             )
 
+@admin.register(Fingerprint)
+class FingerprintAdmin(admin.ModelAdmin):
+    list_display = 'value', 'type', 'date_created', 'user',
+    search_fields = 'value', 'type', 'user__name', 'user__email'
+    readonly_fields = 'value', 'type', 'date_created'
 
+    def has_add_permission(self, request):
+        return False

simo/users/api.py

@@ -1,4 +1,5 @@
 import sys
+from django.db.models import Q
 from rest_framework import viewsets, mixins, status
 from rest_framework.serializers import Serializer
 from rest_framework.decorators import action
@@ -9,10 +10,11 @@ from django.utils import timezone
 from simo.core.api import InstanceMixin
 from .models import (
     User, UserDevice, UserDeviceReportLog, PermissionsRole, InstanceInvitation,
-    InstanceUser
+    Fingerprint
 )
 from .serializers import (
-    UserSerializer, PermissionsRoleSerializer, InstanceInvitationSerializer
+    UserSerializer, PermissionsRoleSerializer, InstanceInvitationSerializer,
+    FingerprintSerializer
 )
 
 
@@ -213,3 +215,37 @@ class InvitationsViewSet(InstanceMixin, viewsets.ModelViewSet):
                 status=400
             )
         return RESTResponse(response.json())
+
+
+class FingerprintViewSet(
+    InstanceMixin,
+    mixins.RetrieveModelMixin, mixins.UpdateModelMixin,
+    mixins.DestroyModelMixin, mixins.ListModelMixin,
+    viewsets.GenericViewSet
+):
+    url = 'users/fingerprints'
+    basename = 'fingerprints'
+    serializer_class = FingerprintSerializer
+
+
+    def get_queryset(self):
+        return Fingerprint.objects.filter(
+            Q(user=None) | Q(user__roles__instance=self.instance)
+        )
+
+    def check_can_manage_user(self, request):
+        user_role = request.user.get_role(self.instance)
+        if not request.user.is_superuser:
+            if not user_role or not user_role.can_manage_users:
+                msg = 'You are not allowed to change this!'
+                print(msg, file=sys.stderr)
+                raise ValidationError(msg, code=403)
+
+    def update(self, request, *args, **kwargs):
+        self.check_can_manage_user(request)
+        return super().update(request, *args, **kwargs)
+
+    def destroy(self, request, *args, **kwargs):
+        self.check_can_manage_user(request)
+        return super().destroy(request, *args, **kwargs)
+

simo/users/auto_urls.py

@@ -1,9 +1,9 @@
-from django.conf.urls import include, url
+from django.urls import include, re_path
 from django.views.generic import TemplateView
 from .views import accept_invitation
 
 urlpatterns = [
-    url(
+    re_path(
         r"^accept-invitation/(?P<token>[a-zA-Z0-9]+)/$",
         accept_invitation, name='accept_invitation'
     ),

simo/users/migrations/0025_rename_name_fingerprint_type_and_more.py

@@ -0,0 +1,22 @@
+# Generated by Django 4.2.10 on 2024-03-22 11:30
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0024_fingerprint'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='fingerprint',
+            old_name='name',
+            new_name='type',
+        ),
+        migrations.RemoveField(
+            model_name='fingerprint',
+            name='is_valid',
+        ),
+    ]

simo/users/models.py

@@ -360,8 +360,7 @@ class Fingerprint(models.Model):
         related_name='fingerprints'
     )
     date_created = models.DateTimeField(auto_now_add=True)
-    name = models.CharField(max_length=100, null=True, blank=True)
-    is_valid = models.BooleanField(default=True, db_index=True)
+    type = models.CharField(max_length=100, null=True, blank=True)
 
 
 class UserDevice(models.Model, SimoAdminMixin):
@@ -463,7 +462,7 @@ class ComponentPermission(models.Model):
 
 
 @receiver(post_save, sender=ComponentPermission)
-def rebuild_mqtt_acls(sender, instance, created, **kwargs):
+def rebuild_mqtt_acls_on_create(sender, instance, created, **kwargs):
     if not created:
         rebuild_mqtt_acls.delay()
 

simo/users/serializers.py

@@ -2,7 +2,9 @@ from rest_framework import serializers
 from collections.abc import Iterable
 from simo.core.middleware import get_current_request
 from simo.core.utils.api import ReadWriteSerializerMethodField
-from .models import User, PermissionsRole, InstanceInvitation, InstanceUser
+from .models import (
+    User, PermissionsRole, InstanceInvitation, InstanceUser, Fingerprint
+)
 
 
 
@@ -72,3 +74,15 @@ class InstanceInvitationSerializer(serializers.ModelSerializer):
         read_only_fields = (
             'instance', 'token', 'from_user', 'taken_by',
         )
+
+
+class FingerprintSerializer(serializers.ModelSerializer):
+    type = serializers.SerializerMethodField()
+
+    class Meta:
+        model = Fingerprint
+        fields = 'type', 'value', 'user'
+        read_only_fields = ('type', 'value')
+
+    def get_type(self, obj):
+        return obj.type

simo/users/sso_urls.py

@@ -1,8 +1,8 @@
-from django.conf.urls import url
+from django.urls import re_path
 from .sso_views import LoginView, AuthenticateView
 
 
 urlpatterns = [
-    url(r'^$', LoginView.as_view(), name='login'),
-    url(r'^authenticate/$', AuthenticateView.as_view(), name='simple-sso-authenticate'),
+    re_path(r'^$', LoginView.as_view(), name='login'),
+    re_path(r'^authenticate/$', AuthenticateView.as_view(), name='simple-sso-authenticate'),
 ]

simo/wsgi.py

@@ -0,0 +1,7 @@
+import os
+
+from django.core.wsgi import get_wsgi_application
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'settings_local')
+
+application = get_wsgi_application()

{simo-1.7.19.dist-info → simo-2.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: simo
-Version: 1.7.19
+Version: 2.0.0
 Summary: Smart Home on Steroids!
 Author-email: Simanas Venčkauskas <simanas@simo.io>
 Project-URL: Homepage, https://simo.io
@@ -11,18 +11,17 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
-Requires-Dist: Django ==3.2.9
-Requires-Dist: django-filebrowser-no-grappelli ==3.8.0
-Requires-Dist: django-autocomplete-light ==3.8.2
-Requires-Dist: djangorestframework ==3.12.4
+Requires-Dist: Django ==4.2.10
+Requires-Dist: django-autocomplete-light ==3.11.0
+Requires-Dist: djangorestframework ==3.14.0
 Requires-Dist: django-dynamic-preferences ==1.11.0
 Requires-Dist: django-formtools ==2.3
-Requires-Dist: easy-thumbnails ==2.8
-Requires-Dist: channels ==3.0.4
-Requires-Dist: asgiref ==3.4.1
+Requires-Dist: easy-thumbnails ==2.8.5
+Requires-Dist: channels ==4.0.0
+Requires-Dist: asgiref ==3.7.2
 Requires-Dist: django-filter ==2.4.0
 Requires-Dist: celery ==5.3.6
-Requires-Dist: django-admin-sortable2 ==1.0.2
+Requires-Dist: django-admin-sortable2 ==2.1.10
 Requires-Dist: django-bootstrap4 ==3.0.1
 Requires-Dist: psycopg2 ==2.9.2
 Requires-Dist: django-model-utils ==4.2.0