From 21f44d2d4cafc21bed1d122598d4ca1c0cf1bba2 Mon Sep 17 00:00:00 2001
From: Yannic Kilcher <yk@users.noreply.github.com>
Date: Sun, 25 Dec 2022 17:25:30 +0100
Subject: [PATCH] removed ALLOW_ANY_API_KEY and allow skipping API key check in
 debug

---
 ansible/dev.yaml                                 | 2 +-
 backend/oasst_backend/api/deps.py                | 4 ++--
 backend/oasst_backend/config.py                  | 2 +-
 scripts/backend-development/run-local.sh         | 2 +-
 scripts/frontend-development/docker-compose.yaml | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ansible/dev.yaml b/ansible/dev.yaml
index b2b7b21b..6e03a9d2 100644
--- a/ansible/dev.yaml
+++ b/ansible/dev.yaml
@@ -50,7 +50,7 @@
         network_mode: oasst
         env:
           POSTGRES_HOST: oasst-postgres
-          ALLOW_ANY_API_KEY: "true"
+          DEBUG_SKIP_API_KEY_CHECK: "true"
           MAX_WORKERS: "1"
         ports:
           - 8080:8080
diff --git a/backend/oasst_backend/api/deps.py b/backend/oasst_backend/api/deps.py
index 96af5c5e..98b08078 100644
--- a/backend/oasst_backend/api/deps.py
+++ b/backend/oasst_backend/api/deps.py
@@ -37,8 +37,8 @@ def api_auth(
     db: Session,
 ) -> ApiClient:
 
-    if api_key is not None:
-        if settings.ALLOW_ANY_API_KEY:
+    if api_key is not None or settings.DEBUG_SKIP_API_KEY_CHECK:
+        if settings.DEBUG_SKIP_API_KEY_CHECK:
             # make sure that a dummy api key exits in db (foreign key references)
             ANY_API_KEY_ID = UUID("00000000-1111-2222-3333-444444444444")
             api_client: ApiClient = db.query(ApiClient).filter(ApiClient.id == ANY_API_KEY_ID).first()
diff --git a/backend/oasst_backend/config.py b/backend/oasst_backend/config.py
index 0a1049f7..5516635f 100644
--- a/backend/oasst_backend/config.py
+++ b/backend/oasst_backend/config.py
@@ -15,7 +15,7 @@ class Settings(BaseSettings):
     POSTGRES_DB: str = "postgres"
     DATABASE_URI: Optional[PostgresDsn] = None
 
-    ALLOW_ANY_API_KEY: bool = False
+    DEBUG_SKIP_API_KEY_CHECK: bool = False
 
     @validator("DATABASE_URI", pre=True)
     def assemble_db_connection(cls, v: Optional[str], values: Dict[str, Any]) -> Any:
diff --git a/scripts/backend-development/run-local.sh b/scripts/backend-development/run-local.sh
index e9df6ca2..90bd195d 100755
--- a/scripts/backend-development/run-local.sh
+++ b/scripts/backend-development/run-local.sh
@@ -4,7 +4,7 @@ parent_path=$( cd "$(dirname "${BASH_SOURCE[0]}")" ; pwd -P )
 # switch to backend directory
 pushd "$parent_path/../../backend"
 
-export ALLOW_ANY_API_KEY=True
+export DEBUG_SKIP_API_KEY_CHECK=True
 
 uvicorn main:app --reload --port 8080 --host 0.0.0.0
 
diff --git a/scripts/frontend-development/docker-compose.yaml b/scripts/frontend-development/docker-compose.yaml
index 4e08ae29..ef0f3489 100644
--- a/scripts/frontend-development/docker-compose.yaml
+++ b/scripts/frontend-development/docker-compose.yaml
@@ -35,7 +35,7 @@ services:
     image: oasst-backend
     environment:
       - POSTGRES_HOST=db
-      - ALLOW_ANY_API_KEY=True
+      - DEBUG_SKIP_API_KEY_CHECK=True
       - MAX_WORKERS=1
     depends_on:
       db: