Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/python-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
contents: read
packages: write
# Only run when we are pushing to the repo's master branch
if: ${{ github.event_name == 'push' }}
# if: ${{ github.event_name == 'push' }}
steps:
- name: Checkout repository
uses: actions/checkout@v2
Expand Down
20 changes: 10 additions & 10 deletions splash/api/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ def init_logging():


app = FastAPI(
openapi_url="/api/v1/openapi.json",
docs_url="/api/docs",
redoc_url="/api/redoc",
openapi_url="/splash/api/v1/openapi.json",
docs_url="/splash/api/docs",
redoc_url="/splash/api/redoc",
# swagger_ui_oauth2_redirect_url="/api/docs/oauth2-redirect"
)

Expand Down Expand Up @@ -90,49 +90,49 @@ async def handle_wrong_etag(response, exc):
)


@app.get("/api/v1/settings")
@app.get("/splash/api/v1/settings")
async def get_settings():
return {"google_client_id": ConfigStore.GOOGLE_CLIENT_ID}


app.include_router(
auth_router,
prefix="/api/v1/idtokensignin",
prefix="/splash/api/v1/idtokensignin",
tags=["tokens"],
responses={404: {"description": "Not found"}},
)

app.include_router(
users_router,
prefix="/api/v1/users",
prefix="/splash/api/v1/users",
tags=["users"],
responses={404: {"description": "Not found"}},
)

app.include_router(
pages_router,
prefix="/api/v1/pages",
prefix="/splash/api/v1/pages",
tags=["pages"],
responses={404: {"description": "Not found"}},
)

app.include_router(
runs_router,
prefix="/api/v1/runs",
prefix="/splash/api/v1/runs",
tags=["runs"],
responses={404: {"description": "Not found"}},
)

app.include_router(
teams_router,
prefix="/api/v1/teams",
prefix="/splash/api/v1/teams",
tags=["teams"],
responses={404: {"description": "Not found"}},
)

app.include_router(
references_router,
prefix="/api/v1/references",
prefix="/splash/api/v1/references",
tags=["references"],
responses={404: {"description": "Not found"}},
)
2 changes: 1 addition & 1 deletion splash/test/fixtures/add.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@


from splash.api.main import app
API_URL_ROOT = "/api/v1"
API_URL_ROOT = "/splash/api/v1"
os.environ["TOKEN_SECRET_KEY"] = "the_question_to_the_life_the_universe_and_everything"
os.environ["GOOGLE_CLIENT_ID"] = "Gollum"
os.environ["GOOGLE_CLIENT_SECRET"] = "the_one_ring"
Expand Down