alpha-python 0.7.8__py3-none-any.whl → 0.7.9__py3-none-any.whl

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/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/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/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/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/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.dist-info → alpha_python-0.7.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: alpha-python
-Version: 0.7.8
+Version: 0.7.9
 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.dist-info → alpha_python-0.7.9.dist-info}/RECORD

@@ -15,7 +15,7 @@ alpha/domain/models/group.py,sha256=yrSDbt1MsQ-8rYl57jKlA-gJAn8q_qseT7T0LwgvFSs,
 alpha/domain/models/life_cycle_base.py,sha256=xRwcTPRR0pHwsBN_dyaN8d1AVuKOEF6iNCS0IWZntDY,875
 alpha/domain/models/permission.py,sha256=pqFu6WnqEqry9x8InPhXNTZInLcoY7fb9Fk8jMBRISw,3195
 alpha/domain/models/role.py,sha256=95cUc8VDB7o_IXJdTBF0KFJUyvOfRtpNkxTslzpVqIQ,4614
-alpha/domain/models/user.py,sha256=H64rNrjY9VV-ljux_HIEyxT0O4zlLaIXMzZLEyCKLZY,6868
+alpha/domain/models/user.py,sha256=zGyABzzQo1qWiI4CtFoD1J9GF3CwPj1UbxhIIrNqc-8,7277
 alpha/factories/__init__.py,sha256=baxoq0UY7UYust7NiR9wT954nJw5bfgSmOWvLjBt2C4,278
 alpha/factories/_type_conversion_matrix.py,sha256=mhMYpus6OFE0sZB0gQ-b1ndIOhiA1ScprvDa9tLANAM,5055
 alpha/factories/_type_mapping.py,sha256=f8cRfu8KUfw1ggY0Txs6fEX2e6GaXrsNcc2SCeYFRHM,789
@@ -70,7 +70,7 @@ alpha/infra/__init__.py,sha256=4eIKsW1N06_vVBrO2u1ESU5iURBb0cGvxcscaPsB4PE,1018
 alpha/infra/connectors/__init__.py,sha256=kEh_mOIIqkWeY4cilislM8ZjKXNFp8zBuMThfbJ1CGc,647
 alpha/infra/connectors/ldap_connector.py,sha256=Ce2IspqcrTEkYwlhxoh8QOzEK51-ZcJ9t6RCytk0Ob8,5132
 alpha/infra/connectors/oidc_connector.py,sha256=z9AY1lMVK5nULd80zOvJzo8zPbp6CHJ7fv2smp71eIs,15675
-alpha/infra/connectors/sql_alchemy.py,sha256=8DivUj25_OAVaXmaCsbSnHgOD1w5_ewAXSlZ-cxuMVk,5116
+alpha/infra/connectors/sql_alchemy.py,sha256=4SlETRrhIZtChPvgX2xLqyb8Kb4XCoB1uwNGHckRw3o,5145
 alpha/infra/databases/__init__.py,sha256=IyA_aB9h_7rOM-aa50QLsA_q4e9W4HnJOqh76aDyrj4,106
 alpha/infra/databases/sql_alchemy.py,sha256=7t17M8UEgW1NMX9LYW6A14EM5UxEJZyp-8a_xLEONAs,235
 alpha/infra/models/__init__.py,sha256=SIakw9bAPXwFmx3I7exCRBs3e2Ug3etOJy6JyIOR1Uc,348
@@ -108,7 +108,7 @@ alpha/providers/ldap_provider.py,sha256=nZhSvLXl-dWN6bEBQ6UO8r-xpb_QzY2m7mkzQA7a
 alpha/providers/oidc_provider.py,sha256=8-VWHzWYXpgwfqi64hnMYcT7Hp1p8Gr8I1EIPDgY6nA,14603
 alpha/providers/models/__init__.py,sha256=SI-qTA3JMOxXx4o1h7frk8x3PRj0g_GSCEbLzyvw7CI,409
 alpha/providers/models/credentials.py,sha256=IjGm1MpnUrwnTo1Of5eacNtkh72Iqj2uKTsoyq1po_o,1304
-alpha/providers/models/identity.py,sha256=M8b7uiaVYvtCgGV2nxEWrPPgbxUiWPbI-tGcMmaHtbE,16285
+alpha/providers/models/identity.py,sha256=5Sit9QrcX7J5YVaduXqV7F9jFwvnPotAWgBbUocIhKA,16559
 alpha/providers/models/token.py,sha256=xLiE-bWufbcWgkKpar5R2VAE8YhjyhWF44yN0Me9sJw,4793
 alpha/repositories/__init__.py,sha256=i4kyfLbLSHUzrqDF9Q96CgEaK-srPtEIspUD6uUjElk,787
 alpha/repositories/rest_api_repository.py,sha256=BC_M5_HPwWKwMRsHI2PNCmqu0SC5Tw9ZGhZ7eaLIFgw,48702
