maleo-foundation 0.2.39__tar.gz → 0.2.40__tar.gz

{maleo_foundation-0.2.39 → maleo_foundation-0.2.40}/PKG-INFO

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

{maleo_foundation-0.2.39 → maleo_foundation-0.2.40}/maleo_foundation/authentication.py

@@ -5,31 +5,23 @@ from maleo_foundation.enums import BaseEnums
 from maleo_foundation.models.transfers.general.token import MaleoFoundationTokenGeneralTransfers
 from maleo_foundation.types import BaseTypes
 
+class Token(BaseModel):
+    type:BaseEnums.TokenType = Field(..., description="Token's type")
+    payload:MaleoFoundationTokenGeneralTransfers.DecodePayload = Field(..., description="Token's payload")
+
 class Credentials(AuthCredentials):
     def __init__(
         self,
-        token_type:Optional[BaseEnums.TokenType] = None,
-        token:BaseTypes.OptionalString = None,
-        payload:Optional[MaleoFoundationTokenGeneralTransfers.DecodePayload] = None,
+        token:Optional[Token] = None,
         scopes:Optional[Sequence[str]] = None
     ) -> None:
-        self._token_type = token_type
         self._token = token
-        self._payload = payload
         super().__init__(scopes)
 
     @property
-    def token_type(self) -> Optional[BaseEnums.TokenType]:
-        return self._token_type
-
-    @property
-    def token(self) -> BaseTypes.OptionalString:
+    def token(self) -> Optional[Token]:
         return self._token
 
-    @property
-    def payload(self) -> Optional[MaleoFoundationTokenGeneralTransfers.DecodePayload]:
-        return self._payload
-
 class User(BaseUser):
     def __init__(
         self,

{maleo_foundation-0.2.39 → maleo_foundation-0.2.40}/maleo_foundation/middlewares/authentication.py

@@ -3,7 +3,7 @@ from starlette.authentication import AuthenticationBackend, AuthenticationError
 from starlette.middleware.authentication import AuthenticationMiddleware
 from starlette.requests import HTTPConnection
 from typing import Tuple
-from maleo_foundation.authentication import Credentials, User
+from maleo_foundation.authentication import Token, Credentials, User
 from maleo_foundation.enums import BaseEnums
 from maleo_foundation.client.manager import MaleoFoundationClientManager
 from maleo_foundation.models.schemas import BaseGeneralSchemas
@@ -33,7 +33,7 @@ class Backend(AuthenticationBackend):
             scheme, token = parts
             if scheme != 'Bearer':
                 raise AuthenticationError("Authorization scheme must be Bearer token")
-            
+
             #* Decode token
             decode_token_parameters = (
                 MaleoFoundationTokenParametersTransfers
@@ -44,12 +44,12 @@ class Backend(AuthenticationBackend):
                 .decode(parameters=decode_token_parameters)
             )
             if decode_token_result.success:
+                type = BaseEnums.TokenType.ACCESS
                 payload = decode_token_result.data
+                token = Token(type, payload)
                 return (
                     Credentials(
-                        token_type=BaseEnums.TokenType.ACCESS,
                         token=token,
-                        payload=payload,
                         scopes=["authenticated", payload.sr]
                     ),
                     User(
@@ -71,12 +71,12 @@ class Backend(AuthenticationBackend):
                 .decode(parameters=decode_token_parameters)
             )
             if decode_token_result.success:
+                type = BaseEnums.TokenType.ACCESS
                 payload = decode_token_result.data
+                token = Token(type, payload)
                 return (
                     Credentials(
-                        token_type=BaseEnums.TokenType.REFRESH,
                         token=token,
-                        payload=payload,
                         scopes=["authenticated", payload.sr]
                     ),
                     User(

{maleo_foundation-0.2.39 → maleo_foundation-0.2.40}/maleo_foundation.egg-info/PKG-INFO

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

{maleo_foundation-0.2.39 → maleo_foundation-0.2.40}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "maleo_foundation"
-version = "0.2.39"
+version = "0.2.40"
 description = "Foundation package for Maleo"
 authors = [
     { name = "Agra Bima Yuda", email = "agra@nexmedis.com" }