maleo-foundation 0.2.39__py3-none-any.whl → 0.2.41__py3-none-any.whl

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/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/models/transfers/general/token.py

@@ -8,9 +8,9 @@ from maleo_foundation.models.schemas.token import MaleoFoundationTokenSchemas
 class MaleoFoundationTokenGeneralTransfers:
     class BasePayload(BaseModel):
         iss:BaseTypes.OptionalString = Field(None, description="Token's issuer")
-        sub:BaseTypes.OptionalString = Field(None, description="Token's subject")
+        sub:str = Field(..., description="Token's subject")
         sr:str = Field(..., description="System role")
-        u_i:str = Field(..., description="user's id")
+        u_i:int = Field(..., description="user's id")
         u_uu:UUID = Field(..., description="user's uuid")
         u_u:str = Field(..., description="user's username")
         u_e:str = Field(..., description="user's email")

{maleo_foundation-0.2.39.dist-info → maleo_foundation-0.2.41.dist-info}/METADATA

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

{maleo_foundation-0.2.39.dist-info → maleo_foundation-0.2.41.dist-info}/RECORD

@@ -1,5 +1,5 @@
 maleo_foundation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-maleo_foundation/authentication.py,sha256=kJfuRKgQY5cjmn0r36z4a4jF4bg7UifZ9D9mgMMnTsw,1840
+maleo_foundation/authentication.py,sha256=kmM2QKh0st2p2pac9MKP7yYNpJzI0cFwTOrMtoQ0gMI,1575
 maleo_foundation/authorization.py,sha256=euq24UEhTaimmM24Ies-kZF1zqVwM_x0Zox_6k7zyqI,281
 maleo_foundation/constants.py,sha256=aBmEfWlBqZxi0k-n6h2NM1YRLOjMnheEiLyQcjP-zCQ,1164
 maleo_foundation/enums.py,sha256=OLVgb0rKk2gfG19FEyq9YGrQcmovr_FgtGFUcIu23Lo,3596
@@ -46,7 +46,7 @@ maleo_foundation/managers/client/google/base.py,sha256=eIdd6C2BFIu4EyZ1j017VZaJn
 maleo_foundation/managers/client/google/parameter.py,sha256=Lnj7mQgxWQpsQwbmDRK5_bF01M1QpM5PS0eZP2q17yQ,1337
 maleo_foundation/managers/client/google/secret.py,sha256=Ski1CHYeA8vjSk2Oc2Pf4CfFrzT_RcA6NEZwza7gM7Y,4464
 maleo_foundation/managers/client/google/storage.py,sha256=ECyEBgEvvbTDVfqXey-meGnoU4qvIRU32BxbCuzcaHU,2576
-maleo_foundation/middlewares/authentication.py,sha256=y3FEvcB8I8piCQIvvDRl2F2tCmspOVJx3jrSGI6HPn4,4702
+maleo_foundation/middlewares/authentication.py,sha256=yfM9e0YJqwFrLNkUk8eIJVJ-eyRY6u4c1yrWUmVMJuc,4678
 maleo_foundation/middlewares/base.py,sha256=8_ENtyB2iKejCOQofESzlAaq_zxDWtHNaq3f10dA020,14554
 maleo_foundation/middlewares/cors.py,sha256=9uvBvY2N6Vxa9RP_YtESxcWo6Doi6uS0lzAG9iLY7Uc,2288
 maleo_foundation/models/__init__.py,sha256=AaKehO7c1HyKhoTGRmNHDddSeBXkW-_YNrpOGBu8Ms8,246
@@ -65,7 +65,7 @@ maleo_foundation/models/transfers/__init__.py,sha256=oJLJ3Geeme6vBw7R2Dhvdvg4ziV
 maleo_foundation/models/transfers/general/__init__.py,sha256=UPIE9l9XXCb6nWzaV3atMgbbCeBeRzsvFyROJuH2d2w,168
 maleo_foundation/models/transfers/general/key.py,sha256=tLKkXbwNu7Oc1MdKa8-Y7TlBAIk54h_02AmL5Yg2PrQ,751
 maleo_foundation/models/transfers/general/signature.py,sha256=J9xQy2HjpCQOnES7RJqsUnDgjFPuakQ1mxyfdTdstSE,297
-maleo_foundation/models/transfers/general/token.py,sha256=_Uxvo5VE0uP688kW5_aukV_wnwEDhYG-wfhMuElyhOE,2917
+maleo_foundation/models/transfers/general/token.py,sha256=O_U6dQS7oMScJzqufl6Pe21pTxMsYhOzKH8aFLxjblQ,2895
 maleo_foundation/models/transfers/parameters/__init__.py,sha256=oKW4RPIEISISRjsJzD8lsCGY1HhZRTzshPpWHcJu86k,353
 maleo_foundation/models/transfers/parameters/client.py,sha256=3X1iCThKr72_vds4gdldB0YxTlXoLTF1rGbsXyjyBpg,4051
 maleo_foundation/models/transfers/parameters/general.py,sha256=WoekZJCIoAllhXdRIJkNRdNq0QEIn0bteiHJLtzkCxU,579
@@ -117,7 +117,7 @@ maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg
 maleo_foundation/utils/loaders/credential/google.py,sha256=SKsqPuFnAiCcYLf24CxKnMybhVHpgqnq1gGSlThqjts,994
 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.2.39.dist-info/METADATA,sha256=vD65cJJDT5TfqC1WXFOevdkB8ot0qOfX3HLm_pkgaOc,3598
-maleo_foundation-0.2.39.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-maleo_foundation-0.2.39.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.2.39.dist-info/RECORD,,
+maleo_foundation-0.2.41.dist-info/METADATA,sha256=DLgcwbVIoByJAS1mCAYMd5QD18S1MvskFTAkKio7ceM,3598
+maleo_foundation-0.2.41.dist-info/WHEEL,sha256=zaaOINJESkSfm_4HQVc5ssNzHCPXhJm0kEUakpsEHaU,91
+maleo_foundation-0.2.41.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.2.41.dist-info/RECORD,,

{maleo_foundation-0.2.39.dist-info → maleo_foundation-0.2.41.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.7.1)
+Generator: setuptools (80.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any