maleo-foundation 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

maleo_foundation/client/services/token.py

@@ -30,7 +30,7 @@ class MaleoFoundationTokenClientService(ClientService):
                 description = "Unexpected error occured while trying to import key"
                 other = "Ensure given key is valid"
                 return MaleoFoundationTokenResultsTransfers.Fail(message=message, description=description, other=other)
-            payload = MaleoFoundationTokenGeneralTransfers.EncodePayload.model_validate(parameters.payload.model_dump()).model_dump(mode="json")
+            payload = MaleoFoundationTokenGeneralTransfers.EncodePayload.model_validate(parameters.payload.model_dump()).model_dump(mode="json", exclude_none=True)
             token = jwt.encode(payload=payload, key=private_key.export_key(), algorithm="RS256")
             data = MaleoFoundationTokenSchemas.Token(token=token)
             return MaleoFoundationTokenResultsTransfers.Encode(data=data)

maleo_foundation/managers/service.py

@@ -36,9 +36,9 @@ class Settings(BaseSettings):
     GOOGLE_CREDENTIALS_PATH:str = Field("credentials/maleo-google-service-account.json", description="Internal credential's file path")
     STATIC_CONFIGURATIONS_PATH:str = Field("configs/static.yaml", description="Maleo's static configurations path")
     RUNTIME_CONFIGURATIONS_PATH:str = Field("configs/runtime.yaml", description="Service's runtime configurations path")
-    TOKEN_MANAGER_URL:str = Field(..., description="Maleo Token's manager")
 
 class MaleoCredentials(BaseModel):
+    id:int = Field(..., description="ID")
     username:str = Field(..., description="Username")
     email:str = Field(..., description="Email")
     password:str = Field(..., description="Password")
@@ -176,10 +176,12 @@ class ServiceManager:
         return self._cloud_storage
 
     def _load_maleo_credentials(self) -> None:
