From bdb690bd6d9534565fd96c644da950f8c2ba934b Mon Sep 17 00:00:00 2001
From: Vijay Budhram <vbudhram@gmail.com>
Date: Thu, 25 Jan 2018 14:54:15 +0000
Subject: [PATCH] fix(emails): enable change email for users (#5851),
 r=@philbooth

---
 .../templates/settings/emails.mustache        | 10 ++----
 app/scripts/views/settings/emails.js          |  9 -----
 app/tests/spec/views/settings/emails.js       | 36 -------------------
 docs/query-params.md                          |  3 --
 tests/functional/settings_change_email.js     | 28 +++------------
 5 files changed, 7 insertions(+), 79 deletions(-)

diff --git a/app/scripts/templates/settings/emails.mustache b/app/scripts/templates/settings/emails.mustache
index 278d2f0df..9c8512f95 100644
--- a/app/scripts/templates/settings/emails.mustache
+++ b/app/scripts/templates/settings/emails.mustache
@@ -30,11 +30,9 @@
                                 </div>
                                 <div class="settings-button-group">
                                     {{#verified}}
-                                        {{#canChangePrimaryEmail }}
-                                            <button class="settings-button secondary set-primary" data-id="{{email}}">
-                                                {{#t}}Make primary{{/t}}
-                                            </button>
-                                        {{/canChangePrimaryEmail }}
+                                        <button class="settings-button secondary set-primary" data-id="{{email}}">
+                                            {{#t}}Make primary{{/t}}
+                                        </button>
                                     {{/verified}}
                                     <button class="settings-button warning email-disconnect" data-id="{{email}}">
                                         {{#t}}Remove{{/t}}
@@ -44,11 +42,9 @@
                             <li class="email-options">
                                 <div class="settings-button-group">
                                     {{#verified}}
-                                        {{#canChangePrimaryEmail }}
                                         <button class="settings-button secondary set-primary" data-id="{{email}}">
                                             {{#t}}Make primary{{/t}}
                                         </button>
-                                        {{/canChangePrimaryEmail }}
                                     {{/verified}}
                                     <button class="settings-button warning email-disconnect" data-id="{{email}}">
                                         {{#t}}Remove{{/t}}
diff --git a/app/scripts/views/settings/emails.js b/app/scripts/views/settings/emails.js
index a85b5f6d2..c6307a623 100644
--- a/app/scripts/views/settings/emails.js
+++ b/app/scripts/views/settings/emails.js
@@ -58,7 +58,6 @@ define(function (require, exports, module) {
     setInitialContext (context) {
       context.set({
         buttonClass: this._hasSecondaryEmail() ? 'secondary' : 'primary',
-        canChangePrimaryEmail: this._canChangePrimaryEmail(),
         emails: this._emails,
         hasSecondaryEmail: this._hasSecondaryEmail(),
         hasSecondaryVerifiedEmail: this._hasSecondaryVerifiedEmail(),
@@ -74,14 +73,6 @@ define(function (require, exports, module) {
       }
     },
 
-    _canChangePrimaryEmail () {
-      if (this.getSearchParam('canChangeEmail')) {
-        return true;
-      }
-
-      return false;
-    },
-
     _hasSecondaryEmail () {
       return this._emails.length > 1;
     },
diff --git a/app/tests/spec/views/settings/emails.js b/app/tests/spec/views/settings/emails.js
index 2dc399c44..9a93d9f1f 100644
--- a/app/tests/spec/views/settings/emails.js
+++ b/app/tests/spec/views/settings/emails.js
@@ -56,8 +56,6 @@ define(function (require, exports, module) {
       translator = new Translator({forceEnglish: true});
       user = new User();
       windowMock = new WindowMock();
-      windowMock.location.search = '?canChangeEmail=true';
-
       account = user.initAccount({
         email: email,
         sessionToken: 'abc123',
@@ -281,40 +279,6 @@ define(function (require, exports, module) {
         });
       });
 
-      describe('does not show change email when `canChangeEmail` not set', () => {
-        const newEmail = 'secondary@email.com';
-        beforeEach(() => {
-          emails = [{
-            email: 'primary@email.com',
-            isPrimary: true,
-            verified: true
-          }, {
-            email: newEmail,
-            isPrimary: false,
-            verified: true
-          }];
-
-          windowMock.location.search = '';
-
-          return initView()
-            .then(function () {
-              // click events require the view to be in the DOM
-              $('#container').html(view.el);
-            });
-        });
-
-        it('can render', () => {
-          assert.equal(view.$('.email-address').length, 1);
-          assert.lengthOf(view.$('.email-address .address'), 1);
-          assert.equal(view.$('.email-address .address').html(), 'secondary@email.com');
-          assert.equal(view.$('.email-address .details .verified').length, 1);
-          assert.equal(view.$('.email-address .settings-button.warning.email-disconnect').length, 1);
-          assert.equal(view.$('.email-address .settings-button.warning.email-disconnect').attr('data-id'), 'secondary@email.com');
-          assert.equal(view.$('.email-address .settings-button.secondary.set-primary').length, 0);
-        });
-      });
-
-
       describe('can change email', () => {
         const newEmail = 'secondary@email.com';
         beforeEach(() => {
diff --git a/docs/query-params.md b/docs/query-params.md
index 517bcec8b..8971501d9 100644
--- a/docs/query-params.md
+++ b/docs/query-params.md
@@ -374,9 +374,6 @@ if they perform a reset password.
 
 ## Secondary email parameters
 
-### `canChangeEmail`
-Shows the option to change a user's primary email address.
-
 #### Options
 * `true`
 * `false` (default)
diff --git a/tests/functional/settings_change_email.js b/tests/functional/settings_change_email.js
index 96e30261d..2819a75e5 100644
--- a/tests/functional/settings_change_email.js
+++ b/tests/functional/settings_change_email.js
@@ -11,10 +11,9 @@ const selectors = require('./lib/selectors');
 
 const config = intern._config;
 
-const SIGNUP_URL = config.fxaContentRoot + 'signup?canChangeEmail=true';
-const SIGNIN_URL = config.fxaContentRoot + 'signin?canChangeEmail=true';
-const SETTINGS_URL = config.fxaContentRoot + 'settings?canChangeEmail=true';
-const SIGNIN_URL_NO_CHANGE_EMAIL = config.fxaContentRoot + 'signin';
+const SIGNUP_URL = config.fxaContentRoot + 'signup';
+const SIGNIN_URL = config.fxaContentRoot + 'signin';
+const SETTINGS_URL = config.fxaContentRoot + 'settings';
 const PASSWORD = 'password';
 const NEW_PASSWORD = 'password1';
 
@@ -33,7 +32,6 @@ const {
   openPage,
   openVerificationLinkInNewTab,
   openVerificationLinkInSameTab,
-  noSuchElement,
   switchToWindow,
   testElementExists,
   testElementTextEquals,
@@ -59,11 +57,7 @@ registerSuite('settings change email', {
       .then(type(selectors.EMAIL.INPUT, secondaryEmail))
       .then(click(selectors.EMAIL.ADD_BUTTON))
       .then(testElementExists(selectors.EMAIL.NOT_VERIFIED_LABEL))
-      .then(openVerificationLinkInSameTab(secondaryEmail, 0, {
-        query: {
-          canChangeEmail: true
-        }
-      }))
+      .then(openVerificationLinkInSameTab(secondaryEmail, 0, {}))
       .then(testSuccessWasShown())
 
       // set new primary email
@@ -79,20 +73,6 @@ registerSuite('settings change email', {
     return this.remote.then(clearBrowserState());
   },
   tests: {
-    'does no show change email option if query `canChangeEmail` not set': function () {
-      return this.remote
-      // sign out
-        .then(click(selectors.SETTINGS.SIGNOUT))
-        .then(testElementExists(selectors.SIGNIN.HEADER))
-
-        // sign in and does not show change primary email button
-        .then(openPage(SIGNIN_URL_NO_CHANGE_EMAIL, selectors.SIGNIN.HEADER))
-        .then(testElementExists(selectors.SIGNIN.HEADER))
-        .then(fillOutSignIn(secondaryEmail, PASSWORD))
-        .then(click(selectors.EMAIL.MENU_BUTTON))
-        .then(noSuchElement(selectors.EMAIL.SET_PRIMARY_EMAIL_BUTTON));
-    },
-
     'can change primary email and login': function () {
       return this.remote
       // sign out