Compare commits

...

2 commits

Author SHA1 Message Date
e1ae186382 typo/regression 2022-03-30 10:53:52 +00:00
e078c7b094 minor refactoring 2022-03-30 10:53:36 +00:00
3 changed files with 9 additions and 6 deletions

View file

@ -16,6 +16,8 @@ from .config import Config, Settings
from .db import Connection, User from .db import Connection, User
from .routers import main_router from .routers import main_router
settings = Settings._
app = FastAPI( app = FastAPI(
title="kiwi-vpn API", title="kiwi-vpn API",
description="This API enables the `kiwi-vpn` service.", description="This API enables the `kiwi-vpn` service.",
@ -27,12 +29,12 @@ app = FastAPI(
"name": "MIT License", "name": "MIT License",
"url": "https://opensource.org/licenses/mit-license.php", "url": "https://opensource.org/licenses/mit-license.php",
}, },
openapi_url=Settings._.openapi_url, openapi_url=settings.openapi_url,
docs_url=Settings._.docs_url if not Settings._.production_mode else None, docs_url=settings.docs_url if not settings.production_mode else None,
redoc_url=Settings._.redoc_url if not Settings._.production_mode else None, redoc_url=settings.redoc_url if not settings.production_mode else None,
) )
app.include_router(main_router, prefix=f"/{Settings._.api_v1_prefix}") app.include_router(main_router)
@app.on_event("startup") @app.on_event("startup")

View file

@ -6,11 +6,12 @@ This file: Main API router definition.
from fastapi import APIRouter from fastapi import APIRouter
from ..config import Settings
from . import admin, device, user from . import admin, device, user
main_router = APIRouter() main_router = APIRouter()
main_router.include_router(admin.router) main_router.include_router(admin.router, prefix=f"/{Settings._.api_v1_prefix}")
main_router.include_router(device.router) main_router.include_router(device.router)
main_router.include_router(user.router) main_router.include_router(user.router)

View file

@ -34,7 +34,7 @@ async def initial_configure(
# create config file, connect to database # create config file, connect to database
config.save() config.save()
Connection.connect(current_config.db.uri) Connection.connect(config.db.uri)
@router.put( @router.put(