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

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

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

{maleo_foundation-0.2.36 → maleo_foundation-0.2.39}/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-0.2.36 → maleo_foundation-0.2.39}/maleo_foundation/models/responses.py

@@ -125,5 +125,9 @@ class BaseResponses:
         status.HTTP_500_INTERNAL_SERVER_ERROR: {
             "description": "Internal Server Error Response",
             "model": ServerError
+        },
+        status.HTTP_501_NOT_IMPLEMENTED: {
+            "description": "Not Implemented Response",
+            "model": ServerError
         }
     }

{maleo_foundation-0.2.36 → maleo_foundation-0.2.39}/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.36 → maleo_foundation-0.2.39}/maleo_foundation.egg-info/PKG-INFO

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

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

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