diff --git a/app/main.py b/app/main.py index bf30457..dc61804 100644 --- a/app/main.py +++ b/app/main.py @@ -17,10 +17,10 @@ from jose import jws, jwk, jwt, JWTError from jose.constants import ALGORITHMS from sqlalchemy import create_engine from sqlalchemy.orm import sessionmaker +from starlette.middleware.cors import CORSMiddleware +from starlette.responses import StreamingResponse, JSONResponse as JSONr, Response, RedirectResponse from starlette.staticfiles import StaticFiles from starlette.templating import Jinja2Templates -from starlette.middleware.cors import CORSMiddleware -from starlette.responses import StreamingResponse, JSONResponse as JSONr, HTMLResponse as HTMLr, Response, RedirectResponse from orm import Origin, Lease, init as db_init, migrate from util import load_key, load_file @@ -34,11 +34,6 @@ TZ = datetime.now().astimezone().tzinfo # Load basic variables VERSION, COMMIT, DEBUG = env('VERSION', 'unknown'), env('COMMIT', 'unknown'), bool(env('DEBUG', False)) -config = dict(openapi_url=None, docs_url=None, redoc_url=None) # 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.mount('/static', StaticFiles(directory=join(dirname(__file__), 'static'), html=True), name='static'), -templates = Jinja2Templates(directory=join(dirname(__file__), 'templates')) - # Database connection db = create_engine(str(env('DATABASE', 'sqlite:///db.sqlite'))) db_init(db), migrate(db) @@ -86,6 +81,9 @@ async def lifespan(_: FastAPI): config = dict(openapi_url=None, docs_url=None, redoc_url=None) # dict(openapi_url='/-/openapi.json', docs_url='/-/docs', redoc_url='/-/redoc') app = FastAPI(title='FastAPI-DLS', description='Minimal Delegated License Service (DLS).', version=VERSION, lifespan=lifespan, **config) +app.mount('/static', StaticFiles(directory=join(dirname(__file__), 'static'), html=True), name='static'), +templates = Jinja2Templates(directory=join(dirname(__file__), 'templates')) + app.debug = DEBUG app.add_middleware( @@ -132,6 +130,7 @@ def __json_config() -> dict: 'CLIENT_TOKEN_EXPIRE_DELTA': str(CLIENT_TOKEN_EXPIRE_DELTA), } + # Endpoints @app.get('/', summary='* Index')