diff --git a/src/Components/CreateImageWizard/CreateImageWizard.js b/src/Components/CreateImageWizard/CreateImageWizard.js index a6d62d63..b7e8f1aa 100644 --- a/src/Components/CreateImageWizard/CreateImageWizard.js +++ b/src/Components/CreateImageWizard/CreateImageWizard.js @@ -44,16 +44,16 @@ const onSave = (values) => { 'activation-key': values['subscription-activation-key'], insights: true, organization: Number(values['subscription-organization-id']), - 'server-url': 'subscription.rhsm.redhat.com', - 'base-url': 'https://cdn.redhat.com/', + 'server-url': values['subscription-server-url'], + 'base-url': values['subscription-base-url'], }; } else if (values['register-system'] === 'register-now') { customizations.subscription = { 'activation-key': values['subscription-activation-key'], insights: false, organization: Number(values['subscription-organization-id']), - 'server-url': 'subscription.rhsm.redhat.com', - 'base-url': 'https://cdn.redhat.com/', + 'server-url': values['subscription-server-url'], + 'base-url': values['subscription-base-url'], }; } @@ -359,6 +359,15 @@ const requestToState = (composeRequest) => { formState['subscription-activation-key'] = subscription['activation-key']; formState['subscription-organization-id'] = subscription.organization; + + if (insights.chrome.isProd()) { + formState['subscription-server-url'] = 'subscription.rhsm.redhat.com'; + formState['subscription-base-url'] = 'https://cdn.redhat.com/'; + } else { + formState['subscription-server-url'] = + 'subscription.rhsm.stage.redhat.com'; + formState['subscription-base-url'] = 'https://cdn.stage.redhat.com/'; + } } else { formState['register-system'] = 'register-later'; } diff --git a/src/Components/CreateImageWizard/formComponents/ActivationKeys.js b/src/Components/CreateImageWizard/formComponents/ActivationKeys.js index 1c334db7..b4d9e4db 100644 --- a/src/Components/CreateImageWizard/formComponents/ActivationKeys.js +++ b/src/Components/CreateImageWizard/formComponents/ActivationKeys.js @@ -28,6 +28,14 @@ const ActivationKeys = ({ label, isRequired, ...props }) => { setActivationKeys(keys); setIsLoading(false); }); + + if (insights.chrome.isProd()) { + change('subscription-server-url', 'subscription.rhsm.redhat.com'); + change('subscription-base-url', 'https://cdn.redhat.com/'); + } else { + change('subscription-server-url', 'subscription.rhsm.stage.redhat.com'); + change('subscription-base-url', 'https://cdn.stage.redhat.com/'); + } }, []); const setActivationKey = (_, selection) => { diff --git a/src/test/Components/CreateImageWizard/CreateImageWizard.test.js b/src/test/Components/CreateImageWizard/CreateImageWizard.test.js index 197cd72d..65f64d35 100644 --- a/src/test/Components/CreateImageWizard/CreateImageWizard.test.js +++ b/src/test/Components/CreateImageWizard/CreateImageWizard.test.js @@ -151,6 +151,9 @@ beforeAll(() => { isBeta: () => { return true; }, + isProd: () => { + return true; + }, }, }; });