alpha-python 0.7.4__tar.gz → 0.7.5__tar.gz

{alpha_python-0.7.4 → alpha_python-0.7.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alpha-python
-Version: 0.7.4
+Version: 0.7.5
 Summary: Alpha is intended to be the first dependency you need to add to your Python application. It is a Python library which contains standard building blocks that can be used in applications that are used as APIs and/or make use of database interaction.
 Author-email: Bart Reijling <bart@reijling.eu>
 License-Expression: MIT

{alpha_python-0.7.4 → alpha_python-0.7.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "alpha-python"
-version = "0.7.4"
+version = "0.7.5"
 description = "Alpha is intended to be the first dependency you need to add to your Python application. It is a Python library which contains standard building blocks that can be used in applications that are used as APIs and/or make use of database interaction."
 readme = "README.md"
 authors = [

{alpha_python-0.7.4 → alpha_python-0.7.5}/src/alpha/adapters/sqla_unit_of_work.py

@@ -78,14 +78,22 @@ class SqlAlchemyUnitOfWork:
 
         return self
 
-    def __exit__(self, *args: Any) -> None:
-        """Finalize the Unit of Work context."""
+    def __exit__(self, exc_type: Any, exc_val: Any, exc_tb: Any) -> None:
+        """Finalize the Unit of Work context.
+
+        Roll back only when leaving the context because of an exception.
+        Rolling back after a successful commit can expire ORM state and may
+        trigger DetachedInstanceError once the session is closed/detached.
+        """
         if not self._session:
             raise exceptions.DatabaseSessionError(
                 "No active database session is defined"
             )
+
+        if exc_type is not None:
+            self._session.rollback()
+
         self._session.close()
-        self.rollback()
         self._session = None  # type: ignore
 
     def commit(self) -> None:

{alpha_python-0.7.4 → alpha_python-0.7.5}/src/alpha/providers/ldap_provider.py

@@ -45,6 +45,7 @@ class LDAPProvider(JWTProviderMixin):
         populate_groups: bool = True,
         populate_permissions: bool = False,
         populate_claims: bool = True,
+        flatten_claims: bool = True,
         auto_connect: bool = True,
         change_password_supported: bool = False,
         additional_connector_params: dict[str, Any] | None = None,
@@ -71,6 +72,9 @@ class LDAPProvider(JWTProviderMixin):
             Whether to populate permissions in the Identity, by default False
         populate_claims
             Whether to populate claims in the Identity, by default True
+        flatten_claims
+            Whether to flatten single-value claims in the Identity, by default
+            True
         auto_connect
             Whether to automatically connect using the connector, by default
             True
@@ -89,6 +93,7 @@ class LDAPProvider(JWTProviderMixin):
         self._populate_groups = populate_groups
         self._populate_permissions = populate_permissions
         self._populate_claims = populate_claims
+        self._flatten_claims = flatten_claims
         self._auto_connect = auto_connect
         self._change_password_supported = change_password_supported
         self._additional_connector_params = additional_connector_params or {
@@ -297,6 +302,7 @@ class LDAPProvider(JWTProviderMixin):
             populate_claims=self._populate_claims,
             populate_groups=self._populate_groups,
             populate_permissions=self._populate_permissions,
+            flatten_claims=self._flatten_claims,
         )
         return identity
 
@@ -324,6 +330,7 @@ class ADProvider(LDAPProvider):
         populate_groups: bool = True,
         populate_permissions: bool = False,
         populate_claims: bool = True,
+        flatten_claims: bool = True,
         auto_connect: bool = True,
         change_password_supported: bool = False,
     ) -> None:
@@ -356,6 +363,9 @@ class ADProvider(LDAPProvider):
         populate_claims
             Whether to populate claims on the :class:`Identity`, by default
             True.
+        flatten_claims
+            Whether to flatten single-value claims in the Identity, by default
+            True
         auto_connect
             Whether to automatically open the LDAP connection on first use, by
             default True.
@@ -373,6 +383,7 @@ class ADProvider(LDAPProvider):
             populate_groups=populate_groups,
             populate_permissions=populate_permissions,
             populate_claims=populate_claims,
+            flatten_claims=flatten_claims,
             auto_connect=auto_connect,
             change_password_supported=change_password_supported,
         )

{alpha_python-0.7.4 → alpha_python-0.7.5}/src/alpha/providers/models/identity.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from typing import Mapping, Any, Self, Sequence, TYPE_CHECKING
+from typing import Mapping, Any, Self, Sequence, TYPE_CHECKING, cast
 from datetime import datetime, timezone
 
 from alpha.domain.models.group import Group
@@ -160,6 +160,7 @@ class Identity:
         populate_groups: bool = True,
         populate_permissions: bool = False,
         populate_claims: bool = True,
+        flatten_claims: bool = False,
     ) -> Identity:
         """Instantiate an Identity from an LDAP entry dictionary.
 
@@ -178,6 +179,9 @@ class Identity:
         populate_claims
             Whether to populate the claims dictionary from the LDAP entry, by
             default True
+        flatten_claims
+            Whether to replace claim lists containing a single value with that
+            value, by default False
 
         Returns
         -------
@@ -188,6 +192,12 @@ class Identity:
         if not username:
             username = cls._get_key(entry, mappings["subject"])
 
+        claims = (
+            cls._remove_password_from_claims(entry) if populate_claims else {}
+        )
+        if populate_claims and flatten_claims:
+            claims = cls.flatten_single_value_claims(claims)
+
         return cls(
             subject=cls._get_key(entry, mappings["subject"], ""),
             username=username,
@@ -204,11 +214,7 @@ class Identity:
                 if populate_permissions
                 else []
             ),
-            claims=(
-                cls._remove_password_from_claims(entry)
-                if populate_claims
-                else {}
-            ),
+            claims=claims,
             issued_at=datetime.now(tz=timezone.utc),
         )
 
@@ -430,6 +436,37 @@ class Identity:
         }
         return filtered_claims
 
+    @staticmethod
+    def flatten_single_value_claims(
+        claims: Mapping[str, Any],
+    ) -> Mapping[str, Any]:
+        """Replace single-value claim lists with their contained value.
+
+        Password-related claims (keys containing "password", case-insensitive)
+        are removed before flattening.
+
+        Parameters
+        ----------
+        claims
+            Original claims dictionary.
+
+        Returns
+        -------
+        Mapping[str, Any]
+            A new claims dictionary with password-related keys removed and
+            single-value lists replaced by their contained value.
+        """
+        claims = Identity._remove_password_from_claims(claims)
+
+        return {
+            key: (
+                value[0]
+                if isinstance(value, list) and len(cast(list[Any], value)) == 1
+                else value
+            )
+            for key, value in claims.items()
+        }
+
     @staticmethod
     def _extract_groups(
         entry: Mapping[str, Any],

{alpha_python-0.7.4 → alpha_python-0.7.5}/src/alpha/providers/oidc_provider.py

@@ -57,6 +57,7 @@ class OIDCProvider(JWTProviderMixin):
         populate_groups: bool = True,
         populate_permissions: bool = False,
         populate_claims: bool = False,
+        flatten_claims: bool = True,
         change_password_supported: bool = False,
     ) -> None:
         """Initialize OIDCProvider.
