From 23640d001947490ed37bc7d702768212dd98a21f Mon Sep 17 00:00:00 2001 From: Brittney Exline Date: Tue, 10 Oct 2017 13:56:34 -0400 Subject: [PATCH] ENT-594 Enterprise version bump and Add settings variable for ENTERPRISE_REPORTING_SECRET --- lms/envs/aws.py | 7 +++++++ lms/envs/common.py | 2 ++ requirements/edx/base.txt | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/lms/envs/aws.py b/lms/envs/aws.py index e8e36a2fa8..8b61c3d70c 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -974,6 +974,13 @@ ENTERPRISE_SUPPORT_URL = ENV_TOKENS.get( ENTERPRISE_SUPPORT_URL ) +# A shared secret to be used for encrypting passwords passed from the enterprise api +# to the enteprise reporting script. +ENTERPRISE_REPORTING_SECRET = AUTH_TOKENS.get( + 'ENTERPRISE_REPORTING_SECRET', + ENTERPRISE_REPORTING_SECRET +) + ############## ENTERPRISE SERVICE API CLIENT CONFIGURATION ###################### # The LMS communicates with the Enterprise service via the EdxRestApiClient class # The below environmental settings are utilized by the LMS when interacting with diff --git a/lms/envs/common.py b/lms/envs/common.py index 096fbd81d1..656a7a02a3 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -3270,6 +3270,8 @@ ENTERPRISE_ENROLLMENT_API_URL = LMS_ROOT_URL + LMS_ENROLLMENT_API_PATH ENTERPRISE_PUBLIC_ENROLLMENT_API_URL = ENTERPRISE_ENROLLMENT_API_URL ENTERPRISE_COURSE_ENROLLMENT_AUDIT_MODES = ['audit', 'honor'] ENTERPRISE_SUPPORT_URL = '' +# The default value of this needs to be a 16 character string +ENTERPRISE_REPORTING_SECRET = '0000000000000000' ############## ENTERPRISE SERVICE API CLIENT CONFIGURATION ###################### # The LMS communicates with the Enterprise service via the EdxRestApiClient class diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 8710e1b169..6a4f965292 100644 --- a/requirements/edx/base.txt +++ b/requirements/edx/base.txt @@ -47,7 +47,7 @@ edx-lint==0.4.3 astroid==1.3.8 edx-django-oauth2-provider==1.2.5 edx-django-sites-extensions==2.3.0 -edx-enterprise==0.52.2 +edx-enterprise==0.52.3 edx-oauth2-provider==1.2.2 edx-opaque-keys==0.4.0 edx-organizations==0.4.7