maleo-foundation 0.3.44__py3-none-any.whl → 0.3.45__py3-none-any.whl

maleo_foundation/authentication.py

@@ -1,6 +1,6 @@
-from pydantic import BaseModel, ConfigDict, Field, field_serializer
+from pydantic import BaseModel, ConfigDict, Field, model_validator
 from starlette.authentication import AuthCredentials, BaseUser
-from typing import Optional, Sequence
+from typing import Optional, Self, Sequence
 from maleo_foundation.enums import BaseEnums
 from maleo_foundation.models.transfers.general.token import MaleoFoundationTokenGeneralTransfers
 
@@ -21,6 +21,10 @@ class Credentials(AuthCredentials):
     def token(self) -> Optional[Token]:
         return self._token
 
+class CredentialsModel(BaseModel):
+    token: Optional[Token] = Field(None, description="Token")
+    scopes: Optional[Sequence[str]] = Field(None, description="Scopes")
+
 class User(BaseUser):
     def __init__(
         self,
@@ -44,23 +48,24 @@ class User(BaseUser):
     def identity(self) -> str:
         return self._email
 
+class UserModel(BaseModel):
+    is_authenticated: bool = Field(True, description="Authenticated")
+    display_name: str = Field("", description="Username")
+    identity: str = Field("", description="Email")
+
 class Authentication(BaseModel):
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
-    credentials: Credentials = Field(..., description="Credentials's information")
-    user: User = Field(..., description="User's information")
-
-    @field_serializer('credentials')
-    def serialize_credentials(self, credentials: Credentials, _info):
-        return {
-            "token": credentials.token.model_dump() if credentials.token is not None else None,
-            "scopes": credentials.scopes if credentials.scopes is not None else None
-        }
+    credentials: Credentials = Field(..., description="Credentials's information", exclude=True)
+    credentials_model: CredentialsModel = Field(default_factory=CredentialsModel, description="Credential's model", serialization_alias="credentials")
+    user: User = Field(..., description="User's information", exclude=True)
+    user_model: UserModel = Field(default_factory=UserModel, description="User's model", serialization_alias="user")
 
-    @field_serializer('user')
-    def serialize_user(self, user: User, _info):
-        return {
-            "is_authenticated": user.is_authenticated,
-            "display_name": user.display_name,
-            "identity": user.identity
-        }
+    @model_validator(mode="after")
+    def define_models(self) -> Self:
+        self.credentials_model.token = self.credentials.token
+        self.credentials_model.scopes = self.credentials.scopes
+        self.user_model.is_authenticated = self.user.is_authenticated
+        self.user_model.display_name = self.user.display_name
+        self.user_model.identity = self.user.identity
+        return self

{maleo_foundation-0.3.44.dist-info → maleo_foundation-0.3.45.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: maleo_foundation
-Version: 0.3.44
+Version: 0.3.45
 Summary: Foundation package for Maleo
 Author-email: Agra Bima Yuda <agra@nexmedis.com>
 License: MIT

{maleo_foundation-0.3.44.dist-info → maleo_foundation-0.3.45.dist-info}/RECORD

@@ -1,5 +1,5 @@
 maleo_foundation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo_foundation/authentication.py,sha256=2Fw6rrSnJj7i18UpWovJRKthZyZdq3sLKnkGVYP3wqM,2138
+maleo_foundation/authentication.py,sha256=ZclIn7IZ5VkoCjrWkINifpM8utc69jcv9Dypaw8Jy1U,2658
 maleo_foundation/authorization.py,sha256=HGXCJ47AU1YFMDSmGhrMMmlHnAyghcFZVUiPa1FSvog,283
 maleo_foundation/constants.py,sha256=LjMIy_Fcr6HLuhIuXs5lCtkyScZXXHOtBMPYx5lwg00,1446
 maleo_foundation/enums.py,sha256=x6hVz0gvrKRF1ng8lMgVzwfiA_F6Y4vuOU4rBOgtTUg,4758
@@ -133,7 +133,7 @@ maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg
 maleo_foundation/utils/loaders/credential/google.py,sha256=ZglnLdW3lHmaKER4mwGe5N5ERus-bdsamfpwGmQYPIo,6344
 maleo_foundation/utils/loaders/key/__init__.py,sha256=hVygcC2ImHc_aVrSrOmyedR8tMUZokWUKCKOSh5ctbo,106
 maleo_foundation/utils/loaders/key/rsa.py,sha256=gDhyX6iTFtHiluuhFCozaZ3pOLKU2Y9TlrNMK_GVyGU,3796
-maleo_foundation-0.3.44.dist-info/METADATA,sha256=2_3jtAGsVlUYE-_D93ljfnRvx7fWqiY3wIQqZUEA11g,3740
-maleo_foundation-0.3.44.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-maleo_foundation-0.3.44.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.3.44.dist-info/RECORD,,
+maleo_foundation-0.3.45.dist-info/METADATA,sha256=Qljq493qxzugl31BQkTxd159N6xSCgM7n2CmSTW9bzg,3740
+maleo_foundation-0.3.45.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+maleo_foundation-0.3.45.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.3.45.dist-info/RECORD,,