Merge pull request #174 from arenaxr/reprofile

Reprofile

Author: mwfarb

users/api.py

@@ -315,7 +315,7 @@ def list_my_scenes(request, id_token: str = Form(None)):
     return 200, sorted(list(merged_map.values()), key=lambda x: x["name"])
 
 
-@router.api_operation(["GET", "POST", "PUT", "DELETE"], "/scenes/{path:scene_name}", response={200: SceneSchema, 201: SceneSchema, 200: MessageSchema, 400: ErrorSchema, 404: ErrorSchema})
+@router.api_operation(["GET", "POST", "PUT", "DELETE"], "/scenes/{path:scene_name}", response={200: SceneSchema, 201: SceneSchema, 400: ErrorSchema, 404: ErrorSchema})
 def scene_detail(request, scene_name: str, payload: SceneSchema = None):
     # check permissions model for namespace
     try:
@@ -382,8 +382,9 @@ def scene_detail(request, scene_name: str, payload: SceneSchema = None):
         return 400, {"error": "Invalid parameters"}
 
     if request.method == "DELETE":
+        name = scene.name
         scene.delete()
-        return 200, {"message": "Scene was deleted successfully!"}
+        return 200, serialize_scene(Scene(name=name))
 
     return 400, {"error": "Method not allowed"}
 

users/forms.py

@@ -4,15 +4,15 @@
 from django.conf import settings
 from django.contrib.auth.models import User
 
-from .models import Device, Namespace, Scene
+from .models import RE_NS, Device, Namespace, Scene
 from .persistence import read_persist_scenes_by_namespace
 
 
 class SocialSignupForm(_SocialSignupForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        if self.sociallogin and self.sociallogin.account.provider in ("google"):
+        if self.sociallogin and self.sociallogin.account.provider in ("google",):
             name = self.sociallogin.account.extra_data["email"].split("@")[0]
             self.fields["username"].widget.attrs.update({"value": name})
 
@@ -42,6 +42,40 @@ class UpdateStaffForm(forms.Form):
 class UpdateNamespaceForm(forms.Form):
     add = forms.CharField(label="add", required=False)
     edit = forms.CharField(label="edit", required=False)
+    namespacename = forms.CharField(label="namespacename", required=False)
+
+    def clean_namespacename(self):
+        import re
+
+        name = self.cleaned_data.get("namespacename", "").strip()
+        if not name:
+            return name
+        # validate namespace regex
+        if not re.match(RE_NS, name):
+            raise forms.ValidationError(
+                "Only alphanumeric, underscore, hyphen allowed."
+            )
+        # reject reserved words
+        if name in settings.USERNAME_RESERVED:
+            raise forms.ValidationError(
+                f"Sorry, '{name}' is a reserved word."
+            )
+        # reject if an existing user
+        if User.objects.filter(username=name).exists():
+            raise forms.ValidationError(
+                f"Sorry, '{name}' is already a user account."
+            )
+        # reject if namespace exists in permissions
+        if Namespace.objects.filter(name=name).exists():
+            raise forms.ValidationError(
+                f"Sorry, '{name}' is an existing permissions namespace."
+            )
+        # reject if namespace used in persist db
+        if len(read_persist_scenes_by_namespace([name])) > 0:
+            raise forms.ValidationError(
+                f"Sorry, '{name}' is a persistence namespace."
+            )
+        return name
 
 
 class UpdateSceneForm(forms.Form):

users/models.py

@@ -23,24 +23,6 @@
     RE_NS_SLASH_ID, "Only alphanumeric, underscore, hyphen, period, in namespace/idname format allowed."
 )
 
