django-restit 4.1.38__tar.gz → 4.1.39__tar.gz

{django_restit-4.1.38 → django_restit-4.1.39}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-restit
-Version: 4.1.38
+Version: 4.1.39
 Summary: A Rest Framework for DJANGO
 License: MIT
 Author: Ian Starnes

{django_restit-4.1.38 → django_restit-4.1.39}/account/models/group.py

@@ -136,7 +136,7 @@ class Group(models.Model, RestModel, MetaDataModel):
             return self.restGet(request)
         return restPermissionDenied(request)
 
-    def onRestCanSave(self, request):
+    def onRestCanSave(self, request=None, data=None, extended=None):
         if request.member is None:
             raise PermissionDeniedException("permission denied for save")
         if request.member.hasPermission(["manage_groups", "create_groups"]):

{django_restit-4.1.38 → django_restit-4.1.39}/medialib/models.py

@@ -409,7 +409,7 @@ class MediaItem(models.Model, RestModel, MetaDataModel):
         super(MediaItem, self).__init__(*args, **kwargs)
         self.old_state = self.state
 
-    def onRestCanSave(self, request):
+    def onRestCanSave(self, request=None, data=None, extended=None):
         # must throw an exception if cannot save
         return True
 

{django_restit-4.1.38 → django_restit-4.1.39}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "django-restit"
-version = "4.1.38"
+version = "4.1.39"
 description = "A Rest Framework for DJANGO"
 authors = ["Ian Starnes <ians@311labs.com>"]
 license = "MIT"

{django_restit-4.1.38 → django_restit-4.1.39}/rest/__init__.py

@@ -1,4 +1,4 @@
 from .uberdict import UberDict  # noqa: F401
 from .settings_helper import settings  # noqa: F401
 
-__version__ = "4.1.38"
+__version__ = "4.1.39"

{django_restit-4.1.38 → django_restit-4.1.39}/rest/helpers.py

@@ -124,6 +124,17 @@ def log_error(*args):
     getLoggerByRequest(request).error(*extra, *args)
 
 
+def log_stack(*args):
+    request = getActiveRequest()
+    import inspect
+    extra = []
+    for frame in inspect.stack():
+        file, line, func = frame[1:4]
+        extra.append(f"{file}, line {line} in function {func}")
+    ERROR_LOGGER.error(*extra, *args)
+    getLoggerByRequest(request).error(*extra, *args)
+
+
 def setLogModel(self, component, pk):
     # this method allows for updating the component to associate a log with
     if not pk or (self._log_pk == pk):

{django_restit-4.1.38 → django_restit-4.1.39}/rest/models/base.py

@@ -418,7 +418,7 @@ class RestModel(object):
                             obj = new_obj
                     if using is None:
                         using = self.restGetModelDB()
-                    obj.saveFromDict(None, value, using=using)
+                    obj.checkPermsAndSave(None, value, using=using)
                     # rh.log_print("{} vs {}".format(self._state.db, obj._state.db))
                     # rh.log_print("saving FK to {} ({}.{}) - {}".format(fieldname, using, obj.pk, type(obj)), value)
                     setattr(self, fieldname, obj)
@@ -468,7 +468,7 @@ class RestModel(object):
     def saveFromRequest(self, request, **kwargs):
         if "files" not in kwargs:
             kwargs["files"] = request.FILES
-        return self.saveFromDict(request, request.DATA, **kwargs)
+        return self.checkPermsAndSave(request, request.DATA, **kwargs)
 
     def hasFieldChanged(self, fieldname):
         if not hasattr(self, "_changed__"):
@@ -489,17 +489,20 @@ class RestModel(object):
         else:
             self._changed__[fieldname] = old_value
 
-    def saveFromDict(self, request, data, files=None, **kwargs):
+    def checkPermsAndSave(self, request, data, files=None, **kwargs):
         can_save = getattr(self.RestMeta, "CAN_SAVE", True)
         if not can_save:
-            return self.restStatus(request, False, error="saving not allowed via rest for this model.")
-        save_media_files = getattr(self.RestMeta, "SAVE_MEDIA_FILES", False) or getattr(self.RestMeta, "SAVE_MEDIA_FILES_BY_NAME", False)
+            raise re.PermissionDeniedException("saving not allowed via rest for this model.")
         # check check for save permissions
         if request is None:
             request = RestModel.getActiveRequest()
             if request is None:
                 request = objict(member=None, FILES=[], DATA=objict(), is_authenticated=False, is_local=True)
