maleo-foundation 0.2.38__py3-none-any.whl → 0.2.40__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/managers/service.py

@@ -9,6 +9,7 @@ from starlette.exceptions import HTTPException
 from starlette.types import Lifespan, AppType
 from sqlalchemy import MetaData
 from typing import Optional
+from uuid import UUID
 from maleo_foundation.client.manager import MaleoFoundationClientManager
 from maleo_foundation.enums import BaseEnums
 from maleo_foundation.models.schemas.general import BaseGeneralSchemas
@@ -51,6 +52,7 @@ class Settings(BaseSettings):
 
 class MaleoCredentials(BaseModel):
     id:int = Field(..., description="ID")
+    uuid:UUID = Field(..., description="UUID")
     username:str = Field(..., description="Username")
     email:str = Field(..., description="Email")
     password:str = Field(..., description="Password")
@@ -210,11 +212,13 @@ class ServiceManager:
             else self._settings.ENVIRONMENT
         )
         id = int(self._secret_manager.get(f"maleo-service-account-id-{environment}"))
+        uuid = self._secret_manager.get(f"maleo-service-account-uuid-{environment}")
         email = self._secret_manager.get("maleo-service-account-email")
         username = self._secret_manager.get("maleo-service-account-username")
         password = self._secret_manager.get("maleo-service-account-password")
         self._maleo_credentials = MaleoCredentials(
             id=id,
+            uuid=UUID(uuid),
             username=username,
             email=email,
             password=password
@@ -372,6 +376,8 @@ class ServiceManager:
             iss=None,
             sub=str(self._maleo_credentials.id),
             sr="administrator",
+            u_i=self._maleo_credentials.id,
+            u_uu=self._maleo_credentials.uuid,
             u_u=self._maleo_credentials.username,
             u_e=self._maleo_credentials.email,
             u_ut="service",

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

@@ -1,6 +1,7 @@
 from __future__ import annotations
-from pydantic import BaseModel, Field, model_validator
 from datetime import datetime, timedelta, timezone
+from pydantic import BaseModel, Field, model_validator
+from uuid import UUID
 from maleo_foundation.types import BaseTypes
 from maleo_foundation.models.schemas.token import MaleoFoundationTokenSchemas
 
@@ -9,10 +10,13 @@ class MaleoFoundationTokenGeneralTransfers:
         iss:BaseTypes.OptionalString = Field(None, description="Token's issuer")
         sub:BaseTypes.OptionalString = Field(None, description="Token's subject")
         sr:str = Field(..., description="System role")
+        u_i:str = 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")
         u_ut:str = Field(..., description="user's type")
-        o_i:BaseTypes.OptionalInteger = Field(None, description="Organization's ID")
+        o_i:BaseTypes.OptionalInteger = Field(None, description="Organization's id")
+        o_uu:BaseTypes.OptionalUUID = Field(None, description="Organization's uuid")
         o_k:BaseTypes.OptionalString = Field(None, description="Organization's key")
         o_ot:BaseTypes.OptionalString = Field(None, description="Organization's type")
         uor:BaseTypes.OptionalListOfStrings = Field(None, description="User Organization Role")
@@ -21,7 +25,7 @@ class MaleoFoundationTokenGeneralTransfers:
         iat_dt:datetime = Field(..., description="Issued at (datetime)")
         iat:int = Field(..., description="Issued at (integer)")
         exp_dt:datetime = Field(..., description="Expired at (datetime)")
-        exp:int = Field(..., description="Expired at (integet)")
+        exp:int = Field(..., description="Expired at (integer)")
 
     class BaseEncodePayload(MaleoFoundationTokenSchemas.ExpIn, BasePayload): pass
 

{maleo_foundation-0.2.38.dist-info → maleo_foundation-0.2.40.dist-info}/METADATA

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

{maleo_foundation-0.2.38.dist-info → maleo_foundation-0.2.40.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
@@ -34,7 +34,7 @@ maleo_foundation/expanded_types/encryption/rsa.py,sha256=Esf_H8nMz2kOLAWa3M7dlD-
 maleo_foundation/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/db.py,sha256=cpY1IOiUytT9XXYtzS0E9OSYOuB7jBKo0XHe__uI1Jg,5340
 maleo_foundation/managers/middleware.py,sha256=77wRCC_CWc22nSDL-UJanO3rXmSB7wLzaAIXEFjXq6M,4249
-maleo_foundation/managers/service.py,sha256=i__-ISJ9YQi08nMRl6_j8jOVJB--A-tpGwWPF3FvoqM,18991
+maleo_foundation/managers/service.py,sha256=ner08wL3ewUGhTLto7HJMHwXu-YDJoMtMTHDm236Bdc,19265
 maleo_foundation/managers/cache/__init__.py,sha256=CeY0oof2bVl_v5WS-FKXNwn2gf3xrEMfUsHK9cHo59s,471
 maleo_foundation/managers/cache/base.py,sha256=YyPjde4KTsp2IHV6NdFMysa0ev-1GX1rtX-0jQPuIBU,837
 maleo_foundation/managers/cache/redis.py,sha256=xLa8QfXdNtghs0eBxIqc04H3XTYmxLEzrqJZAFCigvM,1150
@@ -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=QckgF39hRAFU9GNXZsQ20kfaGom5Ppw5ShYaqDbeje8,2698
+maleo_foundation/models/transfers/general/token.py,sha256=_Uxvo5VE0uP688kW5_aukV_wnwEDhYG-wfhMuElyhOE,2917
 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.38.dist-info/METADATA,sha256=Nxto_ED9tn2pyHaeZ3-0PCADZzFKqDzULDPqvdlkaXA,3598
-maleo_foundation-0.2.38.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-maleo_foundation-0.2.38.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.2.38.dist-info/RECORD,,
+maleo_foundation-0.2.40.dist-info/METADATA,sha256=pz64jixUYTs4Rd6Av7_ToszZYPEfglgJw9lXXbOzkLk,3598
+maleo_foundation-0.2.40.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+maleo_foundation-0.2.40.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.2.40.dist-info/RECORD,,