diff --git a/docker-compose.yml b/docker-compose.yml index a48187733..5bf17ec8a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 diff --git a/surfsense_backend/Dockerfile b/surfsense_backend/Dockerfile index cada2bbe9..91a225754 100644 --- a/surfsense_backend/Dockerfile +++ b/surfsense_backend/Dockerfile @@ -72,5 +72,5 @@ ENV PYTHONPATH=/app ENV UVICORN_LOOP=asyncio # Run -EXPOSE 8000 +EXPOSE 8000-8001 CMD ["/app/scripts/docker/entrypoint.sh"] \ No newline at end of file diff --git a/surfsense_backend/app/users.py b/surfsense_backend/app/users.py index 54db06412..d51b30bd7 100644 --- a/surfsense_backend/app/users.py +++ b/surfsense_backend/app/users.py @@ -9,7 +9,6 @@ from fastapi_users.authentication import ( JWTStrategy, ) from fastapi_users.db import SQLAlchemyUserDatabase -from fastapi_users.schemas import model_dump from pydantic import BaseModel from app.config import config @@ -86,7 +85,7 @@ class CustomBearerTransport(BearerTransport): 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")