From 285bbe849b23814c38383a1b812cc8e7c2358e31 Mon Sep 17 00:00:00 2001
From: Jillian Vogel <jill@opencraft.com>
Date: Mon, 13 Apr 2020 16:15:16 +0930
Subject: [PATCH] Use DCS_* prefix for django-cookies-samesite settings

to avoid conflicts with settings in Django>2.2
---
 lms/envs/common.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lms/envs/common.py b/lms/envs/common.py
index 833b292acd..652fd0f02e 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1144,8 +1144,10 @@ SESSION_SAVE_EVERY_REQUEST = False
 SESSION_SERIALIZER = 'openedx.core.lib.session_serializers.PickleSerializer'
 SESSION_COOKIE_DOMAIN = ""
 SESSION_COOKIE_NAME = 'sessionid'
-SESSION_COOKIE_SAMESITE = 'None'
-SESSION_COOKIE_SAMESITE_FORCE_ALL = True
+
+# django-session-cookie middleware
+DCS_SESSION_COOKIE_SAMESITE = 'None'
+DCS_SESSION_COOKIE_SAMESITE_FORCE_ALL = True
 
 # CMS base
 CMS_BASE = 'localhost:18010'