api/kiwi_vpn_api/main.py

@@ -16,8 +16,6 @@ from .config import Config, Settings
 from .db import Connection, User
 from .routers import main_router
 
-settings = Settings._
-
 app = FastAPI(
     title="kiwi-vpn API",
     description="This API enables the `kiwi-vpn` service.",
@@ -29,12 +27,12 @@ app = FastAPI(
         "name": "MIT License",
         "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)
+app.include_router(main_router, prefix=f"/{Settings._.api_v1_prefix}")
 
 
 @app.on_event("startup")

api/kiwi_vpn_api/routers/__init__.py

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

api/kiwi_vpn_api/routers/admin.py

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