fix openapi.json path

Signed-off-by: Teo Koon Peng <koonpeng@openrobotics.org>
open-rmf · Feb 28, 2024 · 8cbc0b7 · 8cbc0b7
1 parent 0e8ef2d
commit 8cbc0b7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/packages/api-server/api_server/app.py b/packages/api-server/api_server/app.py
@@ -217,11 +217,7 @@ async def on_shutdown():
 
 @app.get("/docs", include_in_schema=False)
 async def custom_swagger_ui_html():
-    openapi_url = (
-        app.openapi_url
-        if app.openapi_url is not None
-        else f"{app_config.public_url.geturl()}/openapi.json"
-    )
+    openapi_url = f"{app_config.public_url.geturl()}{app.openapi_url}"
     return get_swagger_ui_html(
         openapi_url=openapi_url,
         title=app.title + " - Swagger UI",
@@ -238,7 +234,7 @@ async def swagger_ui_redirect():
 
 @app.get("/redoc", include_in_schema=False)
 async def redoc_html():
-    openapi_url = app.openapi_url if app.openapi_url is not None else "/openapi.json"
+    openapi_url = f"{app_config.public_url.geturl()}{app.openapi_url}"
     return get_redoc_html(
         openapi_url=openapi_url,
         title=app.title + " - ReDoc",

diff --git a/packages/api-server/package.json b/packages/api-server/package.json
@@ -6,7 +6,7 @@
   "scripts": {
     "prepack": "../../scripts/pipenv run python setup.py bdist_wheel",
     "restart": "RMF_API_SERVER_CONFIG=sqlite_local_config.py ../../scripts/pipenv run python -m api_server",
-    "start": "rm -rf run && mkdir -p run/cache && RMF_API_SERVER_CONFIG=sqlite_local_config.py ../../scripts/pipenv run python -m api_server",
+    "start": "rm -rf run && mkdir -p run/cache && RMF_API_SERVER_CONFIG=${RMF_API_SERVER_CONFIG:=-sqlite_local_config.py} ../../scripts/pipenv run python -m api_server",
     "start:psql": "rm -rf run && mkdir -p run/cache && RMF_API_SERVER_CONFIG=psql_local_config.py ../../scripts/pipenv run python -m api_server",
     "test": "../../scripts/pipenv run python scripts/test.py",
     "test:cov": "../../scripts/pipenv run python -m coverage run scripts/test.py",