From 067983b7160fd4ffed3e89817cbbbca747f4f520 Mon Sep 17 00:00:00 2001
From: Juho Inkinen <34240031+juhoinkinen@users.noreply.github.com>
Date: Wed, 15 Nov 2023 17:26:18 +0200
Subject: [PATCH] Drop using flask-cors (TODO use CORSMiddleware)

---
 annif/__init__.py | 6 ++----
 pyproject.toml    | 1 -
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/annif/__init__.py b/annif/__init__.py
index 3e0c26ea5..f9fd313c7 100644
--- a/annif/__init__.py
+++ b/annif/__init__.py
@@ -33,11 +33,9 @@ def create_flask_app(config_name: str | None = None) -> Flask:
 
 def create_app(config_name: str | None = None) -> Flask:
     """Create a Connexion app to be used for the API."""
-    # 'cxapp' here is the Connexion application that has a normal Flask app
-    # as a property (cxapp.app)
     import connexion
-    from flask_cors import CORS
 
+    # from flask_cors import CORS  # TODO Use CORSMiddleware
     import annif.registry
 
     # from annif.openapi.validation import CustomRequestBodyValidator  # TODO Re-enable
@@ -55,7 +53,7 @@ def create_app(config_name: str | None = None) -> Flask:
     cxapp.add_api("annif.yaml")  # validator_map=validator_map)
 
     # add CORS support
-    CORS(cxapp.app)
+    # CORS(cxapp.app)
 
     if cxapp.app.config["INITIALIZE_PROJECTS"]:
         annif.registry.initialize_projects(cxapp.app)
diff --git a/pyproject.toml b/pyproject.toml
index 2cda07895..acd7bab83 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -31,7 +31,6 @@ classifiers=[
 python = ">=3.8,<3.12"
 
 connexion = {version = "3.0.*", extras = ["flask","uvicorn", "swagger-ui"]}
-flask-cors = "4.0.*"
 click = "8.1.*"
 click-log = "0.4.*"
 joblib = "1.3.*"