mirror of
https://gitea.publichub.eu/oscar.krause/fastapi-dls.git
synced 2024-11-22 14:28:48 +00:00
main.py - improved responses with wrapping in 'JSONResponse'
This commit is contained in:
parent
fe8df1e6a8
commit
e7cbc0fc59
38
app/main.py
38
app/main.py
@ -30,7 +30,7 @@ INSTANCE_KEY_PUB = load_key(join(dirname(__file__), 'cert/instance.public.pem'))
|
|||||||
|
|
||||||
@app.get('/')
|
@app.get('/')
|
||||||
async def index():
|
async def index():
|
||||||
return {'hello': 'world'}
|
return JSONResponse({'hello': 'world'})
|
||||||
|
|
||||||
|
|
||||||
@app.get('/status')
|
@app.get('/status')
|
||||||
@ -106,9 +106,9 @@ async def auth(request: Request):
|
|||||||
"node_url_list": None,
|
"node_url_list": None,
|
||||||
"node_query_order": None,
|
"node_query_order": None,
|
||||||
"prompts": None,
|
"prompts": None,
|
||||||
"sync_timestamp": cur_time
|
"sync_timestamp": cur_time.isoformat()
|
||||||
}
|
}
|
||||||
return response
|
return JSONResponse(response)
|
||||||
|
|
||||||
|
|
||||||
# venv/lib/python3.9/site-packages/nls_services_auth/test/test_auth_controller.py
|
# venv/lib/python3.9/site-packages/nls_services_auth/test/test_auth_controller.py
|
||||||
@ -142,10 +142,10 @@ async def code(request: Request):
|
|||||||
|
|
||||||
response = {
|
response = {
|
||||||
"auth_code": auth_code,
|
"auth_code": auth_code,
|
||||||
"sync_timestamp": datetime.utcnow(),
|
"sync_timestamp": cur_time.isoformat(),
|
||||||
"prompts": None
|
"prompts": None
|
||||||
}
|
}
|
||||||
return response
|
return JSONResponse(response)
|
||||||
|
|
||||||
|
|
||||||
# venv/lib/python3.9/site-packages/nls_services_auth/test/test_auth_controller.py
|
# venv/lib/python3.9/site-packages/nls_services_auth/test/test_auth_controller.py
|
||||||
@ -187,12 +187,12 @@ async def token(request: Request):
|
|||||||
auth_token = jwt.encode(new_payload, key=key, headers=headers, algorithm='RS256')
|
auth_token = jwt.encode(new_payload, key=key, headers=headers, algorithm='RS256')
|
||||||
|
|
||||||
response = {
|
response = {
|
||||||
"expires": access_expires_on,
|
"expires": access_expires_on.isoformat(),
|
||||||
"auth_token": auth_token,
|
"auth_token": auth_token,
|
||||||
"sync_timestamp": cur_time,
|
"sync_timestamp": cur_time.isoformat(),
|
||||||
}
|
}
|
||||||
|
|
||||||
return response
|
return JSONResponse(response)
|
||||||
|
|
||||||
|
|
||||||
@app.post('/leasing/v1/lessor')
|
@app.post('/leasing/v1/lessor')
|
||||||
@ -211,8 +211,8 @@ async def lessor(request: Request):
|
|||||||
"ordinal": 0,
|
"ordinal": 0,
|
||||||
"lease": {
|
"lease": {
|
||||||
"ref": scope_ref,
|
"ref": scope_ref,
|
||||||
"created": cur_time,
|
"created": cur_time.isoformat(),
|
||||||
"expires": cur_time + LEASE_EXPIRE_DELTA,
|
"expires": (cur_time + LEASE_EXPIRE_DELTA).isoformat(),
|
||||||
"recommended_lease_renewal": 0.15,
|
"recommended_lease_renewal": 0.15,
|
||||||
"offline_lease": "true",
|
"offline_lease": "true",
|
||||||
"license_type": "CONCURRENT_COUNTED_SINGLE"
|
"license_type": "CONCURRENT_COUNTED_SINGLE"
|
||||||
@ -222,11 +222,11 @@ async def lessor(request: Request):
|
|||||||
response = {
|
response = {
|
||||||
"lease_result_list": lease_result_list,
|
"lease_result_list": lease_result_list,
|
||||||
"result_code": "SUCCESS",
|
"result_code": "SUCCESS",
|
||||||
"sync_timestamp": cur_time,
|
"sync_timestamp": cur_time.isoformat(),
|
||||||
"prompts": None
|
"prompts": None
|
||||||
}
|
}
|
||||||
|
|
||||||
return response
|
return JSONResponse(response)
|
||||||
|
|
||||||
|
|
||||||
# venv/lib/python3.9/site-packages/nls_services_lease/test/test_lease_multi_controller.py
|
# venv/lib/python3.9/site-packages/nls_services_lease/test/test_lease_multi_controller.py
|
||||||
@ -239,11 +239,11 @@ async def lease(request: Request):
|
|||||||
"active_lease_list": [
|
"active_lease_list": [
|
||||||
"BE276D7B-2CDB-11EC-9838-061A22468B59"
|
"BE276D7B-2CDB-11EC-9838-061A22468B59"
|
||||||
],
|
],
|
||||||
"sync_timestamp": cur_time,
|
"sync_timestamp": cur_time.isoformat(),
|
||||||
"prompts": None
|
"prompts": None
|
||||||
}
|
}
|
||||||
|
|
||||||
return response
|
return JSONResponse(response)
|
||||||
|
|
||||||
|
|
||||||
# venv/lib/python3.9/site-packages/nls_core_lease/lease_single.py
|
# venv/lib/python3.9/site-packages/nls_core_lease/lease_single.py
|
||||||
@ -254,14 +254,14 @@ async def lease_renew(request: Request, lease_ref: str):
|
|||||||
cur_time = datetime.utcnow()
|
cur_time = datetime.utcnow()
|
||||||
response = {
|
response = {
|
||||||
"lease_ref": lease_ref,
|
"lease_ref": lease_ref,
|
||||||
"expires": cur_time + LEASE_EXPIRE_DELTA,
|
"expires": (cur_time + LEASE_EXPIRE_DELTA).isoformat(),
|
||||||
"recommended_lease_renewal": 0.16,
|
"recommended_lease_renewal": 0.16,
|
||||||
"offline_lease": True,
|
"offline_lease": True,
|
||||||
"prompts": None,
|
"prompts": None,
|
||||||
"sync_timestamp": cur_time
|
"sync_timestamp": cur_time.isoformat(),
|
||||||
}
|
}
|
||||||
|
|
||||||
return response
|
return JSONResponse(response)
|
||||||
|
|
||||||
|
|
||||||
@app.delete('/leasing/v1/lessor/leases')
|
@app.delete('/leasing/v1/lessor/leases')
|
||||||
@ -270,10 +270,10 @@ async def lease_remove(request: Request, status_code=200):
|
|||||||
response = {
|
response = {
|
||||||
"released_lease_list": None,
|
"released_lease_list": None,
|
||||||
"release_failure_list": None,
|
"release_failure_list": None,
|
||||||
"sync_timestamp": cur_time,
|
"sync_timestamp": cur_time.isoformat(),
|
||||||
"prompts": None
|
"prompts": None
|
||||||
}
|
}
|
||||||
return response
|
return JSONResponse(response)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
|
Loading…
Reference in New Issue
Block a user