From 832fcf15c9db61d0062e60baa85b95fc682dbd1b Mon Sep 17 00:00:00 2001 From: Jeff LaJoie Date: Mon, 10 Aug 2020 20:56:06 -0400 Subject: [PATCH] fix: adds optional params for when process.env isn't configured --- src/learnerPortalLinks.js | 24 +++++++++++++++++++----- src/service.js | 2 +- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/learnerPortalLinks.js b/src/learnerPortalLinks.js index 623c8218..1ac3cc05 100644 --- a/src/learnerPortalLinks.js +++ b/src/learnerPortalLinks.js @@ -16,13 +16,17 @@ function cacheLinks(userId, links) { ); } -async function fetchLearnerPortalLinks(apiClient, userId) { +async function fetchLearnerPortalLinks( + apiClient, + userId, + learnerPortalHostname = process.env.ENTERPRISE_LEARNER_PORTAL_HOSTNAME, + lmsBaseUrl = process.env.LMS_BASE_URL, +) { const learnerPortalLinks = []; - const learnerPortalHostname = process.env.ENTERPRISE_LEARNER_PORTAL_HOSTNAME; if (!learnerPortalHostname) { return learnerPortalLinks; } - const response = await fetchEnterpriseCustomers(apiClient); + const response = await fetchEnterpriseCustomers(apiClient, lmsBaseUrl); const enterpriseCustomers = response.data.results; try { for (let i = 0; i < enterpriseCustomers.length; i += 1) { @@ -72,7 +76,12 @@ function getCachedLearnerPortalLinks(userId) { return null; } -export default async function getLearnerPortalLinks(apiClient, authenticatedUser) { +export default async function getLearnerPortalLinks( + apiClient, + authenticatedUser, + learnerPortalHostname = process.env.ENTERPRISE_LEARNER_PORTAL_HOSTNAME, + lmsBaseUrl = process.env.LMS_BASE_URL, +) { let learnerPortalLinks = []; if (authenticatedUser !== null && isEnterpriseUser(authenticatedUser)) { @@ -82,7 +91,12 @@ export default async function getLearnerPortalLinks(apiClient, authenticatedUser if (cachedLinks != null) { learnerPortalLinks = learnerPortalLinks.concat(cachedLinks); } else { - const links = await fetchLearnerPortalLinks(apiClient, userId); + const links = await fetchLearnerPortalLinks( + apiClient, + userId, + learnerPortalHostname, + lmsBaseUrl, + ); learnerPortalLinks = learnerPortalLinks.concat(links); } } diff --git a/src/service.js b/src/service.js index b4c7d07f..767f283c 100644 --- a/src/service.js +++ b/src/service.js @@ -1,4 +1,4 @@ -const fetchEnterpriseCustomers = apiClient => apiClient.get(`${process.env.LMS_BASE_URL}/enterprise/api/v1/enterprise-customer/`); +const fetchEnterpriseCustomers = (apiClient, lmsBaseUrl = process.env.LMS_BASE_URL) => apiClient.get(`${lmsBaseUrl}/enterprise/api/v1/enterprise-customer/`); // eslint-disable-next-line import/prefer-default-export export { fetchEnterpriseCustomers };