diff --git a/Pipfile b/Pipfile index 2c4d443..c625fc2 100644 --- a/Pipfile +++ b/Pipfile @@ -11,6 +11,7 @@ flask-sqlalchemy = "~=2.5.1" sqlalchemy = "~=1.4.18" waitress = "~=2.0.0" pyyaml = "~=5.4.1" +flask-cors = "~=3.0.10" [dev-packages] flake8 = "~=3.9.2" diff --git a/Pipfile.lock b/Pipfile.lock index 135b693..88d226e 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "315632e3e0878039dcf4dfd73b8dc3f0285388bac45601cda9bca603b3a4ae18" + "sha256": "11a821c6c1f072dcf7c39a020056fa289b7a5283aa33d96e2ed6860fbc023fa4" }, "pipfile-spec": 6, "requires": { @@ -21,7 +21,6 @@ "sha256:a21fedebb3fb8f6bbbba51a11114f08c78709377051384c9c5ead5705ee93a51", "sha256:e78be5b919f5bb184e3e0e2dd1ca986f2362e29a2bc933c446fe89f39dbe4e9c" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3, 3.4, 3.5'", "version": "==1.6.5" }, "click": { @@ -29,7 +28,6 @@ "sha256:8c04c11192119b1ef78ea049e0a6f0463e4c48ef00a30160c704337586f3ad7a", "sha256:fba402a4a47334742d782209a7c79bc448911afe1149d07bdabdf480b3e2f4b6" ], - "markers": "python_version >= '3.6'", "version": "==8.0.1" }, "flask": { @@ -40,6 +38,14 @@ "index": "pypi", "version": "==2.0.1" }, + "flask-cors": { + "hashes": [ + "sha256:74efc975af1194fc7891ff5cd85b0f7478be4f7f59fe158102e91abb72bb4438", + "sha256:b60839393f3b84a0f3746f6cdca56c1ad7426aa738b70d6c61375857823181de" + ], + "index": "pypi", + "version": "==3.0.10" + }, "flask-migrate": { "hashes": [ "sha256:4d42e8f861d78cb6e9319afcba5bf76062e5efd7784184dd2a1cccd9de34a702", @@ -116,7 +122,6 @@ "sha256:5174094b9637652bdb841a3029700391451bd092ba3db90600dea710ba28e97c", "sha256:9e724d68fc22902a1435351f84c3fb8623f303fffcc566a4cb952df8c572cff0" ], - "markers": "python_version >= '3.6'", "version": "==2.0.1" }, "jinja2": { @@ -124,7 +129,6 @@ "sha256:1f06f2da51e7b56b8f238affdd6b4e2c61e39598a378cc49345bc1bd42a978a4", "sha256:703f484b47a6af502e743c9122595cc812b0271f661722403114f71a79d0f5a4" ], - "markers": "python_version >= '3.6'", "version": "==3.0.1" }, "mako": { @@ -132,7 +136,6 @@ "sha256:17831f0b7087c313c0ffae2bcbbd3c1d5ba9eeac9c38f2eb7b50e8c99fe9d5ab", "sha256:aea166356da44b9b830c8023cd9b557fa856bd8b4035d6de771ca027dfc5cc6e" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.1.4" }, "markupsafe": { @@ -172,7 +175,6 @@ "sha256:f9081981fe268bd86831e5c75f7de206ef275defcb82bc70740ae6dc507aee51", "sha256:fa130dd50c57d53368c9d59395cb5526eda596d3ffe36666cd81a44d56e48872" ], - "markers": "python_version >= '3.6'", "version": "==2.0.1" }, "python-dateutil": { @@ -180,7 +182,6 @@ "sha256:73ebfe9dbf22e832286dafa60473e4cd239f8592f699aa5adaf10050e6e1823c", "sha256:75bb3f31ea686f1197762692a9ee6a7550b59fc6ca3a1f4b5d7e32fb98e2da2a" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.8.1" }, "python-dotenv": { @@ -241,7 +242,6 @@ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.16.0" }, "sqlalchemy": { @@ -293,7 +293,6 @@ "sha256:1de1db30d010ff1af14a009224ec49ab2329ad2cde454c8a708130642d579c42", "sha256:6c1ec500dcdba0baa27600f6a22f6333d8b662d22027ff9f6202e3367413caa8" ], - "markers": "python_version >= '3.6'", "version": "==2.0.1" } }, @@ -310,7 +309,6 @@ "sha256:9e600479b3b99e8af981ecdfc80a0296104ee610cab48a5ae4ffd0b668650eb1", "sha256:b449c9c6118fe8cca7fa5e00b9ec60ba08145d281d52164230a69211c5d597a1" ], - "markers": "python_full_version >= '3.6.1'", "version": "==3.3.0" }, "distlib": { @@ -340,7 +338,6 @@ "sha256:18d0c531ee3dbc112fa6181f34faa179de3f57ea57ae2899754f16a7e0ff6421", "sha256:5b41f71471bc738e7b586308c3fca172f78940195cb3bf6734c1e66fdac49306" ], - "markers": "python_full_version >= '3.6.1'", "version": "==2.2.10" }, "mccabe": { @@ -370,7 +367,6 @@ "sha256:514f76d918fcc0b55c6680472f0a37970994e07bbb80725808c17089be302068", "sha256:c389c1d06bf7904078ca03399a4816f974a1d590090fecea0c63ec26ebaf1cef" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.7.0" }, "pyflakes": { @@ -378,7 +374,6 @@ "sha256:7893783d01b8a89811dd72d7dfd4d84ff098e5eed95cfa8905b22bbffe52efc3", "sha256:f5bc8ecabc05bb9d291eb5203d6810b49040f6ff446a756326104746cc00c1db" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==2.3.1" }, "pyyaml": { @@ -421,7 +416,6 @@ "sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926", "sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==1.16.0" }, "toml": { @@ -429,7 +423,6 @@ "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b", "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f" ], - "markers": "python_version >= '2.6' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==0.10.2" }, "virtualenv": { @@ -437,7 +430,6 @@ "sha256:14fdf849f80dbb29a4eb6caa9875d476ee2a5cf76a5f5415fa2f1606010ab467", "sha256:2b0126166ea7c9c3661f5b8e06773d28f83322de7a3ff7d06f0aed18c9de6a76" ], - "markers": "python_version >= '2.7' and python_version not in '3.0, 3.1, 3.2, 3.3'", "version": "==20.4.7" }, "yapf": { diff --git a/app.py b/app.py index 478a6be..312b338 100644 --- a/app.py +++ b/app.py @@ -3,6 +3,7 @@ import os from dotenv import load_dotenv, find_dotenv from flask import Flask +from flask_cors import CORS from flask_sqlalchemy import SQLAlchemy from flask_migrate import Migrate @@ -18,6 +19,9 @@ app.config["SQLALCHEMY_DATABASE_URI"] = os.getenv("SQLALCHEMY_DATABASE_URI") app.config["SQLALCHEMY_TRACK_MODIFICATIONS"] = False app.config["KI_DATA_DIR"] = os.path.dirname(__file__) + "/data" app.config["KI_AUTH"] = os.getenv("KI_AUTH") +app.config["CORS_ORIGINS"] = os.getenv("CORS_ORIGINS", "*") + +CORS(app) db = SQLAlchemy(app) migrate = Migrate(app, db) diff --git a/env.dev b/env.dev index 05bc64d..0f20923 100644 --- a/env.dev +++ b/env.dev @@ -1,4 +1,6 @@ -SQLALCHEMY_DATABASE_URI = 'sqlite:///data/ki.sqlite' +SQLALCHEMY_DATABASE_URI=sqlite:///data/ki.sqlite + +CORS_ORIGINS=* FLASK_APP=app.py FLASK_ENV=development diff --git a/ki/test/test_skills_endpoint.py b/ki/test/test_skills_endpoint.py index 80cfae6..9287c65 100644 --- a/ki/test/test_skills_endpoint.py +++ b/ki/test/test_skills_endpoint.py @@ -17,6 +17,12 @@ class TestSkillsEndpoint(unittest.TestCase): seed() + def test_skills_options(self): + response = self.client.options("/skills") + self.assertEqual(response.status_code, 200) + self.assertIn("Access-Control-Allow-Origin", response.headers) + self.assertEqual(response.headers["Access-Control-Allow-Origin"], "*") + def test_get_skills1(self): response = self.client.get("/skills?search=p") self.assertEqual(response.status_code, 200) @@ -30,6 +36,8 @@ class TestSkillsEndpoint(unittest.TestCase): "name": "Python" }] }, response.json) + self.assertIn("Access-Control-Allow-Origin", response.headers) + self.assertEqual(response.headers["Access-Control-Allow-Origin"], "*") if __name__ == "main":