maleo-foundation 0.2.2__tar.gz → 0.2.4__tar.gz

{maleo_foundation-0.2.2 → maleo_foundation-0.2.4}/PKG-INFO

@@ -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 → maleo_foundation-0.2.4}/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-0.2.2 → maleo_foundation-0.2.4}/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-0.2.2 → maleo_foundation-0.2.4}/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 → maleo_foundation-0.2.4}/maleo_foundation.egg-info/PKG-INFO

@@ -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 → maleo_foundation-0.2.4}/pyproject.toml

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