Metatx under resources control

engineapi/engineapi/data.py

@@ -247,6 +247,7 @@ class UpdateContractRequest(BaseModel):
 class RegisteredContractResponse(BaseModel):
     id: UUID
     blockchain: Optional[str] = None
+    chain_id: Optional[int] = None
     address: str
     metatx_requester_id: UUID
     title: Optional[str] = None
@@ -267,6 +268,23 @@ class Config:
         orm_mode = True
 
 
+class RegisteredContractHolderResponse(BaseModel):
+    holder_id: UUID
+    holder_type: str
+    permissions: List[str] = Field(default_factory=list)
+    name: Optional[str] = None
+
+
+class RegisteredContractWithHoldersResponse(RegisteredContractResponse):
+    holders: List[RegisteredContractHolderResponse] = Field(default_factory=list)
+
+
+class MetatxRequestersResponse(BaseModel):
+    metatx_requester_id: UUID
+    registered_contracts_count: int
+    call_requests_count: int
+
+
 class CallSpecification(BaseModel):
     caller: str
     method: str

engineapi/engineapi/middleware.py

@@ -4,7 +4,7 @@
 from typing import Any, Awaitable, Callable, Dict, List, Optional, Sequence, Set, Tuple
 from uuid import UUID
 
-from bugout.data import BugoutResource, BugoutResources, BugoutUser
+from bugout.data import BugoutResource, BugoutResources, BugoutUserWithGroups
 from bugout.exceptions import BugoutResponseException
 from eip712.messages import EIP712Message, _hash_eip191_message
 from eth_account.messages import encode_defunct
@@ -72,11 +72,11 @@ def parse_auth_header(auth_header: str) -> Tuple[str, str]:
     return auth_list[0], auth_list[1]
 
 
-def bugout_auth(token: str) -> BugoutUser:
+def bugout_auth(token: str) -> BugoutUserWithGroups:
     """
     Extended bugout.get_user with additional checks.
     """
-    user: BugoutUser = bc.get_user(token)
+    user: BugoutUserWithGroups = bc.auth(token)
     if not user.verified:
         raise BugoutUnverifiedAuth("Only verified accounts can have access")
     if str(user.application_id) != str(MOONSTREAM_APPLICATION_ID):
@@ -85,9 +85,9 @@ def bugout_auth(token: str) -> BugoutUser:
     return user
 
 
-def brood_auth(token: UUID) -> BugoutUser:
+def brood_auth(token: UUID) -> BugoutUserWithGroups:
     try:
-        user: BugoutUser = bugout_auth(token=token)
+        user: BugoutUserWithGroups = bugout_auth(token=token)
     except BugoutUnverifiedAuth:
         logger.info(f"Attempted access by unverified Brood account: {user.id}")
         raise EngineHTTPException(
@@ -116,19 +116,17 @@ def brood_auth(token: UUID) -> BugoutUser:
 
 async def request_user_auth(
     token: UUID = Depends(oauth2_scheme),
-) -> BugoutUser:
+) -> Tuple[BugoutUserWithGroups, UUID]:
     user = brood_auth(token=token)
-
-    return user
+    return user, token
 
 
 async def request_none_or_user_auth(
     authorization: str = Header(None),
-) -> Optional[BugoutUser]:
+) -> Optional[Tuple[BugoutUserWithGroups, UUID]]:
     """
     Fetch Bugout user if authorization token provided.
     """
-    user: Optional[BugoutUser] = None
     if authorization is not None:
         token: str = ""
         try:
@@ -143,8 +141,9 @@ async def request_none_or_user_auth(
 
         if token != "":
             user = brood_auth(token=token)
+            return user, token
 
-    return user
+    return None
 
 
 async def metatx_verify_header(
@@ -239,7 +238,7 @@ async def dispatch(
             return Response(status_code=500, content="Internal server error")
 
         try:
-            user: BugoutUser = bugout_auth(token=user_token)
+            user: BugoutUserWithGroups = bugout_auth(token=user_token)
         except BugoutUnverifiedAuth:
             logger.info(f"Attempted access by unverified Brood account: {user.id}")
             return Response(

engineapi/engineapi/models.py

@@ -9,12 +9,12 @@
     Column,
     DateTime,
     ForeignKey,
+    ForeignKeyConstraint,
     Index,
     Integer,
     MetaData,
     String,
     UniqueConstraint,
-    ForeignKeyConstraint,
 )
 from sqlalchemy.dialects.postgresql import JSONB, UUID
 from sqlalchemy.ext.compiler import compiles
@@ -176,9 +176,12 @@ class CallRequestType(Base):  # type: ignore
     description = Column(String, nullable=True)
 
 
+# TODO(kompotkot): Since this migrated under resource control, this table should be dropped, but
+# first ForeignKey with CASCADE from registered_contracts and call_requests and replace it
+# with simple UUID(as_uuid=True) column.
 class MetatxRequester(Base):  # type: ignore
     """
-    MetatxRequester represents id of user from bugout authorization.
+    MetatxRequester represents id of resource at Bugout.
     """
 
     __tablename__ = "metatx_requesters"