elody 0.0.230__tar.gz → 0.0.232__tar.gz

{elody-0.0.230 → elody-0.0.232}/PKG-INFO

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

{elody-0.0.230 → elody-0.0.232}/pyproject.toml

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

{elody-0.0.230 → elody-0.0.232}/src/elody/object_configurations/base_object_configuration.py

@@ -172,7 +172,7 @@ class BaseObjectConfiguration(ABC):
     ):
         if index == 0 and not any(info["object_list"] for info in keys_info):
             if value in ["ANY_MATCH", "NONE_MATCH"]:
-                value = {"$exists": value == "ANY_MATCH"}
+                value = {"$nin" if value == "ANY_MATCH" else "$in": [None, ""]}
             matcher = {".".join(info["key"] for info in keys_info): value}
             if inner_exact_matches := kwargs.get("inner_exact_matches"):
                 matcher.update(inner_exact_matches)
@@ -189,16 +189,11 @@ class BaseObjectConfiguration(ABC):
                     ),
                 }
             }
-            if value in ["ANY_MATCH", "NONE_MATCH"]:
-                elem_match_with_exists_operator = deepcopy(elem_match)
-                del elem_match["$elemMatch"][keys_info[index + 1]["key"]]
-                if value == "NONE_MATCH":
-                    return {
-                        "NOR_MATCHER": [
-                            {info["key"]: {"$all": [elem_match]}},
-                            {info["key"]: {"$all": [elem_match_with_exists_operator]}},
-                        ]
-                    }
+            if value == "NONE_MATCH":
+                elem_match["$elemMatch"][keys_info[index + 1]["key"]] = {
+                    "$nin": [None, ""]
+                }
+                return {"NOR_MATCHER": [{info["key"]: {"$all": [elem_match]}}]}
             return elem_match if index > 0 else {info["key"]: {"$all": [elem_match]}}
 
         raise Exception(f"Unable to build nested matcher. See keys_info: {keys_info}")

{elody-0.0.230 → elody-0.0.232}/src/elody/policies/permission_handler.py

@@ -11,6 +11,7 @@ from elody.util import flatten_dict, interpret_flat_key
 from flask import g
 from inuits_policy_based_auth.contexts.user_context import UserContext
 from logging_elody.log import log  # pyright: ignore
+from os import getenv
 from storage.storagemanager import StorageManager  # pyright: ignore
 from werkzeug.exceptions import NotFound
 
@@ -128,6 +129,7 @@ def __generate_restriction_filters(restrictions_grouped_by_index):
             ],
             "match_exact": True,
             "or": [],
+            "policy_signature": getenv("STATIC_JWT"),
         }
 
         for combined_restriction in combined_restrictions:
@@ -139,6 +141,7 @@ def __generate_restriction_filters(restrictions_grouped_by_index):
                         "key": restriction["key"],
                         "value": [value],
                         "match_exact": True,
+                        "policy_signature": getenv("STATIC_JWT"),
                     }
                 )
                 for key, value in combinations.items():
@@ -150,6 +153,7 @@ def __generate_restriction_filters(restrictions_grouped_by_index):
                             "key": key,
                             "value": value,
                             "match_exact": True,
+                            "policy_signature": getenv("STATIC_JWT"),
                         }
                     )
             filter["or"].append(combination)

{elody-0.0.230 → elody-0.0.232}/src/elody.egg-info/PKG-INFO

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