Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Omit response validation in all API endpoints #452

Merged
merged 1 commit into from
Jan 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

from config import SERVER_NAME
from app.routers import (
index,
common,
account,
bond,
e2e_messaging,
Expand Down Expand Up @@ -120,7 +120,7 @@ async def root():
return {"server": SERVER_NAME}


app.include_router(index.router)
app.include_router(common.router)
app.include_router(account.router)
app.include_router(bond.router)
app.include_router(e2e_messaging.router)
Expand Down
29 changes: 15 additions & 14 deletions app/routers/account.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@
AccountAuthTokenRequest,
AccountAuthTokenResponse
)
from app.utils.fastapi import json_response
from app.utils.e2ee_utils import E2EEUtils
from app.utils.check_utils import (
validate_headers,
Expand Down Expand Up @@ -132,12 +133,12 @@ def create_key(

db.commit()

return {
return json_response({
"issuer_address": _account.issuer_address,
"rsa_public_key": "",
"rsa_status": _account.rsa_status,
"is_deleted": _account.is_deleted
}
})


# GET: /accounts
Expand All @@ -160,7 +161,7 @@ def list_all_accounts(db: Session = Depends(db_session)):
"is_deleted": _account.is_deleted
})

return account_list
return json_response(account_list)


# GET: /accounts/{issuer_address}
Expand All @@ -178,12 +179,12 @@ def retrieve_account(issuer_address: str, db: Session = Depends(db_session)):
if _account is None:
raise HTTPException(status_code=404, detail="issuer does not exist")

return {
return json_response({
"issuer_address": _account.issuer_address,
"rsa_public_key": _account.rsa_public_key,
"rsa_status": _account.rsa_status,
"is_deleted": _account.is_deleted
}
})


# DELETE: /accounts/{issuer_address}
Expand All @@ -205,12 +206,12 @@ def delete_account(issuer_address: str, db: Session = Depends(db_session)):
db.merge(_account)
db.commit()

return {
return json_response({
"issuer_address": _account.issuer_address,
"rsa_public_key": _account.rsa_public_key,
"rsa_status": _account.rsa_status,
"is_deleted": _account.is_deleted
}
})


# POST: /accounts/{issuer_address}/rsakey
Expand Down Expand Up @@ -267,12 +268,12 @@ def generate_rsa_key(

db.commit()

return {
return json_response({
"issuer_address": issuer_address,
"rsa_public_key": _account.rsa_public_key,
"rsa_status": rsa_status,
"is_deleted": _account.is_deleted
}
})


# POST: /accounts/{issuer_address}/eoa_password
Expand Down Expand Up @@ -438,11 +439,11 @@ def create_auth_token(
# NOTE: Registration can be conflicting.
raise AuthTokenAlreadyExistsError()

return AccountAuthTokenResponse(
auth_token=new_token,
usage_start=current_datetime_local,
valid_duration=data.valid_duration
)
return json_response({
"auth_token": new_token,
"usage_start": current_datetime_local,
"valid_duration": data.valid_duration
})


# DELETE: /accounts/{issuer_address}/auth_token
Expand Down
17 changes: 9 additions & 8 deletions app/routers/bc_explorer.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
TxDataResponse,
TxDataListResponse
)
from app.utils.fastapi import json_response
from app.utils.contract_utils import ContractUtils
from app.utils.docs_utils import get_routers_responses
from app.utils.web3_utils import Web3Wrapper
Expand Down Expand Up @@ -128,15 +129,15 @@ def list_block_data(
"size": bd.size
})

return {
return json_response({
"result_set": {
"count": count,
"offset": offset,
"limit": limit,
"total": total
},
"block_data": block_data
}
})

# ------------------------------
# [BC-Explorer] Retrieve Block data
Expand Down Expand Up @@ -166,7 +167,7 @@ def get_block_data(
if block_data is None:
raise HTTPException(status_code=404, detail="block data not found")

return {
return json_response({
"number": block_data.number,
"parent_hash": block_data.parent_hash,
"sha3_uncles": block_data.sha3_uncles,
Expand All @@ -185,7 +186,7 @@ def get_block_data(
"hash": block_data.hash,
"size": block_data.size,
"transactions": block_data.transactions
}
})

# ------------------------------
# [BC-Explorer] List Tx data
Expand Down Expand Up @@ -251,15 +252,15 @@ def list_tx_data(
"to_address": txd.to_address
})

return {
return json_response({
"result_set": {
"count": count,
"offset": offset,
"limit": limit,
"total": total
},
"tx_data": tx_data
}
})


# ------------------------------
Expand Down Expand Up @@ -310,7 +311,7 @@ def get_tx_data(
contract_function = decoded_input[0].fn_name
contract_parameters = decoded_input[1]

return {
return json_response({
"hash": tx_data.hash,
"block_hash": tx_data.block_hash,
"block_number": tx_data.block_number,
Expand All @@ -324,4 +325,4 @@ def get_tx_data(
"gas_price": tx_data.gas_price,
"value": tx_data.value,
"nonce": tx_data.nonce
}
})
Loading