-# assign accessible model for persist collection
-def get_arenaobjects_collection():
-    from .persist_db import get_persist_db
-    return get_persist_db()['arenaobjects']
-
-# arenaobjects schema reference:
-# https://github.com/arenaxr/arena-persist/blob/master/server.js#L28-L42
-# object_id: {type: String, required: true, index: true},
-# type: {type: String, required: true, index: true},
-# attributes: {type: Object, required: true, default: {}},
-# expireAt: {type: Date, expires: 0},
-# realm: {type: String, required: true, index: true},
-# namespace: {type: String, required: true, index: true, default: 'public'},
-# sceneId: {type: String, required: true, index: true},
-# private: {type: Boolean},
-# program_id: {type: String},
-
-
 class NamespaceDefault:
     def __init__(self, name=""):
         self.name = name
@@ -58,7 +40,7 @@ class Namespace(models.Model):
 
     def save(self, *args, **kwargs):
         self.full_clean()  # performs regular validation then clean()
-        super(Namespace, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
 
     def clean(self):
         if self.name == "":
@@ -103,7 +85,7 @@ class Scene(models.Model):
 
     def save(self, *args, **kwargs):
         self.full_clean()  # performs regular validation then clean()
-        super(Scene, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
 
     def clean(self):
         if self.name == "":
@@ -129,11 +111,11 @@ def sceneid(self):
     @property
     def is_default(self):
         return (
-            self.public_read is SCENE_PUBLIC_READ_DEF
-            and self.public_write is SCENE_PUBLIC_WRITE_DEF
-            and self.anonymous_users is SCENE_ANON_USERS_DEF
-            and self.video_conference is SCENE_VIDEO_CONF_DEF
-            and self.users is SCENE_USERS_DEF
+            self.public_read == SCENE_PUBLIC_READ_DEF
+            and self.public_write == SCENE_PUBLIC_WRITE_DEF
+            and self.anonymous_users == SCENE_ANON_USERS_DEF
+            and self.video_conference == SCENE_VIDEO_CONF_DEF
+            and self.users == SCENE_USERS_DEF
             and self.editors.count() == 0
             and self.viewers.count() == 0
         )
@@ -148,7 +130,7 @@ class Device(models.Model):
 
     def save(self, *args, **kwargs):
         self.full_clean()  # performs regular validation then clean()
-        super(Device, self).save(*args, **kwargs)
+        super().save(*args, **kwargs)
 
     def clean(self):
         if self.name == "":

users/mqtt.py

@@ -48,7 +48,7 @@ def generate_arena_token(
     if not os.path.exists(privkeyfile):
         print("Error: keyfile not found")
         return None
-    with open(privkeyfile) as privatefile:
+    with open(privkeyfile, encoding="utf-8") as privatefile:
         private_key = privatefile.read()
     payload = {}
     payload["sub"] = username

users/mqtt_match.py

@@ -94,4 +94,4 @@ def topic_matches_sub(sub: str, topic: str) -> bool:
         next(matcher.iter_match(topic))
         return True
     except StopIteration:
-        return False
+        return False

users/persistence.py

@@ -7,7 +7,25 @@
 
 from bson import ObjectId
 
-from .models import get_arenaobjects_collection
+
+# assign accessible model for persist collection
+def get_arenaobjects_collection():
+    from .persist_db import get_persist_db
+    return get_persist_db()['arenaobjects']
+
+# arenaobjects schema reference:
+# https://github.com/arenaxr/arena-persist/blob/master/server.js#L30-L43
+# object_id: {type: String, required: true, index: true},
+# type: {type: String, required: true, index: true},
+# attributes: {type: Object, required: true, default: {}},
+# expireAt: {type: Date, expires: 0},
+# realm: {type: String, required: true, index: true},
+# namespace: {type: String, required: true, index: true, default: 'public'},
+# sceneId: {type: String, required: true, index: true},
+# private: {type: Boolean},
+# program_id: {type: String},
+# createdAt: {type: Date}, // via timestamps: true
+# updatedAt: {type: Date}, // via timestamps: true
 
 
 class MongoJSONEncoder(json.JSONEncoder):
@@ -24,11 +42,12 @@ def read_persist_ns_all():
         "$group": {
             "_id": {
                 "namespace": "$namespace",
-                }
-            }
+            },
+            "last_updated": {"$max": "$updatedAt"},
+            "count": {"$sum": 1}
         }
-    ])
-    return [doc['_id']['namespace'] for doc in arenaobjects]
+    }])
+    return {doc['_id']['namespace']: {'last_updated': doc.get('last_updated'), 'count': doc.get('count', 0)} for doc in arenaobjects}
 
 
 def read_persist_scenes_all():
