Merge pull request #15180 from edx/clintonb/multi-tenant-catalog-integration

Updated CatalogIntegration to use a site-specific URL

openedx/features/enterprise_support/api.py

@@ -18,8 +18,8 @@ from edx_rest_api_client.client import EdxRestApiClient
 from requests.exceptions import ConnectionError, Timeout
 from slumber.exceptions import HttpClientError, HttpServerError, SlumberBaseException
 
-from openedx.core.djangoapps.api_admin.utils import course_discovery_api_client
 from openedx.core.djangoapps.catalog.models import CatalogIntegration
+from openedx.core.djangoapps.catalog.utils import create_catalog_api_client
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.lib.token_utils import JwtBuilder
 
@@ -31,7 +31,6 @@ try:
 except ImportError:
     pass
 
-
 CONSENT_FAILED_PARAMETER = 'consent_failed'
 LOGGER = logging.getLogger("edx.enterprise_helpers")
 
@@ -201,6 +200,7 @@ def data_sharing_consent_required(view_func):
     After granting consent, the user will be redirected back to the original request.path.
 
     """
+
     @wraps(view_func)
     def inner(request, course_id, *args, **kwargs):
         """
@@ -462,7 +462,7 @@ def is_course_in_enterprise_catalog(site, course_id, enterprise_catalog_id):
 
         try:
             # GET: /api/v1/catalogs/{catalog_id}/contains?course_run_id={course_run_ids}
-            response = course_discovery_api_client(user=user).catalogs(enterprise_catalog_id).contains.get(
+            response = create_catalog_api_client(user=user).catalogs(enterprise_catalog_id).contains.get(
                 course_run_id=course_id
             )
             cache.set(cache_key, response, settings.COURSES_API_CACHE_TIMEOUT)