@@ -90,6 +91,7 @@ class OIDCProvider(JWTProviderMixin):
         self._populate_groups = populate_groups
         self._populate_permissions = populate_permissions
         self._populate_claims = populate_claims
+        self._flatten_claims = flatten_claims
         self._change_password_supported = change_password_supported
 
     def authenticate(self, credentials: PasswordCredentials) -> Identity:
@@ -237,6 +239,9 @@ class OIDCProvider(JWTProviderMixin):
 
         audience = self._extract_audience(claims)
 
+        if self._populate_claims and self._flatten_claims:
+            claims = Identity.flatten_single_value_claims(claims)
+
         identity = Identity(
             subject=str(subject),
             username=username,
@@ -244,7 +249,7 @@ class OIDCProvider(JWTProviderMixin):
             display_name=self._get_claim(claims, "display_name"),
             groups=groups,
             permissions=permissions,
-            claims=dict(claims) if self._populate_claims else {},
+            claims=claims if self._populate_claims else {},
             issued_at=issued_at,
             audience=audience,
             role=self._get_claim(claims, "role"),
@@ -403,6 +408,7 @@ class KeyCloakProvider(OIDCProvider):
         populate_groups: bool = True,
         populate_permissions: bool = False,
         populate_claims: bool = False,
+        flatten_claims: bool = True,
         change_password_supported: bool = False,
     ) -> None:
         """Initialize KeyCloakProvider.
@@ -427,6 +433,9 @@ class KeyCloakProvider(OIDCProvider):
             Whether to populate permissions on the Identity.
         populate_claims
             Whether to include raw claims on the Identity.
+        flatten_claims
+            Whether to flatten single-value claims when populating raw claims
+            on the Identity.
         change_password_supported
             Whether this provider supports changing passwords.
         """
@@ -437,5 +446,6 @@ class KeyCloakProvider(OIDCProvider):
             populate_groups=populate_groups,
             populate_permissions=populate_permissions,
             populate_claims=populate_claims,
+            flatten_claims=flatten_claims,
             change_password_supported=change_password_supported,
         )

{alpha_python-0.7.4 → alpha_python-0.7.5}/src/alpha_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alpha-python
-Version: 0.7.4
+Version: 0.7.5
 Summary: Alpha is intended to be the first dependency you need to add to your Python application. It is a Python library which contains standard building blocks that can be used in applications that are used as APIs and/or make use of database interaction.
 Author-email: Bart Reijling <bart@reijling.eu>
 License-Expression: MIT