+        environment = BaseEnums.EnvironmentType.STAGING if self._settings.ENVIRONMENT == BaseEnums.EnvironmentType.LOCAL else self._settings.ENVIRONMENT
+        id = int(self._secret_manager.get(f"maleo-service-account-id-{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(username=username, email=email, password=password)
+        self._maleo_credentials = MaleoCredentials(id=id, username=username, email=email, password=password)
 
     @property
     def maleo_credentials(self) -> MaleoCredentials:
@@ -262,7 +264,7 @@ class ServiceManager:
     def token(self) -> str:
         payload = MaleoFoundationTokenGeneralTransfers.BaseEncodePayload(
             iss=None,
-            sub=None,
+            sub=str(self._maleo_credentials.id),
             sr="administrator",
             u_u=self._maleo_credentials.username,
             u_e=self._maleo_credentials.email,

maleo_foundation/models/transfers/general/token.py

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

{maleo_foundation-0.2.2.dist-info → maleo_foundation-0.2.4.dist-info}/METADATA

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

{maleo_foundation-0.2.2.dist-info → maleo_foundation-0.2.4.dist-info}/RECORD

@@ -9,7 +9,7 @@ maleo_foundation/client/manager.py,sha256=pFWLFYW4eE9MLyFmFS05IgnMBdqqUHbdyTkSbn
 maleo_foundation/client/services/__init__.py,sha256=uIBnAeQ9a2otQbUAbKBQfYrkEUugXjxXoV8W5QYHuic,1051
 maleo_foundation/client/services/key.py,sha256=Av8OFEJO8-Chlu-lRzR4or1qkJ0ahxtiHwkqF4ktDD4,5537
 maleo_foundation/client/services/signature.py,sha256=brEnNPrkeChx0niDgAYCI2HeANQGHpPI6a0lARGCbZ4,4498
-maleo_foundation/client/services/token.py,sha256=y8iy744znjv2y4sa2Zd3WQhRJThr3pV4Xq2yj1iOGnw,4100
+maleo_foundation/client/services/token.py,sha256=6kQTDsL1XbA-kyxIW4EySoJf8ORAQtjvQSNrZPIf5eA,4119
 maleo_foundation/client/services/encryption/__init__.py,sha256=qK9-RwivJ2xkMIwXI8XM8LmYboRTX6R3G9Nh3RxSdCM,594
 maleo_foundation/client/services/encryption/aes.py,sha256=RXsKqza-gETqHhTmULgldYf51_E6KtbTxhtTQroP4jI,3456
 maleo_foundation/client/services/encryption/rsa.py,sha256=pof7uYc9jkLLTrwfoWrkbLNByZW8jYwAbFF5h0nVgfM,4704
@@ -32,7 +32,7 @@ maleo_foundation/expanded_types/encryption/rsa.py,sha256=MuhB_DGrjnsl4t96W4pKuCt
 maleo_foundation/managers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/db.py,sha256=Pn5EZ-c1Hy6-BihN7KokHJWmBIt3Ty96fZ0zF-srtF4,5208
 maleo_foundation/managers/middleware.py,sha256=ODIQU1Hpu-Xempjjo_VRbVtxiD5oi74mNuoWuDawRh0,4250
-maleo_foundation/managers/service.py,sha256=B2wPRfqPyaZBHiRa5zv5PhxzHZpmWdCEM_Kvgjejxmc,16001
+maleo_foundation/managers/service.py,sha256=VggsQUS_i80_fGZYrErBALYXLLFx1JnE4prGJ0L6HjU,16240
 maleo_foundation/managers/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 maleo_foundation/managers/client/base.py,sha256=5z9l2GN4QASF0-Lft8o5QQ3SRPXqeNZNT1S1CgaE764,4384
 maleo_foundation/managers/client/maleo.py,sha256=iCM47TLL-RSQ2FkTmHVPdsb2JCd1LebMx6OJvIr4vCQ,2035
@@ -59,7 +59,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=ZTYwKR0A1lCFeJ2-atoIMAnGiiH7k5r71_XM7ftAAto,2698
+maleo_foundation/models/transfers/general/token.py,sha256=yj5wM9Wvc0BqyRRDtKiyaaLv-JQf51IIA604JWj-Cqw,2697
 maleo_foundation/models/transfers/parameters/__init__.py,sha256=oKW4RPIEISISRjsJzD8lsCGY1HhZRTzshPpWHcJu86k,353
 maleo_foundation/models/transfers/parameters/client.py,sha256=tn_Hwa-k-Utp5rODe7GylqZB8djIKKupgkUFscYCyLc,4059
 maleo_foundation/models/transfers/parameters/general.py,sha256=WoekZJCIoAllhXdRIJkNRdNq0QEIn0bteiHJLtzkCxU,579
@@ -107,7 +107,7 @@ maleo_foundation/utils/loaders/credential/__init__.py,sha256=qopTKvcMVoTFwyRijeg
 maleo_foundation/utils/loaders/credential/google.py,sha256=deksZXT5wPhEsSMHbZ3x05WHXxCjLDt76Ns-1Tmhp7g,948
 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.2.dist-info/METADATA,sha256=mIcEQlGj8vbph8W82-AOu2nsz5YQ-wfXQtxXHyqB_L8,3418
-maleo_foundation-0.2.2.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
-maleo_foundation-0.2.2.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.2.2.dist-info/RECORD,,
+maleo_foundation-0.2.4.dist-info/METADATA,sha256=x_39L6UXFNyvmLxpFW2aqL9dX5A_OC8AK-De7K58Kr0,3418
+maleo_foundation-0.2.4.dist-info/WHEEL,sha256=DnLRTWE75wApRYVsjgc6wsVswC54sMSJhAEd4xhDpBk,91
+maleo_foundation-0.2.4.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
+maleo_foundation-0.2.4.dist-info/RECORD,,