Fix logout URL

* ENT-2651 Recovery email Field UX logic on Account Settings page was not same to Dashboard

.env.development

@@ -6,10 +6,10 @@ ECOMMERCE_BASE_URL='http://localhost:18130'
 LANGUAGE_PREFERENCE_COOKIE_NAME='openedx-language-preference'
 LMS_BASE_URL='http://localhost:18000'
 LOGIN_URL='http://localhost:18000/login'
-LOGOUT_URL='http://localhost:18000/login'
+LOGOUT_URL='http://localhost:18000/logout'
 MARKETING_SITE_BASE_URL='http://localhost:18000'
 NODE_ENV='development'
-ORDER_HISTORY_URL='localhost:19000/orders/'
+ORDER_HISTORY_URL='localhost:19000/ecommerce/orders'
 PORT=1997  # For standalone dev server only.
 REFRESH_ACCESS_TOKEN_ENDPOINT='http://localhost:18000/login_refresh'
 SEGMENT_KEY=null

package-lock.json

@@ -1227,8 +1227,8 @@
       "dev": true
     },
     "@edx/frontend-build": {
-      "version": "github:kdmccormick/frontend-build#ede052584eca228a59ba74dddfc5f50f53767160",
-      "from": "github:kdmccormick/frontend-build#kdmccormick/devstack",
+      "version": "github:edx/frontend-build#ef4a28babe18c05e1dfc344d0f9b21c7bebb0687",
+      "from": "github:edx/frontend-build#kdmccormick/devstack-frontends",
       "dev": true,
       "requires": {
         "@babel/cli": "7.8.4",
@@ -2703,9 +2703,9 @@
       }
     },
     "@types/babel__traverse": {
-      "version": "7.0.9",
-      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.9.tgz",
-      "integrity": "sha512-jEFQ8L1tuvPjOI8lnpaf73oCJe+aoxL6ygqSy6c8LcW98zaC+4mzWuQIRCEvKeCOu+lbqdXcg4Uqmm1S8AP1tw==",
+      "version": "7.0.10",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.10.tgz",
+      "integrity": "sha512-74fNdUGrWsgIB/V9kTO5FGHPWYY6Eqn+3Z7L6Hc4e/BxjYV7puvBqp5HwsVYYfLm6iURYBNCx4Ut37OF9yitCw==",
       "dev": true,
       "requires": {
         "@babel/types": "^7.3.0"
@@ -6941,9 +6941,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.397",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.397.tgz",
-      "integrity": "sha512-zcUd1p/7yzTSdWkCTrqGvbnEOASy96d0RJL/lc5BDJoO23Z3G/VHd0yIPbguDU9n8QNUTCigLO7oEdtOb7fp2A==",
+      "version": "1.3.398",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.398.tgz",
+      "integrity": "sha512-BJjxuWLKFbM5axH3vES7HKMQgAknq9PZHBkMK/rEXUQG9i1Iw5R+6hGkm6GtsQSANjSUrh/a6m32nzCNDNo/+w==",
       "dev": true
     },
     "elliptic": {
@@ -20576,9 +20576,9 @@
       }
     },
     "strip-json-comments": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.0.1.tgz",
