Compare commits

..

No commits in common. "1b2da802cb6af98a912cdb90b5965e74604d07fc" and "a09fc5f2ad912ad2cf5b97a3fb62500d158ee714" have entirely different histories.

2 changed files with 7 additions and 40 deletions

View File

@ -15,7 +15,7 @@ from calendar import timegm
from jose import jws, jwk, jwt
from jose.constants import ALGORITHMS
from starlette.middleware.cors import CORSMiddleware
from starlette.responses import StreamingResponse, JSONResponse, HTMLResponse, Response, RedirectResponse
from starlette.responses import StreamingResponse, JSONResponse, HTMLResponse, Response
from sqlalchemy import create_engine
from sqlalchemy.orm import sessionmaker
@ -27,8 +27,7 @@ load_dotenv('../version.env')
VERSION, COMMIT, DEBUG = env('VERSION', 'unknown'), env('COMMIT', 'unknown'), bool(env('DEBUG', False))
config = dict(openapi_url='/-/openapi.json', docs_url='/-/docs', redoc_url='/-/redoc')
app = FastAPI(title='FastAPI-DLS', description='Minimal Delegated License Service (DLS).', version=VERSION, **config)
app = FastAPI(title='FastAPI-DLS', description='Minimal Delegated License Service (DLS).', version=VERSION)
db = create_engine(str(env('DATABASE', 'sqlite:///db.sqlite')))
db_init(db), migrate(db)
@ -120,7 +119,7 @@ async def _manage(request: Request):
return HTMLResponse(response)
@app.get('/-/origins', summary='* Origins')
@app.get('/-/origins')
async def _origins(request: Request, leases: bool = False):
session = sessionmaker(bind=db)()
response = []
@ -133,13 +132,13 @@ async def _origins(request: Request, leases: bool = False):
return JSONResponse(response)
@app.delete('/-/origins', summary='* Origins')
@app.delete('/-/origins')
async def _origins_delete(request: Request):
Origin.delete(db)
return Response(status_code=201)
@app.get('/-/leases', summary='* Leases')
@app.get('/-/leases')
async def _leases(request: Request, origin: bool = False):
session = sessionmaker(bind=db)()
response = []
@ -153,7 +152,7 @@ async def _leases(request: Request, origin: bool = False):
return JSONResponse(response)
@app.delete('/-/lease/{lease_ref}', summary='* Lease')
@app.delete('/-/lease/{lease_ref}')
async def _lease_delete(request: Request, lease_ref: str):
if Lease.delete(db, lease_ref) == 1:
return Response(status_code=201)
@ -161,7 +160,7 @@ async def _lease_delete(request: Request, lease_ref: str):
# venv/lib/python3.9/site-packages/nls_core_service_instance/service_instance_token_manager.py
@app.get('/client-token', summary='* Client-Token')
@app.get('/client-token')
async def client_token():
cur_time = datetime.utcnow()
exp_time = cur_time + relativedelta(years=12)

View File

@ -44,43 +44,11 @@ def test_status():
assert response.json()['status'] == 'up'
def test_health():
response = client.get('/-/health')
assert response.status_code == 200
assert response.json()['status'] == 'up'
def test_readme():
response = client.get('/-/readme')
assert response.status_code == 200
def test_manage():
response = client.get('/-/manage')
assert response.status_code == 200
def test_client_token():
response = client.get('/client-token')
assert response.status_code == 200
def test_origins():
pass
def test_origins_delete():
pass
def test_leases():
pass
def test_lease_delete():
pass
def test_auth_v1_origin():
payload = {
"registration_pending": False,