@@ -38,18 +57,22 @@ def read_persist_scenes_all():
                 "_id": {
                     "namespace": "$namespace",
                     "sceneId": "$sceneId",
-                }
+                },
+                "last_updated": {"$max": "$updatedAt"},
+                "count": {"$sum": 1}
             }
         },
         {
             "$project": {
                 "name": {
                     "$concat": ["$_id.namespace", "/", "$_id.sceneId"]
-                }
+                },
+                "last_updated": 1,
+                "count": 1
             }
         }
     ])
-    return [doc['name'] for doc in arenaobjects]
+    return {doc['name']: {'last_updated': doc.get('last_updated'), 'count': doc.get('count', 0)} for doc in arenaobjects}
 
 
 def read_persist_scenes_by_namespace(namespaces):
@@ -64,18 +87,22 @@ def read_persist_scenes_by_namespace(namespaces):
                 "_id": {
                     "namespace": "$namespace",
                     "sceneId": "$sceneId",
-                }
+                },
+                "last_updated": {"$max": "$updatedAt"},
+                "count": {"$sum": 1}
             }
         },
         {
             "$project": {
                 "name": {
                     "$concat": ["$_id.namespace", "/", "$_id.sceneId"]
-                }
+                },
+                "last_updated": 1,
+                "count": 1
             }
         }
     ])
-    return [doc['name'] for doc in arenaobjects]
+    return {doc['name']: {'last_updated': doc.get('last_updated'), 'count': doc.get('count', 0)} for doc in arenaobjects}
 
 
 def read_persist_scene_objects(namespace, scene):

users/static/users/vendor/jquery.min.js

@@ -8,6 +8,13 @@
 <div class="container-fluid">
     <div class="row d-flex justify-content-center align-items-center min-vh-75">
         <div class="col-md-10 bg-white p-5">
+            <nav aria-label="breadcrumb">
+                <ol class="breadcrumb">
+                    <li class="breadcrumb-item"><a href="{% url 'users:user_profile' %}">Profile Dashboard</a></li>
+                    <li class="breadcrumb-item"><a href="{% url 'users:profile_devices' %}">All Devices</a></li>
+                    <li class="breadcrumb-item active" aria-current="page">Edit Device</li>
+                </ol>
+            </nav>
 
             <h1>Edit Device Permissions</h1>
             {% if token %}

users/static/users/vendor/popper.min.js

@@ -17,8 +17,7 @@
     <link rel="preconnect" href="https://fonts.gstatic.com">
     <link href="https://fonts.googleapis.com/css2?family=Roboto&family=Roboto+Slab&display=swap" rel="stylesheet">
 
-    <script src="https://cdn.jsdelivr.net/npm/jquery@3.5.1/dist/jquery.min.js"
-        integrity="sha256-9/aliU8dGd2tb6OSsuzixeV4y/faTqgFtohetphbbj0=" crossorigin="anonymous"></script>
+    <script type="text/javascript" src="{% static 'users/vendor/jquery.min.js' %}"></script>
 
     {% block extrahead %}
     {% endblock extrahead %}
@@ -135,10 +134,8 @@
 
     {% endblock content %}
 
+    <script type="text/javascript" src="{% static 'users/vendor/popper.min.js' %}"></script>
     <script type="text/javascript" src="{% static 'users/vendor/arenaxr-bootstrap/bootstrap.min.js' %}"></script>
-    <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js"
-        integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous">
-    </script>
     <script type="text/javascript" src="{% static 'users/vendor/sweetalert2.min.js' %}"></script>
 
     <script>