From d45829b6db620ddd9e66a3c34166c521719a6ae6 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 20 Feb 2021 00:01:40 +0100
Subject: [PATCH] Fixed #16 - favicon is now set correctly (v2.0.6)
---
src/StorageLeaf.py | 18 ++++++++++++++++--
src/version.json | 6 +++---
2 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/StorageLeaf.py b/src/StorageLeaf.py
index 5bda99c..13b7130 100644
--- a/src/StorageLeaf.py
+++ b/src/StorageLeaf.py
@@ -4,6 +4,7 @@ import os
import uvicorn
from TheCodeLabs_BaseUtils.DefaultLogger import DefaultLogger
from fastapi import FastAPI
+from fastapi.openapi.docs import get_swagger_ui_html, get_redoc_html
from fastapi.middleware.cors import CORSMiddleware
from starlette.responses import RedirectResponse, FileResponse
@@ -27,8 +28,9 @@ Models.Base.metadata.create_all(bind=engine)
app = FastAPI(title=Constants.APP_NAME,
version=VERSION['name'],
- description='The StorageLeaf API',
- servers=[{'url': SETTINGS['api']['url'], 'description': f'{Constants.APP_NAME} API'}])
+ servers=[{'url': SETTINGS['api']['url'], 'description': f'{Constants.APP_NAME} API'}],
+ docs_url=None,
+ redoc_url=None)
if 'cors_origins' in SETTINGS['server']:
app.add_middleware(
@@ -58,6 +60,18 @@ async def version():
return Schemas.Version(**VERSION)
+@app.get('/docs', include_in_schema=False)
+def overridden_swagger():
+ return get_swagger_ui_html(openapi_url='/openapi.json', title='The StorageLeaf API',
+ swagger_favicon_url=app.url_path_for('favicon'))
+
+
+@app.get('/redoc', include_in_schema=False)
+def overridden_redoc():
+ return get_redoc_html(openapi_url='/openapi.json', title='The StorageLeaf API',
+ redoc_favicon_url=app.url_path_for('favicon'))
+
+
app.include_router(DeviceRouter.router)
app.include_router(SensorRouter.router)
app.include_router(MeasurementRouter.router)
diff --git a/src/version.json b/src/version.json
index 4eca379..d38379d 100644
--- a/src/version.json
+++ b/src/version.json
@@ -1,7 +1,7 @@
{
"version": {
- "name": "v2.0.5",
- "code": 13,
- "date": "30.01.21"
+ "name": "v2.0.6",
+ "code": 14,
+ "date": "20.02.21"
}
}
\ No newline at end of file
--
GitLab