From 7b43e0614f6eb2e92677fe3f74df900e66c88c67 Mon Sep 17 00:00:00 2001
From: Sergei Sumarokov <7047457+kompotkot@users.noreply.github.com>
Date: Fri, 7 Jul 2023 19:30:38 +0300
Subject: [PATCH] Revert "Emergency fix CORS back"

---
 engineapi/engineapi/api.py                | 6 +-----
 engineapi/engineapi/routes/admin.py       | 6 +-----
 engineapi/engineapi/routes/configs.py     | 6 +-----
 engineapi/engineapi/routes/dropper.py     | 6 +-----
 engineapi/engineapi/routes/leaderboard.py | 8 ++------
 engineapi/engineapi/routes/metatx.py      | 6 +-----
 engineapi/engineapi/routes/play.py        | 8 ++------
 7 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/engineapi/engineapi/api.py b/engineapi/engineapi/api.py
index 1752f595..39876919 100644
--- a/engineapi/engineapi/api.py
+++ b/engineapi/engineapi/api.py
@@ -31,12 +31,8 @@ app = FastAPI(
     docs_url=None,
 )
 
-# Fast fix
-from fastapi.middleware.cors import CORSMiddleware
-from .settings import RAW_ORIGINS_LST
 app.add_middleware(
-    CORSMiddleware,
-    allow_origins=RAW_ORIGINS_LST,
+    BugoutCORSMiddleware,
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
diff --git a/engineapi/engineapi/routes/admin.py b/engineapi/engineapi/routes/admin.py
index 3e605960..fdf022dc 100644
--- a/engineapi/engineapi/routes/admin.py
+++ b/engineapi/engineapi/routes/admin.py
@@ -44,12 +44,8 @@ app = FastAPI(
 
 app.add_middleware(EngineAuthMiddleware, whitelist=whitelist_paths)
 
-# Fast fix
-from fastapi.middleware.cors import CORSMiddleware
-from ..settings import RAW_ORIGINS_LST
 app.add_middleware(
-    CORSMiddleware,
-    allow_origins=RAW_ORIGINS_LST,
+    BugoutCORSMiddleware,
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
diff --git a/engineapi/engineapi/routes/configs.py b/engineapi/engineapi/routes/configs.py
index 1a321a95..1c9c6c61 100644
--- a/engineapi/engineapi/routes/configs.py
+++ b/engineapi/engineapi/routes/configs.py
@@ -62,12 +62,8 @@ app = FastAPI(
 
 app.add_middleware(BroodAuthMiddleware, whitelist=whitelist_paths)
 
-# Fast fix
-from fastapi.middleware.cors import CORSMiddleware
-from ..settings import RAW_ORIGINS_LST
 app.add_middleware(
-    CORSMiddleware,
-    allow_origins=RAW_ORIGINS_LST,
+    BugoutCORSMiddleware,
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
diff --git a/engineapi/engineapi/routes/dropper.py b/engineapi/engineapi/routes/dropper.py
index 91a27018..8bf4486f 100644
--- a/engineapi/engineapi/routes/dropper.py
+++ b/engineapi/engineapi/routes/dropper.py
@@ -62,12 +62,8 @@ app = FastAPI(
 
 app.add_middleware(EngineAuthMiddleware, whitelist=whitelist_paths)
 
-# Fast fix
-from fastapi.middleware.cors import CORSMiddleware
-from ..settings import RAW_ORIGINS_LST
 app.add_middleware(
-    CORSMiddleware,
-    allow_origins=RAW_ORIGINS_LST,
+    BugoutCORSMiddleware,
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
diff --git a/engineapi/engineapi/routes/leaderboard.py b/engineapi/engineapi/routes/leaderboard.py
index 47ef08d8..648015fc 100644
--- a/engineapi/engineapi/routes/leaderboard.py
+++ b/engineapi/engineapi/routes/leaderboard.py
@@ -52,13 +52,9 @@ app = FastAPI(
 
 app.add_middleware(ExtractBearerTokenMiddleware, whitelist=leaderboad_whitelist)
 
-# Fast fix
-from fastapi.middleware.cors import CORSMiddleware
-from ..settings import RAW_ORIGINS_LST
 app.add_middleware(
-    CORSMiddleware,
-    allow_origins=RAW_ORIGINS_LST,
-    allow_credentials=True,
+    BugoutCORSMiddleware,
+    allow_credentials=False,
     allow_methods=["*"],
     allow_headers=["*"],
 )
diff --git a/engineapi/engineapi/routes/metatx.py b/engineapi/engineapi/routes/metatx.py
index bfceecbc..18bc6a7b 100644
--- a/engineapi/engineapi/routes/metatx.py
+++ b/engineapi/engineapi/routes/metatx.py
@@ -54,12 +54,8 @@ app = FastAPI(
 
 app.add_middleware(BroodAuthMiddleware, whitelist=whitelist_paths)
 
-# Fast fix
-from fastapi.middleware.cors import CORSMiddleware
-from ..settings import RAW_ORIGINS_LST
 app.add_middleware(
-    CORSMiddleware,
-    allow_origins=RAW_ORIGINS_LST,
+    BugoutCORSMiddleware,
     allow_credentials=True,
     allow_methods=["*"],
     allow_headers=["*"],
diff --git a/engineapi/engineapi/routes/play.py b/engineapi/engineapi/routes/play.py
index 503bdd52..01f5c4e9 100644
--- a/engineapi/engineapi/routes/play.py
+++ b/engineapi/engineapi/routes/play.py
@@ -40,13 +40,9 @@ app = FastAPI(
 )
 
 
-# Fast fix
-from fastapi.middleware.cors import CORSMiddleware
-from ..settings import RAW_ORIGINS_LST
 app.add_middleware(
-    CORSMiddleware,
-    allow_origins=RAW_ORIGINS_LST,
-    allow_credentials=True,
+    BugoutCORSMiddleware,
+    allow_credentials=False,
     allow_methods=["*"],
     allow_headers=["*"],
 )