From 382840286505e9850a9af75ded3cb94ce8ffb560 Mon Sep 17 00:00:00 2001 From: Georg-Stahn Date: Sun, 28 Jan 2024 18:22:32 +0100 Subject: [PATCH 1/2] added middleware for emulation --- pkgs/clan-cli/clan_cli/config.py | 6 +++++- pkgs/clan-cli/clan_cli/emulate_fastapi.py | 10 +++++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/config.py b/pkgs/clan-cli/clan_cli/config.py index f00e74a..eddcbcf 100644 --- a/pkgs/clan-cli/clan_cli/config.py +++ b/pkgs/clan-cli/clan_cli/config.py @@ -5,7 +5,11 @@ cors_url = [ "http://0.0.0.0", "http://[::]", ] -cors_ports = ["*", 3000, 2979] +cors_ports = ["*", 3000, 2979, 8001, 8002] +cors_whitelist = [] +for u in cors_url: + for p in cors_ports: + cors_whitelist.append(f"{u}:{p}") # host for the server, frontend, backend and emulators host = "127.0.0.1" diff --git a/pkgs/clan-cli/clan_cli/emulate_fastapi.py b/pkgs/clan-cli/clan_cli/emulate_fastapi.py index 725c4ad..8faebbc 100644 --- a/pkgs/clan-cli/clan_cli/emulate_fastapi.py +++ b/pkgs/clan-cli/clan_cli/emulate_fastapi.py @@ -11,6 +11,7 @@ from fastapi.responses import HTMLResponse, JSONResponse # Importing configuration and schemas from the clan_cli package import clan_cli.config as config from clan_cli.webui.schemas import Resolution +from fastapi.middleware.cors import CORSMiddleware # Creating FastAPI instances for different applications app_dlg = FastAPI(swagger_ui_parameters={"tryItOutEnabled": True}) @@ -25,7 +26,14 @@ apps = [ (app_c1, config.c1_port), (app_c2, config.c2_port), ] - +for app, port in apps: + app.add_middleware( + CORSMiddleware, + allow_origins=config.cors_whitelist, + allow_credentials=True, + allow_methods=["*"], + allow_headers=["*"], + ) # Healthcheck endpoints for different applications @app_c1.get("/") From dc04001dcadd14c25941444a1c9486dafbf66859 Mon Sep 17 00:00:00 2001 From: Georg-Stahn Date: Sun, 28 Jan 2024 18:26:00 +0100 Subject: [PATCH 2/2] emulate nix fmt changes --- pkgs/clan-cli/clan_cli/emulate_fastapi.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/clan-cli/clan_cli/emulate_fastapi.py b/pkgs/clan-cli/clan_cli/emulate_fastapi.py index 8faebbc..ae50081 100644 --- a/pkgs/clan-cli/clan_cli/emulate_fastapi.py +++ b/pkgs/clan-cli/clan_cli/emulate_fastapi.py @@ -6,12 +6,12 @@ from datetime import datetime # Importing FastAPI and related components from fastapi import FastAPI +from fastapi.middleware.cors import CORSMiddleware from fastapi.responses import HTMLResponse, JSONResponse # Importing configuration and schemas from the clan_cli package import clan_cli.config as config from clan_cli.webui.schemas import Resolution -from fastapi.middleware.cors import CORSMiddleware # Creating FastAPI instances for different applications app_dlg = FastAPI(swagger_ui_parameters={"tryItOutEnabled": True}) @@ -35,6 +35,7 @@ for app, port in apps: allow_headers=["*"], ) + # Healthcheck endpoints for different applications @app_c1.get("/") async def root_c1() -> str: