diff --git a/src/FeatureBasedEnrollments/data/api.js b/src/FeatureBasedEnrollments/data/api.js index e6dcf336d..0517a5e42 100644 --- a/src/FeatureBasedEnrollments/data/api.js +++ b/src/FeatureBasedEnrollments/data/api.js @@ -1,10 +1,8 @@ import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth'; import { getConfig } from '@edx/frontend-platform'; -const { LMS_BASE_URL } = getConfig(); - export default async function getFeatureBasedEnrollmentDetails(courseId) { - const apiUrl = `${LMS_BASE_URL}/support/feature_based_enrollment_details/${courseId}`; + const apiUrl = `${getConfig().LMS_BASE_URL}/support/feature_based_enrollment_details/${courseId}`; try { const { data } = await getAuthenticatedHttpClient().get(apiUrl); return data; diff --git a/src/ProgramEnrollments/ProgramInspector/data/api.js b/src/ProgramEnrollments/ProgramInspector/data/api.js index b45ee9dfa..274b28d50 100644 --- a/src/ProgramEnrollments/ProgramInspector/data/api.js +++ b/src/ProgramEnrollments/ProgramInspector/data/api.js @@ -1,10 +1,8 @@ import { getAuthenticatedHttpClient } from '@edx/frontend-platform/auth'; import { getConfig } from '@edx/frontend-platform'; -const { LMS_BASE_URL } = getConfig(); - export async function getProgramEnrollmentsInspector({ params }) { - const apiUrl = `${LMS_BASE_URL}/support/program_enrollments_inspector_details${params}`; + const apiUrl = `${getConfig().LMS_BASE_URL}/support/program_enrollments_inspector_details${params}`; try { const { data } = await getAuthenticatedHttpClient().get(apiUrl); return data; @@ -24,7 +22,7 @@ export async function getProgramEnrollmentsInspector({ params }) { } export async function getSAMLProviderList() { - const apiUrl = `${LMS_BASE_URL}/support/get_saml_providers/`; + const apiUrl = `${getConfig().LMS_BASE_URL}/support/get_saml_providers/`; try { const { data } = await getAuthenticatedHttpClient().get(apiUrl); return data; diff --git a/src/supportHeader/Header.jsx b/src/supportHeader/Header.jsx index ca9d31a7d..2b82b0aa8 100644 --- a/src/supportHeader/Header.jsx +++ b/src/supportHeader/Header.jsx @@ -23,26 +23,26 @@ ensureConfig([ subscribe(APP_CONFIG_INITIALIZED, () => { mergeConfig({ - MINIMAL_HEADER: !!process.env.MINIMAL_HEADER, - PUBLISHER_BASE_URL: process.env.PUBLISHER_BASE_URL, - SUPPORT_CONFLUENCE: process.env.SUPPORT_CONFLUENCE, - SUPPORT_CUSTOMER_REQUEST: process.env.SUPPORT_CUSTOMER_REQUEST, + MINIMAL_HEADER: !!getConfig().MINIMAL_HEADER, + PUBLISHER_BASE_URL: getConfig().PUBLISHER_BASE_URL, + SUPPORT_CONFLUENCE: getConfig().SUPPORT_CONFLUENCE, + SUPPORT_CUSTOMER_REQUEST: getConfig().SUPPORT_CUSTOMER_REQUEST, }, 'Header additional config'); }); export default function Header() { const { authenticatedUser, config } = useContext(AppContext); - let COURSES_INTERNAL = config.LMS_BASE_URL; - let DISCOVERY_INTERNAL = config.DISCOVERY_API_BASE_URL; - let CREDENTIALS_INTERNAL = config.CREDENTIALS_BASE_URL; + let COURSES_INTERNAL = getConfig().LMS_BASE_URL; + let DISCOVERY_INTERNAL = getConfig().DISCOVERY_API_BASE_URL; + let CREDENTIALS_INTERNAL = getConfig().CREDENTIALS_BASE_URL; const { SUPPORT_CONFLUENCE, SUPPORT_CUSTOMER_REQUEST } = config; const { CONFIGURATION } = ROUTES; - if (config.LMS_BASE_URL.indexOf('.stage.') !== -1) { + if (getConfig().LMS_BASE_URL.indexOf('.stage.') !== -1) { COURSES_INTERNAL = COURSES_INTERNAL.replace('.stage.', '-internal.stage.'); DISCOVERY_INTERNAL = DISCOVERY_INTERNAL.replace('.stage.', '-internal.stage.'); CREDENTIALS_INTERNAL = CREDENTIALS_INTERNAL.replace('.stage.', '-internal.stage.'); - } else if (config.LMS_BASE_URL.indexOf('.edx.') !== -1) { + } else if (getConfig().LMS_BASE_URL.indexOf('.edx.') !== -1) { COURSES_INTERNAL = COURSES_INTERNAL.replace('.edx.', '-internal.edx.'); DISCOVERY_INTERNAL = DISCOVERY_INTERNAL.replace('.edx.', '-internal.edx.'); CREDENTIALS_INTERNAL = CREDENTIALS_INTERNAL.replace('.edx.', '-internal.edx.'); @@ -56,7 +56,7 @@ export default function Header() { { type: 'item', content: 'Support Tools', - href: `${config.BASE_URL}`, + href: `${getConfig().BASE_URL}`, }, { type: 'submenu', @@ -73,10 +73,10 @@ export default function Header() { content: 'Payment', submenuContent: ( <> -
Otto
+
Otto
Cybersource
Paypal
-
Enterprise Coupons
+
Enterprise Coupons
), }, @@ -85,9 +85,9 @@ export default function Header() { content: 'Courses', submenuContent: ( <> -
Publisher
-
Discovery
-
Course Catalogue
+
Publisher
+
Discovery
+
Course Catalogue
), }, @@ -101,7 +101,7 @@ export default function Header() { content: 'Programs', submenuContent: ( <> -
Learner Record
+
Learner Record
Credentials Search
Programs Discovery
@@ -115,7 +115,7 @@ export default function Header() { content: 'Enterprise Setup', submenuContent: getConfig().FEATURE_CONFIGURATION_ENTERPRISE_PROVISION - ? (
Learner Credit Plans
) + ? (
Learner Credit Plans
) : null, }; if (getConfig().FEATURE_CONFIGURATION_MANAGEMENT) { @@ -125,13 +125,13 @@ export default function Header() { const dashboardMenuItem = { type: 'item', - href: `${config.LMS_BASE_URL}/dashboard`, + href: `${getConfig().LMS_BASE_URL}/dashboard`, content: 'Dashboard', }; const logoutMenuItem = { type: 'item', - href: config.LOGOUT_URL, + href: getConfig().LOGOUT_URL, content: 'Logout', }; @@ -139,12 +139,12 @@ export default function Header() { dashboardMenuItem, { type: 'item', - href: `${config.LMS_BASE_URL}/u/${authenticatedUser.username}`, + href: `${getConfig().LMS_BASE_URL}/u/${authenticatedUser.username}`, content: 'Profile', }, { type: 'item', - href: `${config.LMS_BASE_URL}/account/settings`, + href: `${getConfig().LMS_BASE_URL}/account/settings`, content: 'Account', }, logoutMenuItem, @@ -160,16 +160,16 @@ export default function Header() { const loggedOutItems = [ { type: 'item', - href: config.LOGIN_URL, + href: getConfig().LOGIN_URL, content: 'Login', }, ]; const props = { - logo: config.LOGO_URL, + logo: getConfig().LOGO_URL, logoAltText: 'edX', siteName: 'edX', - logoDestination: getConfig().MINIMAL_HEADER ? null : `${config.LMS_BASE_URL}/dashboard`, + logoDestination: getConfig().MINIMAL_HEADER ? null : `${getConfig().LMS_BASE_URL}/dashboard`, loggedIn: authenticatedUser !== null, username: authenticatedUser !== null ? authenticatedUser.username : null, avatar: authenticatedUser !== null ? authenticatedUser.avatar : null, diff --git a/src/users/data/urls.js b/src/users/data/urls.js index ea63a5d29..631144eff 100644 --- a/src/users/data/urls.js +++ b/src/users/data/urls.js @@ -1,18 +1,16 @@ import { getConfig } from '@edx/frontend-platform'; import { isEmail, isValidLMSUserID, isValidUsername } from '../../utils/index'; -const { LMS_BASE_URL, CREDENTIALS_BASE_URL, ECOMMERCE_BASE_URL } = getConfig(); - export const getEnrollmentsUrl = username => `${ - LMS_BASE_URL + getConfig().LMS_BASE_URL }/support/enrollment/${username}`; export const getSSORecordsUrl = username => `${ - LMS_BASE_URL + getConfig().LMS_BASE_URL }/support/sso_records/${username}`; export const getUserAccountUrl = userIdentifier => { - let baseUrl = `${LMS_BASE_URL}/api/user/v1/accounts`; + let baseUrl = `${getConfig().LMS_BASE_URL}/api/user/v1/accounts`; const identifierIsEmail = isEmail(userIdentifier); const identifierIsUsername = isValidUsername(userIdentifier); const identifierIsLMSUserID = isValidLMSUserID(userIdentifier); @@ -32,27 +30,27 @@ export const getUserAccountUrl = userIdentifier => { }; export const getEnterpriseCustomerUsersUrl = () => `${ - LMS_BASE_URL + getConfig().LMS_BASE_URL }/enterprise/api/v1/enterprise-learner/`; export const getUserVerificationDetailUrl = username => `${ - LMS_BASE_URL + getConfig().LMS_BASE_URL }/api/user/v1/accounts/${username}/verifications/`; export const getUserVerificationStatusUrl = username => `${ - LMS_BASE_URL + getConfig().LMS_BASE_URL }/api/user/v1/accounts/${username}/verification_status/`; export const getVerifiedNameHistoryUrl = username => `${ - LMS_BASE_URL + getConfig().LMS_BASE_URL }/api/edx_name_affirmation/v1/verified_name/history?username=${username}`; export const getVerificationAttemptDetailsByIdUrl = attemptId => `${ - LMS_BASE_URL + getConfig().LMS_BASE_URL }/api/user/v1/accounts/verifications/${attemptId}/`; export const getUserPasswordStatusUrl = userIdentifier => `${ - LMS_BASE_URL + getConfig().LMS_BASE_URL }/support/manage_user/${userIdentifier}`; export const getLicenseManagerUrl = () => `${ @@ -68,48 +66,48 @@ export const getEntitlementUrl = (uuid = null) => { if (uuid) { postfix = `${uuid}/`; } - return `${LMS_BASE_URL}/api/entitlements/v1/entitlements/${postfix}`; + return `${getConfig().LMS_BASE_URL}/api/entitlements/v1/entitlements/${postfix}`; }; export const getTogglePasswordStatusUrl = user => `${ - LMS_BASE_URL + getConfig().LMS_BASE_URL }/support/manage_user/${user}`; export const getResetPasswordUrl = () => `${ - LMS_BASE_URL + getConfig().LMS_BASE_URL }/account/password`; export const CancelRetirementUrl = () => `${ - LMS_BASE_URL + getConfig().LMS_BASE_URL }/api/user/v1/accounts/cancel_retirement/`; export const userRetirementUrl = () => `${ - LMS_BASE_URL + getConfig().LMS_BASE_URL }/v1/accounts/bulk_retire_users`; export const getAccountActivationUrl = (activationKey) => `${ - LMS_BASE_URL + getConfig().LMS_BASE_URL }/activate/${activationKey}`; export const getOnboardingStatusUrl = (username) => `${ - LMS_BASE_URL + getConfig().LMS_BASE_URL }/support/onboarding_status/${encodeURIComponent(username)}`; export const getCertificateUrl = (username, courseKey) => `${ - LMS_BASE_URL + getConfig().LMS_BASE_URL }/certificates/search?user=${username}&course_id=${courseKey}`; export const generateCertificateUrl = () => `${ - LMS_BASE_URL + getConfig().LMS_BASE_URL }/certificates/generate`; export const regenerateCertificateUrl = () => `${ - LMS_BASE_URL + getConfig().LMS_BASE_URL }/certificates/regenerate`; -export const getUserCredentialsUrl = () => `${CREDENTIALS_BASE_URL}/api/v2/credentials`; +export const getUserCredentialsUrl = () => `${getConfig().CREDENTIALS_BASE_URL}/api/v2/credentials`; -export const getLearnerRecordsUrl = () => `${CREDENTIALS_BASE_URL}/records/api/v1/program_records`; +export const getLearnerRecordsUrl = () => `${getConfig().CREDENTIALS_BASE_URL}/records/api/v1/program_records`; -export const getOrderHistoryUrl = () => `${ECOMMERCE_BASE_URL}/api/v2/orders`; +export const getOrderHistoryUrl = () => `${getConfig().ECOMMERCE_BASE_URL}/api/v2/orders`; -export const courseResetUrl = (username) => `${LMS_BASE_URL}/support/course_reset/${username}`; +export const courseResetUrl = (username) => `${getConfig().LMS_BASE_URL}/support/course_reset/${username}`;