elody 0.0.215__tar.gz → 0.0.217__tar.gz

{elody-0.0.215 → elody-0.0.217}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elody
-Version: 0.0.215
+Version: 0.0.217
 Summary: elody SDK for Python
 Author-email: Inuits <developers@inuits.eu>
 License:                     GNU GENERAL PUBLIC LICENSE

{elody-0.0.215 → elody-0.0.217}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "elody"
-version = "0.0.215"
+version = "0.0.217"
 description = "elody SDK for Python"
 readme = "README.md"
 authors = [{ name = "Inuits", email = "developers@inuits.eu" }]

{elody-0.0.215 → elody-0.0.217}/src/elody/job.py

@@ -9,12 +9,11 @@ _post_crud_hook = _config.crud()["post_crud_hook"]
 def add_document_to_job(
     id,
     id_of_document_job_was_initiated_for,
-    type_of_document_job_was_initiated_for,
     *,
     get_rabbit,
 ):
     relations = []
-    if id_of_document_job_was_initiated_for and type_of_document_job_was_initiated_for:
+    if id_of_document_job_was_initiated_for:
         relations.append(
             {"key": id_of_document_job_was_initiated_for, "type": "isJobFor"}
         )
@@ -25,12 +24,6 @@ def add_document_to_job(
         },
     }
     _post_crud_hook(crud="update", document=document, get_rabbit=get_rabbit)
-    __patch_document_job_was_initiated_for(
-        id,
-        id_of_document_job_was_initiated_for,
-        type_of_document_job_was_initiated_for,
-        get_rabbit,
-    )
 
 
 def init_job(
@@ -42,14 +35,13 @@ def init_job(
     user_email=None,
     parent_id=None,
     id_of_document_job_was_initiated_for=None,
-    type_of_document_job_was_initiated_for=None,
 ) -> str:
     relations = []
     if parent_id:
         relations.append({"key": parent_id, "type": "hasParentJob"})
-    if id_of_document_job_was_initiated_for and type_of_document_job_was_initiated_for:
+    if id_of_document_job_was_initiated_for:
         relations.append(
-            {"key": id_of_document_job_was_initiated_for, "type": "isJobOf"}
+            {"key": id_of_document_job_was_initiated_for, "type": "isJobFor"}
         )
 
     job = _create(
@@ -69,19 +61,12 @@ def init_job(
     _post_crud_hook(
         crud="create", document=job, parent_id=parent_id, get_rabbit=get_rabbit
     )
-    __patch_document_job_was_initiated_for(
-        job["_id"],
-        id_of_document_job_was_initiated_for,
-        type_of_document_job_was_initiated_for,
-        get_rabbit,
-    )
     return job["_id"]
 
 
 def start_job(
     id,
     id_of_document_job_was_initiated_for=None,
-    type_of_document_job_was_initiated_for=None,
     *,
     get_rabbit,
 ):
@@ -94,18 +79,11 @@ def start_job(
         },
     }
     _post_crud_hook(crud="update", document=document, get_rabbit=get_rabbit)
-    __patch_document_job_was_initiated_for(
-        id,
-        id_of_document_job_was_initiated_for,
-        type_of_document_job_was_initiated_for,
-        get_rabbit,
-    )
 
 
 def finish_job(
     id,
     id_of_document_job_was_initiated_for=None,
-    type_of_document_job_was_initiated_for=None,
     *,
     get_rabbit,
 ):
@@ -117,12 +95,6 @@ def finish_job(
         },
     }
     _post_crud_hook(crud="update", document=document, get_rabbit=get_rabbit)
-    __patch_document_job_was_initiated_for(
-        id,
-        id_of_document_job_was_initiated_for,
-        type_of_document_job_was_initiated_for,
-        get_rabbit,
-    )
 
 
 def fail_job(id, exception_message, *, get_rabbit):
@@ -136,12 +108,3 @@ def fail_job(id, exception_message, *, get_rabbit):
         },
     }
     _post_crud_hook(crud="update", document=document, get_rabbit=get_rabbit)
-
-
-def __patch_document_job_was_initiated_for(job_id, document_id, type, get_rabbit):
-    if id and type:
-        document = {
-            "document_info_job_was_initiated_for": {"id": document_id, "type": type},
-            "patch": {"relations": [{"key": job_id, "type": "hasJob"}]},
-        }
-        _post_crud_hook(crud="update", document=document, get_rabbit=get_rabbit)

