diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 57e5255..7a908d2 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -26,7 +26,6 @@ jobs: - uses: actions/setup-python@v5 with: python-version: "3.12" - cache: pip - run: pip install ruff - name: Ruff lint run: ruff check . @@ -41,7 +40,6 @@ jobs: - uses: actions/setup-python@v5 with: python-version: "3.12" - cache: pip - name: Install system dependencies run: sudo apt-get update && sudo apt-get install -y libpq-dev build-essential - run: pip install -e ".[dev]" mypy @@ -83,12 +81,13 @@ jobs: CARTSNITCH_DATABASE_URL: postgresql+asyncpg://cartsnitch:cartsnitch_test@localhost:5432/cartsnitch_test CARTSNITCH_REDIS_URL: redis://localhost:6379/0 CARTSNITCH_JWT_SECRET_KEY: test-secret-do-not-use-in-prod + CARTSNITCH_SERVICE_KEY: test-service-key-do-not-use-in-prod + CARTSNITCH_FERNET_KEY: wXWQsC0FZlhSz2t_tfVQjNUSP8vgAGG3o3pkjrX8Bw0= steps: - uses: actions/checkout@v4 - uses: actions/setup-python@v5 with: python-version: "3.12" - cache: pip - name: Install system dependencies run: sudo apt-get update && sudo apt-get install -y libpq-dev build-essential - run: pip install -e ".[dev]" diff --git a/src/cartsnitch_api/config.py b/src/cartsnitch_api/config.py index c835bca..c71d753 100644 --- a/src/cartsnitch_api/config.py +++ b/src/cartsnitch_api/config.py @@ -23,7 +23,12 @@ class Settings(BaseSettings): auth_service_url: str = "http://auth:3001" - cors_origins: list[str] = ["http://localhost:3000", "https://cartsnitch.com"] + cors_origins: list[str] = [ + "http://localhost:3000", + "https://cartsnitch.com", + "https://dev.cartsnitch.com", + "https://uat.cartsnitch.com", + ] receiptwitness_url: str = "http://receiptwitness:8001" stickershock_url: str = "http://stickershock:8002" diff --git a/src/cartsnitch_api/main.py b/src/cartsnitch_api/main.py index 9993b29..bd5a569 100644 --- a/src/cartsnitch_api/main.py +++ b/src/cartsnitch_api/main.py @@ -6,7 +6,6 @@ from fastapi import APIRouter, FastAPI from cartsnitch_api.auth.routes import router as auth_router from cartsnitch_api.cache import cache_client -from cartsnitch_api.database import dispose_engine from cartsnitch_api.middleware.cors import add_cors_middleware from cartsnitch_api.middleware.error_handler import add_error_handlers, add_error_monitor_middleware from cartsnitch_api.middleware.rate_limit import add_rate_limit_middleware @@ -26,6 +25,7 @@ from cartsnitch_api.routes.user import router as user_router @asynccontextmanager async def lifespan(app: FastAPI): + from cartsnitch_api.database import dispose_engine await cache_client.initialize() yield await cache_client.close()