diff --git a/cms/envs/common.py b/cms/envs/common.py index dbf695fbf1..af82aa37bd 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -362,6 +362,7 @@ AUTHENTICATION_BACKENDS = ( LMS_BASE = None LMS_ROOT_URL = "http://localhost:8000" +LMS_ENROLLMENT_API_PATH = "/api/enrollment/v1/" ENTERPRISE_API_URL = LMS_ROOT_URL + '/enterprise/api/v1/' ENTERPRISE_CONSENT_API_URL = LMS_ROOT_URL + '/consent/api/v1/' @@ -1391,7 +1392,7 @@ USER_TASKS_MAX_AGE = timedelta(days=7) ############## Settings for the Enterprise App ###################### -ENTERPRISE_ENROLLMENT_API_URL = LMS_ROOT_URL + "/api/enrollment/v1/" +ENTERPRISE_ENROLLMENT_API_URL = LMS_ROOT_URL + LMS_ENROLLMENT_API_PATH ENTERPRISE_SERVICE_WORKER_USERNAME = 'enterprise_worker' ENTERPRISE_API_CACHE_TIMEOUT = 3600 # Value is in seconds diff --git a/lms/envs/aws.py b/lms/envs/aws.py index e4d9bf9431..1d7c39cc5b 100644 --- a/lms/envs/aws.py +++ b/lms/envs/aws.py @@ -939,7 +939,7 @@ HELP_TOKENS_BOOKS = ENV_TOKENS.get('HELP_TOKENS_BOOKS', HELP_TOKENS_BOOKS) # Publicly-accessible enrollment URL, for use on the client side. ENTERPRISE_PUBLIC_ENROLLMENT_API_URL = ENV_TOKENS.get( 'ENTERPRISE_PUBLIC_ENROLLMENT_API_URL', - (LMS_ROOT_URL or '') + '/api/enrollment/v1/' + (LMS_ROOT_URL or '') + LMS_ENROLLMENT_API_PATH ) # Enrollment URL used on the server-side. diff --git a/lms/envs/common.py b/lms/envs/common.py index 0b7b3376aa..b55e4e3e49 100644 --- a/lms/envs/common.py +++ b/lms/envs/common.py @@ -60,6 +60,7 @@ DISCUSSION_SETTINGS = { } LMS_ROOT_URL = "http://localhost:8000" +LMS_ENROLLMENT_API_PATH = "/api/enrollment/v1/" # Features FEATURES = { @@ -3248,7 +3249,7 @@ HELP_TOKENS_BOOKS = { # These configuration settings are specific to the Enterprise service and you should # not find references to them within the edx-platform project. -ENTERPRISE_ENROLLMENT_API_URL = LMS_ROOT_URL + "/api/enrollment/v1/" +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 = '' diff --git a/requirements/edx/base.txt b/requirements/edx/base.txt index 1f722575cb..aa8696c632 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.50.1 +edx-enterprise==0.51.0 edx-oauth2-provider==1.2.2 edx-opaque-keys==0.4.0 edx-organizations==0.4.6