{elody-0.0.215 → elody-0.0.217}/src/elody/object_configurations/job_configuration.py

@@ -42,20 +42,6 @@ class JobConfiguration(ElodyConfiguration):
                 "dams.job_created",
                 document,
             )
-            if parent_id := kwargs.get("parent_id"):
-                send_cloudevent(
-                    get_rabbit(),
-                    getenv("MQ_EXCHANGE", "dams"),
-                    "dams.job_changed",
-                    {
-                        "id": parent_id,
-                        "patch": {
-                            "relations": [
-                                {"key": document["_id"], "type": "isParentJobOf"}
-                            ]
-                        },
-                    },
-                )
         elif crud == "update":
             send_cloudevent(
                 get_rabbit(),

{elody-0.0.215 → elody-0.0.217}/src/elody/policies/authentication/base_user_tenant_validation_policy.py

@@ -35,6 +35,10 @@ class BaseUserTenantValidationPolicy(ABC):
 
         return self.user
 
+    @abstractmethod
+    def promote_role(self, user_context: UserContext):
+        pass
+
     @abstractmethod
     def build_user_context_for_anonymous_user(
         self, request, user_context: UserContext
@@ -86,30 +90,37 @@ class BaseUserTenantValidationPolicy(ABC):
         """
 
         roles = []
-        for metadata in self.user.get("metadata", []):
-            if (
-                metadata["key"]
-                == user_context.bag["user_metadata_key_for_global_roles"]
+        try:
+            for metadata in self.user.get("metadata", []):
+                if (
+                    metadata["key"]
+                    == user_context.bag["user_metadata_key_for_global_roles"]
+                ):
+                    roles.extend(metadata["value"])
+
+            if user_context.x_tenant.id:
+                tenant_ids = user_context.x_tenant.id.split(",")
+                for tenant_id in tenant_ids:
+                    try:
+                        user_tenant_relation = self.__get_user_tenant_relation(
+                            tenant_id, user_context.bag["user_tenant_relation_type"]
+                        )
+                    except Forbidden as error:
+                        user_tenant_relation = {}
+                        if len(roles) == 0:
+                            raise Forbidden(error.description)
+                    roles.extend(user_tenant_relation.get("roles", []))
+
+            if len(roles) == 0 and not regex.match(
+                "(/[^/]+/v[0-9]+)?/tenants$", request.path
             ):
-                roles.extend(metadata["value"])
-
-        if user_context.x_tenant.id:
-            tenant_ids = user_context.x_tenant.id.split(",")
-            for tenant_id in tenant_ids:
-                try:
-                    user_tenant_relation = self.__get_user_tenant_relation(
-                        tenant_id, user_context.bag["user_tenant_relation_type"]
-                    )
-                except Forbidden as error:
-                    user_tenant_relation = {}
-                    if len(roles) == 0:
-                        raise Forbidden(error.description)
-                roles.extend(user_tenant_relation.get("roles", []))
-
-        if len(roles) == 0 and not regex.match(
-            "(/[^/]+/v[0-9]+)?/tenants$", request.path
-        ):
-            raise Forbidden("User has no global roles, switch to a specific tenant.")
+                raise Forbidden(
+                    "User has no global roles, switch to a specific tenant."
+                )
+        except Forbidden as exception:
+            if not (promoted_role := self.promote_role(user_context)):
+                raise exception
+            roles.append(promoted_role)
 
         return list(set(roles))
 

{elody-0.0.215 → elody-0.0.217}/src/elody/policies/permission_handler.py

@@ -222,7 +222,7 @@ def __is_allowed_to_crud_item_keys(
                 if key_to_check and key_to_check == restricted_key:
                     user_context.bag["restricted_keys"].append(restricted_key)
             else:
-                if flat_request_body.get(restricted_key):
+                if flat_request_body.get(restricted_key) is not None:
                     user_context.bag["restricted_keys"].append(restricted_key)
 
     user_context.bag["requested_item"] = item

{elody-0.0.215 → elody-0.0.217}/src/elody.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: elody
-Version: 0.0.215
+Version: 0.0.217
 Summary: elody SDK for Python
 Author-email: Inuits <developers@inuits.eu>
 License:                     GNU GENERAL PUBLIC LICENSE