From bad68f8b1eec17c732296fa8576ebbaab188e93f Mon Sep 17 00:00:00 2001
From: bmedx <bmesick@edx.org>
Date: Fri, 1 Sep 2017 11:06:54 -0400
Subject: [PATCH] Add default OAUTH_DELETE_EXPIRED to LMS settings

---
 lms/envs/aws.py    | 2 +-
 lms/envs/common.py | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lms/envs/aws.py b/lms/envs/aws.py
index 58dfc6da70..2679211d2e 100644
--- a/lms/envs/aws.py
+++ b/lms/envs/aws.py
@@ -724,7 +724,7 @@ if FEATURES.get('ENABLE_OAUTH2_PROVIDER'):
         days=ENV_TOKENS.get('OAUTH_EXPIRE_PUBLIC_CLIENT_DAYS', OAUTH_EXPIRE_PUBLIC_CLIENT_DAYS)
     )
     OAUTH_ID_TOKEN_EXPIRATION = ENV_TOKENS.get('OAUTH_ID_TOKEN_EXPIRATION', OAUTH_ID_TOKEN_EXPIRATION)
-
+    OAUTH_DELETE_EXPIRED = ENV_TOKENS.get('OAUTH_DELETE_EXPIRED', OAUTH_DELETE_EXPIRED)
 
 ##### ADVANCED_SECURITY_CONFIG #####
 ADVANCED_SECURITY_CONFIG = ENV_TOKENS.get('ADVANCED_SECURITY_CONFIG', {})
diff --git a/lms/envs/common.py b/lms/envs/common.py
index b7bce352ae..4d85782d27 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -2878,7 +2878,8 @@ COURSE_ABOUT_VISIBILITY_PERMISSION = 'see_exists'
 # Enrollment API Cache Timeout
 ENROLLMENT_COURSE_DETAILS_CACHE_TIMEOUT = 60
 
-
+# Automatically clean up edx-django-oauth2-provider tokens on use
+OAUTH_DELETE_EXPIRED = True
 OAUTH_ID_TOKEN_EXPIRATION = 60 * 60
 
 # These tabs are currently disabled