alpha-python 0.7.8__tar.gz → 0.7.10__tar.gz

{alpha_python-0.7.8 → alpha_python-0.7.10}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alpha-python
-Version: 0.7.8
+Version: 0.7.10
 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.8 → alpha_python-0.7.10}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "alpha-python"
-version = "0.7.8"
+version = "0.7.10"
 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.8 → alpha_python-0.7.10}/src/alpha/domain/models/user.py

@@ -205,3 +205,16 @@ class User(LifeCycleBase, BaseDomainModel):
         self.admin = obj.admin
 
         return cast(DomainModel, self)
+
+    def update_from_identity(self, identity: Identity) -> Self:
+        """Update the User instance with data from an Identity instance. Only
+        the email and display name are updated.
+
+        Parameters
+        ----------
+        identity
+            Identity object to update from.
+        """
+        self.email = identity.email
+        self.display_name = identity.display_name
+        return self

{alpha_python-0.7.8 → alpha_python-0.7.10}/src/alpha/handlers/templates/python-flask/__main__.mustache

@@ -89,9 +89,7 @@ app.add_api(
 @app.app.after_request
 def add_headers(response: Response):
     response_headers = container.config.response.headers()
-    is_swagger_ui_request = request.path == "/ui" or request.path.startswith(
-        "/ui/"
-    )
+    is_swagger_ui_request = "ui" in request.path.strip("/").split("/")
 
     if response_headers is None:
         response_headers = {

{alpha_python-0.7.8 → alpha_python-0.7.10}/src/alpha/infra/connectors/sql_alchemy.py

@@ -32,7 +32,7 @@ class SqlAlchemyDatabase:
     db_name
         Database name, by default ""
     db_type
-        Database type, by default "postgresql"
+        Database type and driver, by default "postgresql+psycopg2"
     conn_str
         Connection string. Can be used instead of host, port, username,
         password, and db_name, by default None
@@ -55,7 +55,7 @@ class SqlAlchemyDatabase:
         username: str = "",
         password: str = "",
         db_name: str = "",
-        db_type: str = "postgresql",
+        db_type: str = "postgresql+psycopg2",
         conn_str: str | None = None,
         schema_name: str = "public",
         create_schema: bool = True,

{alpha_python-0.7.8 → alpha_python-0.7.10}/src/alpha/providers/models/identity.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
+from enum import Enum
 from typing import Mapping, Any, Self, Sequence, TYPE_CHECKING, cast
 from datetime import datetime, timezone
 
@@ -321,18 +322,24 @@ class Identity:
             User object to update from.
         """
         self.username = user.username
-        if not self.email:
-            self.email = user.email
-        if not self.display_name:
-            self.display_name = user.display_name
+        self.role = (
+            user.role.name if isinstance(user.role, Enum) else user.role
+        )
+        self.admin = user.admin
         for permission in user.permissions or []:
             self.permissions = self._append_on_sequence(
                 self.permissions, str(permission)
             )
         for group in user.groups or []:
             self.groups = self._append_on_sequence(self.groups, str(group))
-        self.role = user.role  # type: ignore
-        self.admin = user.admin
+
+        # Update email and display name only if they are not already set. This
+        # ensures that existing values which are provided by an identity
+        # provider are not overwritten.
+        if not self.email:
+            self.email = user.email
+        if not self.display_name:
+            self.display_name = user.display_name
 
     def update_from_groups(self, groups: list[Group]) -> None:
         """Update the Identity permissions with data from a list of Group

{alpha_python-0.7.8 → alpha_python-0.7.10}/src/alpha/services/authentication_service.py

@@ -622,12 +622,13 @@ class AuthenticationService:
             )
             if user:
                 identity.update_from_user(user)
+                user.update_from_identity(identity)
 
             else:
                 # Create new user from identity if not found in database
                 user = self._user_model.from_identity(identity)
                 users.add(user)
-                self.uow.commit()
+            self.uow.commit()
 
         return identity
 

{alpha_python-0.7.8 → alpha_python-0.7.10}/src/alpha/utils/openapi_test/container.py

@@ -147,7 +147,9 @@ def init_container():
                 "username": os.getenv("TEST_PSQL_USERNAME", "postgres"),
                 "password": os.getenv("TEST_PSQL_PASSWORD", "postgres"),
                 "db_name": os.getenv("TEST_PSQL_DB_NAME", "postgres"),
-                "db_type": os.getenv("TEST_PSQL_DB_TYPE", "postgresql"),
+                "db_type": os.getenv(
+                    "TEST_PSQL_DB_TYPE", "postgresql+psycopg2"
+                ),
             },
             "authentication": {
                 "use_cookies": True,

{alpha_python-0.7.8 → alpha_python-0.7.10}/src/alpha/utils/openapi_test/models.py

@@ -62,6 +62,9 @@ class TestUser(LifeCycleBase, BaseDomainModel):
             display_name=identity.display_name,
         )
 
+    def update_from_identity(self, identity: Identity) -> None:
+        return None
+
 
 @dataclass
 class TestToken(BaseDomainModel):

{alpha_python-0.7.8 → alpha_python-0.7.10}/src/alpha_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alpha-python
-Version: 0.7.8
+Version: 0.7.10
 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