Merge pull request #444 from MODSetter/dev

fix: docker backend entrypoint issues

Author: MODSetter

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

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"] 

surfsense_backend/app/users.py

@@ -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
@@ -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")