-        self.onRestCanSave(request)
+        self.onRestCanSave(request, data, kwargs)
+        return self.saveFromDict(request, data, files=None, **kwargs)
+
+    def saveFromDict(self, request, data, files=None, **kwargs):
+        save_media_files = getattr(self.RestMeta, "SAVE_MEDIA_FILES", False) or getattr(self.RestMeta, "SAVE_MEDIA_FILES_BY_NAME", False)
         is_new = self.id is None
         has_fields = hasattr(self.RestMeta, "SAVE_FIELDS") and len(self.RestMeta.SAVE_FIELDS)
         has_no_fields = hasattr(self.RestMeta, "NO_SAVE_FIELDS") and len(self.RestMeta.NO_SAVE_FIELDS)
@@ -516,9 +519,10 @@ class RestModel(object):
                 else:
                     m_field = field
                     req_field = field
-                req_value = getattr(request, req_field, None)
-                if request and req_value:
-                    data[m_field] = req_value
+                if request is not None:
+                    req_value = getattr(request, req_field, None)
+                    if req_value is not None:
+                        data[m_field] = req_value
             # rh.log_print(data)
         self._changed__ = objict()
         if hasattr(self.RestMeta, "POST_SAVE_FIELDS"):
@@ -561,7 +565,7 @@ class RestModel(object):
         if len(deferred):
             self.save(using=using)
 
-        if len(rfiles) and save_media_files:
+        if rfiles is not None and len(rfiles) and save_media_files:
             self.restSaveMediaFiles(rfiles)
 
         # these setters are responsible for saving themselves
@@ -575,7 +579,7 @@ class RestModel(object):
         return self
 
     def restSaveFiles(self, request, files=None):
-        if files is None:
+        if files is None and request is not None:
             files = request.FILES
         if not files:
             return files
@@ -728,10 +732,10 @@ class RestModel(object):
         self.on_rest_pre_get(request)
         return self.restGet(request)
 
-    def onRestCanSave(self, request=None):
-        self.onRestCheckSavePerms(request)
+    def onRestCanSave(self, request=None, data=None, extended=None):
+        self.onRestCheckSavePerms(request, data, extended)
 
-    def onRestCheckSavePerms(self, request=None):
+    def onRestCheckSavePerms(self, request=None, data=None, extended=None):
         if request is None:
             request = self.getActiveRequest()
             if request is None:
@@ -748,7 +752,15 @@ class RestModel(object):
             group_field = getattr(self.RestMeta, "GROUP_FIELD", "group")
             # rh.log_error(F"group field={group_field}")
             if self.id is None:
-                group = request.DATA.get(group_field)
+                group = None
+                if extended is not None:
+                    group = extended.get(group_field, None)
+                if group is None:
+                    if data is not None:
+                        group = data.get(group_field, None)
+                if group is None:
+                    if request is not None:
+                        group = request.DATA.get(group_field, None)
             elif "__" in group_field and hasattr(self, "group"):
                 group = self.group
             elif "__" in group_field:
@@ -764,11 +776,11 @@ class RestModel(object):
             if not status:
                 if self.id is None and code == 402:
                     code = 435
-                rh.log_error(F"onRestCheckSavePerms: {self.id} {request.member} {group} permission denied: status={status}, error={error}, code={code}", perms)
+                    rh.log_error(F"onRestCheckSavePerms: {self.__class__.__name__} {request.member} {group} permission denied: status={status}, error={error}, code={code}", perms)
                 raise re.PermissionDeniedException(error, code)
 
     def on_rest_post(self, request):
-        self.saveFromRequest(request)
+        self.checkPermsAndSave(request, request.DATA)
         status_only = request.DATA.get("status_only", False, field_type=bool)
         if status_only:
             return self.restStatus(request, True)
@@ -784,11 +796,12 @@ class RestModel(object):
     def on_rest_saved(self, request, is_new=False):
         pass
 
-    def on_rest_delete(self, request):
+    def on_rest_delete(self, request, force=False):
         can_delete = getattr(self.RestMeta, "CAN_DELETE", False)
         if not can_delete:
             return self.restStatus(request, False, error="deletion not allowed via rest for this model.")
-        self.onRestCanSave(request)
+        if not force:
+            self.onRestCanSave(request)
         self.on_rest_deleted(request)
         self.delete()
         RestModel._setupGraphHelpers()
@@ -1121,7 +1134,7 @@ class RestModel(object):
                 try:
                     obj = cls.ro_objects().filter(**item).last()
                     if not obj:
-                        obj.saveFromDict(request, item)
+                        obj.checkPermsAndSave(request, item)
                     items.append(obj)
                 except Exception:
                     pass