-      "integrity": "sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.0.tgz",
+      "integrity": "sha512-e6/d0eBu7gHtdCqFt0xJr642LdToM5/cN4Qb9DbHjVx1CP5RyeM+zH7pbecEmDv/lBqb0QH+6Uqq75rxFPkM0w==",
       "dev": true
     },
     "strip-outer": {

package.json

@@ -74,7 +74,7 @@
     "universal-cookie": "4.0.3"
   },
   "devDependencies": {
-    "@edx/frontend-build": "github:kdmccormick/frontend-build#kdmccormick/devstack",
+    "@edx/frontend-build": "github:edx/frontend-build#kdmccormick/devstack-frontends",
     "codecov": "3.6.5",
     "enzyme": "3.10.0",
     "enzyme-adapter-react-16": "1.15.2",

src/account-settings/AccountSettingsPage.jsx

@@ -184,7 +184,7 @@ class AccountSettingsPage extends React.Component {
   }
 
   renderSecondaryEmailField(editableFieldProps) {
-    if (this.props.hiddenFields.includes('secondary_email')) {
+    if (!Boolean(this.props.formValues.secondary_email_enabled)) {
       return null;
     }
 
@@ -504,8 +504,8 @@ AccountSettingsPage.propTypes = {
   })),
   profileDataManager: PropTypes.string,
   staticFields: PropTypes.arrayOf(PropTypes.string),
-  hiddenFields: PropTypes.arrayOf(PropTypes.string),
   isActive: PropTypes.bool,
+  secondary_email_enabled: PropTypes.bool,
 
   timeZoneOptions: PropTypes.arrayOf(PropTypes.shape({
     label: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
@@ -532,9 +532,9 @@ AccountSettingsPage.defaultProps = {
   countryTimeZoneOptions: [],
   profileDataManager: null,
   staticFields: [],
-  hiddenFields: ['secondary_email'],
   tpaProviders: [],
   isActive: true,
+  secondary_email_enabled: false,
 };
 
 export default connect(accountSettingsPageSelector, {

src/account-settings/data/selectors.js

@@ -73,10 +73,6 @@ export const staticFieldsSelector = createSelector(
   accountSettings => (accountSettings.profileDataManager ? ['name', 'email', 'country'] : []),
 );
 
-export const hiddenFieldsSelector = createSelector(
-  accountSettingsSelector,
-  accountSettings => (accountSettings.profileDataManager ? [] : ['secondary_email']),
-);
 
 /**
  * If there's no draft present at all (undefined), use the original committed value.
@@ -138,7 +134,6 @@ export const accountSettingsPageSelector = createSelector(
   formValuesSelector,
   profileDataManagerSelector,
   staticFieldsSelector,
-  hiddenFieldsSelector,
   timeZonesSelector,
   countryTimeZonesSelector,
   activeAccountSelector,
@@ -149,7 +144,6 @@ export const accountSettingsPageSelector = createSelector(
     formValues,
     profileDataManager,
     staticFields,
-    hiddenFields,
     timeZoneOptions,
     countryTimeZoneOptions,
     activeAccount,
@@ -165,7 +159,6 @@ export const accountSettingsPageSelector = createSelector(
     formValues,
     profileDataManager,
     staticFields,
-    hiddenFields,
     tpaProviders: accountSettings.thirdPartyAuth.providers,
   }),
 );
@@ -173,7 +166,6 @@ export const accountSettingsPageSelector = createSelector(
 export const coachingConsentPageSelector = createSelector(
   accountSettingsSelector,
   formValuesSelector,
-  hiddenFieldsSelector,
   activeAccountSelector,
   saveStateSelector,
   confirmationValuesSelector,
@@ -181,7 +173,6 @@ export const coachingConsentPageSelector = createSelector(
   (
     accountSettings,
     formValues,
-    hiddenFields,
     activeAccount,
     saveState,
     confirmationValues,
@@ -192,7 +183,6 @@ export const coachingConsentPageSelector = createSelector(
     loadingError: accountSettings.loadingError,
     isActive: activeAccount,
     formValues,
-    hiddenFields,
     saveState,
     confirmationValues,
     formErrors: errors,

src/i18n/messages/ar.json

@@ -76,6 +76,17 @@
   "account.settings.editable.field.action.edit": "Edit",
   "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
   "account.settings.static.field.empty.no.admin": "No value set.",
+  "account.settings.coaching.consent.welcome.header": "Let’s get started.",
+  "account.settings.coaching.consent.welcome.subheader": "We're here for you from start to finish",
+  "account.settings.coaching.consent.description": "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
+  "account.settings.coaching.consent.text-messaging.disclaimer": "* Coaching services are included at no additional cost to learners with US phone numbers. Coaching includes recurring text messages. Message and data rates may apply. Text STOP to opt-out.",
+  "account.settings.coaching.consent.accept-coaching": "Sign up for coaching",
+  "account.settings.coaching.consent.decline-coaching": "I prefer not to be contacted with free coaching services",
+  "account.settings.coaching.consent.label.name": "Please confirm your name",
+  "account.settings.coaching.consent.label.phone-number": "Enter your mobile number",
+  "account.settings.coaching.consent.success.header": "Success!",
+  "account.settings.coaching.consent.success.message": "You're signed up for coaching. You will receive a text message confirmation.",
+  "account.settings.coaching.consent.success.continue": "Start my course",
   "account.settings.field.phone_number": "Phone Number",
   "account.settings.field.phone_number.empty": "Add a phone number",
   "account.settings.field.coaching_consent": "Coaching consent",

src/i18n/messages/es_419.json

@@ -76,6 +76,17 @@
   "account.settings.editable.field.action.edit": "Editar",
   "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
   "account.settings.static.field.empty.no.admin": "No value set.",
+  "account.settings.coaching.consent.welcome.header": "Let’s get started.",
+  "account.settings.coaching.consent.welcome.subheader": "We're here for you from start to finish",
+  "account.settings.coaching.consent.description": "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
+  "account.settings.coaching.consent.text-messaging.disclaimer": "* Coaching services are included at no additional cost to learners with US phone numbers. Coaching includes recurring text messages. Message and data rates may apply. Text STOP to opt-out.",
+  "account.settings.coaching.consent.accept-coaching": "Sign up for coaching",
+  "account.settings.coaching.consent.decline-coaching": "I prefer not to be contacted with free coaching services",
+  "account.settings.coaching.consent.label.name": "Please confirm your name",
+  "account.settings.coaching.consent.label.phone-number": "Enter your mobile number",
+  "account.settings.coaching.consent.success.header": "Success!",
+  "account.settings.coaching.consent.success.message": "You're signed up for coaching. You will receive a text message confirmation.",
+  "account.settings.coaching.consent.success.continue": "Start my course",
   "account.settings.field.phone_number": "Phone Number",
   "account.settings.field.phone_number.empty": "Add a phone number",
   "account.settings.field.coaching_consent": "Coaching consent",

src/i18n/messages/fr.json

@@ -76,6 +76,17 @@
   "account.settings.editable.field.action.edit": "Edit",
   "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
   "account.settings.static.field.empty.no.admin": "No value set.",
+  "account.settings.coaching.consent.welcome.header": "Let’s get started.",
+  "account.settings.coaching.consent.welcome.subheader": "We're here for you from start to finish",
+  "account.settings.coaching.consent.description": "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
+  "account.settings.coaching.consent.text-messaging.disclaimer": "* Coaching services are included at no additional cost to learners with US phone numbers. Coaching includes recurring text messages. Message and data rates may apply. Text STOP to opt-out.",
+  "account.settings.coaching.consent.accept-coaching": "Sign up for coaching",
+  "account.settings.coaching.consent.decline-coaching": "I prefer not to be contacted with free coaching services",
+  "account.settings.coaching.consent.label.name": "Please confirm your name",
+  "account.settings.coaching.consent.label.phone-number": "Enter your mobile number",
+  "account.settings.coaching.consent.success.header": "Success!",
+  "account.settings.coaching.consent.success.message": "You're signed up for coaching. You will receive a text message confirmation.",
+  "account.settings.coaching.consent.success.continue": "Start my course",
   "account.settings.field.phone_number": "Phone Number",
   "account.settings.field.phone_number.empty": "Add a phone number",
   "account.settings.field.coaching_consent": "Coaching consent",

src/i18n/messages/zh_CN.json

@@ -76,6 +76,17 @@
   "account.settings.editable.field.action.edit": "Edit",
   "account.settings.static.field.empty": "No value set. Contact your {enterprise} administrator to make changes.",
   "account.settings.static.field.empty.no.admin": "No value set.",
+  "account.settings.coaching.consent.welcome.header": "Let’s get started.",
+  "account.settings.coaching.consent.welcome.subheader": "We're here for you from start to finish",
+  "account.settings.coaching.consent.description": "MicroBachelors programs include coaching that focuses on your career, education, and how you'll achieve results through one-on-one communication with an experienced professional. If you’re interested, provide the information below and click “Submit,” and our coaching partner will connect with you via email and/or text message to help you move forward. Terms and conditions apply.*",
+  "account.settings.coaching.consent.text-messaging.disclaimer": "* Coaching services are included at no additional cost to learners with US phone numbers. Coaching includes recurring text messages. Message and data rates may apply. Text STOP to opt-out.",
+  "account.settings.coaching.consent.accept-coaching": "Sign up for coaching",
+  "account.settings.coaching.consent.decline-coaching": "I prefer not to be contacted with free coaching services",
+  "account.settings.coaching.consent.label.name": "Please confirm your name",
+  "account.settings.coaching.consent.label.phone-number": "Enter your mobile number",
+  "account.settings.coaching.consent.success.header": "Success!",
+  "account.settings.coaching.consent.success.message": "You're signed up for coaching. You will receive a text message confirmation.",
+  "account.settings.coaching.consent.success.continue": "Start my course",
   "account.settings.field.phone_number": "Phone Number",
   "account.settings.field.phone_number.empty": "Add a phone number",
   "account.settings.field.coaching_consent": "Coaching consent",