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

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/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/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.dist-info → maleo_foundation-0.2.39.dist-info}/METADATA

@@ -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.dist-info → maleo_foundation-0.2.39.dist-info}/RECORD

@@ -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
@@ -50,7 +50,7 @@ maleo_foundation/middlewares/authentication.py,sha256=y3FEvcB8I8piCQIvvDRl2F2tCm
 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
-maleo_foundation/models/responses.py,sha256=_9yOON2OIxFSE9KcUNCvnofO4WjdAJhI-svWep_4Q0E,5081
+maleo_foundation/models/responses.py,sha256=nszxzni_Q_42bzjrKvUVGeB3GSn4Ba9g-Nqj1dfdJvk,5223
 maleo_foundation/models/table.py,sha256=tcOwj_Heqi6ode8rbD4eeSiixEYsAtUaUyJyqrYaMAw,1327
 maleo_foundation/models/schemas/__init__.py,sha256=Xj8Ahsqyra-fmEaVcGPok5GOOsPQlKcknHYMvbjvENA,277
 maleo_foundation/models/schemas/encryption.py,sha256=KYs2P57AqWpEROuqTuSuyt1Zk-jsIUKFeRWIfSwem74,658
@@ -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.36.dist-info/METADATA,sha256=KH5ZivrQHz8SmWQuS8IaxoSkusjveDBIJBrtJwQQgl8,3598
-maleo_foundation-0.2.36.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-maleo_foundation-0.2.36.dist-info/top_level.txt,sha256=_iBos3F_bhEOdjOnzeiEYSrCucasc810xXtLBXI8cQc,17
-maleo_foundation-0.2.36.dist-info/RECORD,,
+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,,