From f4ce1db0b50a96406c4003572b4570d12ddb7024 Mon Sep 17 00:00:00 2001 From: Aadith PM Date: Fri, 17 Jul 2020 08:37:15 -0500 Subject: [PATCH 1/6] Update requirements to include django-cors-headers with DRF [PR #2650] --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index ba62bae0..bf615266 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -41,4 +41,6 @@ django-redis==4.12.1 # https://github.com/jazzband/django-redis {%- if cookiecutter.use_drf == "y" %} # Django REST Framework djangorestframework==3.11.0 # https://github.com/encode/django-rest-framework +# Django CORS Headers +django-cors-headers==0.01 # https://github.com/adamchainz/django-cors-headers {%- endif %} From 15718f8088967ed6ba71403dafde5fd7d3ba1393 Mon Sep 17 00:00:00 2001 From: Aadith PM Date: Fri, 17 Jul 2020 08:49:59 -0500 Subject: [PATCH 2/6] Update CONTRIBUTORS.rst --- CONTRIBUTORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index bba9554a..cc7f0e1d 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -44,6 +44,7 @@ Listed in alphabetical order. 18 `@dezoito`_ 2O4 `@2O4`_ a7p `@a7p`_ + Aadith PM `@aadithpm`_ Aaron Eikenberry `@aeikenberry`_ Adam BogdaƂ `@bogdal`_ Adam Dobrawy `@ad-m`_ From 1526aafab39ebbefeb577f24fe2fb8e2c5f71869 Mon Sep 17 00:00:00 2001 From: Aadith PM Date: Fri, 17 Jul 2020 09:07:33 -0500 Subject: [PATCH 3/6] Update CONTRIBUTORS.rst - add link to GH --- CONTRIBUTORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index cc7f0e1d..875ece2e 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -236,6 +236,7 @@ Listed in alphabetical order. Yuchen Xie `@mapx`_ ========================== ============================ ============== +.. _@aadithpm: https://github.com/aadithpm .. _@a7p: https://github.com/a7p .. _@2O4: https://github.com/2O4 .. _@ad-m: https://github.com/ad-m From eafe74262a8c5d9e32dc1d0b8cbe643c4dc79f04 Mon Sep 17 00:00:00 2001 From: Aadith PM Date: Sat, 18 Jul 2020 19:53:55 -0500 Subject: [PATCH 4/6] Added django-cors-headers setup steps to base settings --- {{cookiecutter.project_slug}}/config/settings/base.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 7f339fad..fe1329c4 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -80,6 +80,7 @@ THIRD_PARTY_APPS = [ {%- if cookiecutter.use_drf == "y" %} "rest_framework", "rest_framework.authtoken", + "corsheaders", {%- endif %} ] @@ -134,6 +135,9 @@ AUTH_PASSWORD_VALIDATORS = [ # https://docs.djangoproject.com/en/dev/ref/settings/#middleware MIDDLEWARE = [ "django.middleware.security.SecurityMiddleware", +{%- if cookiecutter.use_drf == 'y' %} + "corsheaders.middleware.CorsMiddleware", +{%- endif %} {%- if cookiecutter.use_whitenoise == 'y' %} "whitenoise.middleware.WhiteNoiseMiddleware", {%- endif %} @@ -321,6 +325,12 @@ REST_FRAMEWORK = { ), "DEFAULT_PERMISSION_CLASSES": ("rest_framework.permissions.IsAuthenticated",), } + +# django-cors-headers - https://github.com/adamchainz/django-cors-headers#setup +CORS_URLS_REGEX = { + r'^/api.*$', +} + {%- endif %} # Your stuff... # ------------------------------------------------------------------------------ From 20986bafb7c83a8939c3fbd6bbe7bc1d58b6f032 Mon Sep 17 00:00:00 2001 From: Aadith PM Date: Sat, 18 Jul 2020 20:37:03 -0500 Subject: [PATCH 5/6] Fix style error with quotes --- {{cookiecutter.project_slug}}/config/settings/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index fe1329c4..2efd2fcd 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -328,7 +328,7 @@ REST_FRAMEWORK = { # django-cors-headers - https://github.com/adamchainz/django-cors-headers#setup CORS_URLS_REGEX = { - r'^/api.*$', + r"^/api.*$", } {%- endif %} From ff69126087fadc479c50b27d1b1ec3b6b747e68d Mon Sep 17 00:00:00 2001 From: Aadith PM Date: Mon, 20 Jul 2020 11:21:06 -0500 Subject: [PATCH 6/6] Update {{cookiecutter.project_slug}}/config/settings/base.py Co-authored-by: Bruno Alla --- {{cookiecutter.project_slug}}/config/settings/base.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py index 2efd2fcd..f69908c2 100644 --- a/{{cookiecutter.project_slug}}/config/settings/base.py +++ b/{{cookiecutter.project_slug}}/config/settings/base.py @@ -327,9 +327,7 @@ REST_FRAMEWORK = { } # django-cors-headers - https://github.com/adamchainz/django-cors-headers#setup -CORS_URLS_REGEX = { - r"^/api.*$", -} +CORS_URLS_REGEX = r"^/api/.*$" {%- endif %} # Your stuff...