okta-expression-parser 0.4.2__tar.gz → 0.4.3__tar.gz

{okta_expression_parser-0.4.2 → okta_expression_parser-0.4.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: okta-expression-parser
-Version: 0.4.2
+Version: 0.4.3
 Summary: Returns a boolean by passing Okta profile data to an Okta Expression using Okta Expression Language
 Author: Mathew Moon
 Author-email: me@mathewmoon.net

{okta_expression_parser-0.4.2 → okta_expression_parser-0.4.3}/okta_expression_parser/parser.py

@@ -22,7 +22,7 @@ log_level = environ.get("LOG_LEVEL", "ERROR")
 
 log_rank = log_levels.index(log_level)
 
-for level_name in list(reversed(log_levels))[:log_rank +1]:
+for level_name in list(reversed(log_levels))[: log_rank + 1]:
     log_attr = level_name.lower()
     setattr(sly.yacc.SlyLogger, log_attr, lambda self, msg, *args, **kwargs: None)
 
@@ -340,47 +340,34 @@ class ExpressionParser(sly.Parser):
 
         return p.operand in self.__group_ids
 
+    def _member_group_names(self) -> List[str]:
+        """Names of the groups in `group_data` that the user is actually a member of"""
+        return [
+            name
+            for group_id, group in self.group_data.items()
+            if group_id in self.__group_ids
+            and (name := (group.get("profile") or {}).get("name")) is not None
+        ]
+
     @_('MEMBEROFNAME "(" operand ")"')
     def condition(self, p: YaccProduction):
         """Tests if a user is a member of a group with a specific name"""
-
-        matches = [
-            v for k, v in self.group_data.items() if v["profile"]["name"] == p.operand
-        ]
-
-        return bool(matches)
+        return p.operand in self._member_group_names()
 
     @_('MEMBEROFGROUPSTARTSWITH "(" operand ")"')
     def condition(self, p: YaccProduction):
-        """Tests if a user is a member of a group with a specific name"""
-
-        matches = [
-            v
-            for k, v in self.group_data.items()
-            if v["profile"]["name"].startswith(p.operand)
-        ]
-
-        return bool(matches)
+        """Tests if a user is a member of a group whose name starts with a prefix"""
+        return any(n.startswith(p.operand) for n in self._member_group_names())
 
     @_('MEMBEROFGROUPCONTAINS "(" operand ")"')
     def condition(self, p: YaccProduction):
-        """Tests if a user is a member of a group with a specific name"""
-
-        matches = [
-            v for k, v in self.group_data.items() if p.operand in v["profile"]["name"]
-        ]
-
-        return bool(matches)
+        """Tests if a user is a member of a group whose name contains a substring"""
+        return any(p.operand in n for n in self._member_group_names())
 
     @_('MEMBEROFGROUPNAMEREGEX "(" operand ")"')
     def condition(self, p: YaccProduction):
-        """Tests if a user is a member of a group with a specific name"""
-
-        for _, group in self.group_data.items():
-            if match(p.operand, group["profile"]["name"]):
-                return True
-
-        return False
+        """Tests if a user is a member of a group whose name matches a regex"""
+        return any(match(p.operand, n) for n in self._member_group_names())
 
     @_("operand QUESTION_MARK operand COLON operand")  # noqa: 821
     @_("condition QUESTION_MARK operand COLON operand")  # noqa: 821

{okta_expression_parser-0.4.2 → okta_expression_parser-0.4.3}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "okta-expression-parser"
-version = "0.4.2"
+version = "0.4.3"
 description = "Returns a boolean by passing Okta profile data to an Okta Expression using Okta Expression Language"
 authors = ["Mathew Moon <me@mathewmoon.net>"]
 readme = "README.md"