@@ -121,7 +121,7 @@ alpha/repositories/refresh/database_repository.py,sha256=b5Z0_nVairZOaqQ6OBb6_X2
 alpha/repositories/refresh/file_repository.py,sha256=EoygSFD7XLzSmnY1W2d3pdlNbQ0rcxwhRGNrlbMH62g,5490
 alpha/repositories/refresh/memory_repository.py,sha256=r0P2DVgTTDSqV8g1OaNf8knqpiysb-LaWW0pdS2wZaQ,3926
 alpha/services/__init__.py,sha256=yeUbS-N0127DSejbCAv9jbdKuHRa_H5Ue0CtsWf4ghI,224
-alpha/services/authentication_service.py,sha256=X1CPvXel_R9PRBlwh-6RDJdodgPq1MbbiUUUKnAMc3Y,29846
+alpha/services/authentication_service.py,sha256=3HBAz3orzxxM9loigIdNc3EHyRg8ongeF_zK0SAFSIU,29894
 alpha/services/user_lifecycle_management.py,sha256=yj0ITtD_WOCVo54KaNSC29XPixxdKi9ArvCMeQm6WKA,2696
 alpha/services/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 alpha/services/models/cookie.py,sha256=vxNLPtMmOGlxFLKdccxEV7hd_mPKmFCEao8SczNOilo,132
@@ -138,15 +138,15 @@ alpha/utils/secret_generator.py,sha256=LjsKb8oDfsfmCCcTKrqtw_duqJ7u3V_o6zGGuG26_
 alpha/utils/verify_identity.py,sha256=Y1pdcVl8Z_I4ibw2KY7i5QwTQrY29WwpBOJ6j0YOAow,2271
 alpha/utils/version_checker.py,sha256=W8v69hDbrr0VvJ40gpFmXMtVawrDmUz_YGWssKUTmVE,380
 alpha/utils/openapi_test/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-alpha/utils/openapi_test/container.py,sha256=5QRfRl4S3KiPjvsu4zOro5swlFAS8O3ZSSmkAT6_IRU,6638
+alpha/utils/openapi_test/container.py,sha256=xdQ22lSsr_CjInwVl4QRB2mJke9oiTDjgi9Mzsrlaik,6685
 alpha/utils/openapi_test/exceptions.py,sha256=FfVodhZrajSGQEZngKZRmlJCxjQP502OqQgu3qdtuN4,298
-alpha/utils/openapi_test/models.py,sha256=n5KCwdlpOiFcgvYlmFl-cMrvoOhmClodVC4hKH4fOvo,4996
+alpha/utils/openapi_test/models.py,sha256=5iZpUqgXy6T5f4v1XctD23l87m4g_pCVeuH09MbUv4A,5081
 alpha/utils/openapi_test/orm.py,sha256=Py95GV_0e7wI1MYDZR1_EHkvTgev6eNo70SVmnD7kGc,3045
 alpha/utils/openapi_test/response.py,sha256=IxbQ6Nw258LLViHkgfjOpc7zWGTP8ofVOX1zrwDoR50,270
 alpha/utils/openapi_test/service.py,sha256=WWR33FYr76zV7CD8OWYc1B0zofv3_DDo0jnRPV6uJuM,4948
-alpha_python-0.7.8.dist-info/licenses/LICENSE,sha256=5KwEqC3KUoH4lVXgZ9tGriKOl-LGxHkXBWo16mFmAYM,1070
-alpha_python-0.7.8.dist-info/METADATA,sha256=viK-l1AufOomnXyFtAicy4gy9qDSOBNnj8pdXCeBnvg,8639
-alpha_python-0.7.8.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-alpha_python-0.7.8.dist-info/entry_points.txt,sha256=LBEXdcofOugYYdZ46nz5Dxj_aj1QbRBkumfPGhy-GXI,41
-alpha_python-0.7.8.dist-info/top_level.txt,sha256=tqmNnOmi2RSSiPo99C03fD5Cc3r9za9xTjPAoQC1EGA,6
-alpha_python-0.7.8.dist-info/RECORD,,
+alpha_python-0.7.9.dist-info/licenses/LICENSE,sha256=5KwEqC3KUoH4lVXgZ9tGriKOl-LGxHkXBWo16mFmAYM,1070
+alpha_python-0.7.9.dist-info/METADATA,sha256=FM8botA-RX1qExZNw9obuJhGnvuhnjbKILY71DfQMtQ,8639
+alpha_python-0.7.9.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+alpha_python-0.7.9.dist-info/entry_points.txt,sha256=LBEXdcofOugYYdZ46nz5Dxj_aj1QbRBkumfPGhy-GXI,41
+alpha_python-0.7.9.dist-info/top_level.txt,sha256=tqmNnOmi2RSSiPo99C03fD5Cc3r9za9xTjPAoQC1EGA,6
+alpha_python-0.7.9.dist-info/RECORD,,