Merge pull request #28993 from edx/iamsobanjaved/django32-samesite-cookies

fix: update samesite cookie settings name for Django 3.2
This commit is contained in:
Feanil Patel
2021-10-13 11:11:39 -04:00
committed by GitHub

View File

@@ -157,6 +157,12 @@ SESSION_COOKIE_HTTPONLY = ENV_TOKENS.get('SESSION_COOKIE_HTTPONLY', True)
DCS_SESSION_COOKIE_SAMESITE = ENV_TOKENS.get('DCS_SESSION_COOKIE_SAMESITE', DCS_SESSION_COOKIE_SAMESITE)
DCS_SESSION_COOKIE_SAMESITE_FORCE_ALL = ENV_TOKENS.get('DCS_SESSION_COOKIE_SAMESITE_FORCE_ALL', DCS_SESSION_COOKIE_SAMESITE_FORCE_ALL) # lint-amnesty, pylint: disable=line-too-long
# As django-cookies-samesite package is set to be removed from base requirements when we upgrade to Django 3.2,
# we should follow the settings name provided by Django.
# https://docs.djangoproject.com/en/3.2/ref/settings/#session-cookie-samesite
if django.VERSION >= (3, 1):
SESSION_COOKIE_SAMESITE = DCS_SESSION_COOKIE_SAMESITE
AWS_SES_REGION_NAME = ENV_TOKENS.get('AWS_SES_REGION_NAME', 'us-east-1')
AWS_SES_REGION_ENDPOINT = ENV_TOKENS.get('AWS_SES_REGION_ENDPOINT', 'email.us-east-1.amazonaws.com')