Skip to content
Merged
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
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@ services:
- "${BACKEND_PORT:-8000}:8000"
volumes:
- ./surfsense_backend/app:/app/app
- ./surfsense_backend/scripts:/app/scripts:ro
- shared_temp:/tmp
env_file:
- ./surfsense_backend/.env
Expand Down
2 changes: 1 addition & 1 deletion surfsense_backend/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,5 @@ ENV PYTHONPATH=/app
ENV UVICORN_LOOP=asyncio

# Run
EXPOSE 8000
EXPOSE 8000-8001
CMD ["/app/scripts/docker/entrypoint.sh"]
3 changes: 1 addition & 2 deletions surfsense_backend/app/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
JWTStrategy,
)
from fastapi_users.db import SQLAlchemyUserDatabase
from fastapi_users.schemas import model_dump
from pydantic import BaseModel

from app.config import config
Expand Down Expand Up @@ -86,7 +85,7 @@ async def get_login_response(self, token: str) -> Response:
if config.AUTH_TYPE == "GOOGLE":
return RedirectResponse(redirect_url, status_code=302)
else:
return JSONResponse(model_dump(bearer_response))
return JSONResponse(bearer_response.model_dump())


bearer_transport = CustomBearerTransport(tokenUrl="auth/jwt/login")
Expand Down
Loading