fixup: rework settings structure.

lms/envs/aws.py

@@ -601,12 +601,10 @@ if FEATURES.get('ENABLE_OAUTH2_PROVIDER'):
     OAUTH_OIDC_ISSUER = ENV_TOKENS['OAUTH_OIDC_ISSUER']
     OAUTH_ENFORCE_SECURE = ENV_TOKENS.get('OAUTH_ENFORCE_SECURE', True)
     OAUTH_ENFORCE_CLIENT_SECURE = ENV_TOKENS.get('OAUTH_ENFORCE_CLIENT_SECURE', True)
-    # Defaults for the following are defined in provider.constants in django-oauth2-provider
+    # Defaults for the following are defined in lms.envs.common
     if 'OAUTH_EXPIRE_DELTA_DAYS' in ENV_TOKENS:
-        # Default = 365 days
         OAUTH_EXPIRE_DELTA = datetime.timedelta(days=ENV_TOKENS['OAUTH_EXPIRE_DELTA_DAYS'])
     if 'OAUTH_EXPIRE_DELTA_PUBLIC_DAYS' in ENV_TOKENS:
-        # Default = 30 days
         OAUTH_EXPIRE_DELTA_PUBLIC = datetime.timedelta(days=ENV_TOKENS['OAUTH_EXPIRE_DELTA_PUBLIC_DAYS'])
 
 ##### ADVANCED_SECURITY_CONFIG #####

lms/envs/common.py

@@ -29,9 +29,10 @@ Longer TODO:
 # and throws spurious errors. Therefore, we disable invalid-name checking.
 # pylint: disable=invalid-name
 
+import datetime
+import imp
 import sys
 import os
-import imp
 
 from path import Path as path
 from warnings import simplefilter
@@ -444,6 +445,9 @@ OAUTH_OIDC_USERINFO_HANDLERS = (
     'oauth2_handler.UserInfoHandler'
 )
 
+OAUTH_EXPIRE_DELTA = datetime.timedelta(days=365)
+OAUTH_EXPIRE_DELTA_PUBLIC = datetime.timedelta(days=30)
+
 ################################## TEMPLATE CONFIGURATION #####################################
 # Mako templating
 # TODO: Move the Mako templating into a different engine in TEMPLATES below.