chore(verify): remove server side verification

app/scripts/models/account.js

@@ -583,32 +583,17 @@ const Account = Backbone.Model.extend({
      * @param {String} code - the verification code
      * @param {Object} [options]
      * @param {Object} [options.service] - the service issuing signup request
-     * @param {String} [options.serverVerificationStatus] - the status of server verification
      * @returns {Promise} - resolves when complete
      */
-  verifySignUp (code, options = {}) {
+  verifySignUp(code, options = {}) {
     const marketingOptIn = this.get('needsOptedInToMarketingEmail');
-    return Promise.resolve()
-      .then(() => {
-        if (options.serverVerificationStatus !== 'verified') {
-          // if server verification was not present or not successful
-          // then attempt client verification
-
-          if (marketingOptIn) {
-            this.unset('needsOptedInToMarketingEmail');
-            options.marketingOptIn = true;
-          }
+    if (marketingOptIn) {
+      this.unset('needsOptedInToMarketingEmail');
+      options.marketingOptIn = true;
+    }
 
-          return this._fxaClient.verifyCode(
-            this.get('uid'),
-            code,
-            options
-          );
-        }
-      })
+    return this._fxaClient.verifyCode(this.get('uid'), code, options)
       .then(() => {
-        this.set('verified', true);
-
         if (marketingOptIn) {
           this._notifier.trigger('flow.initialize');
           this._notifier.trigger('flow.event', {

app/scripts/models/user.js

@@ -527,7 +527,6 @@ define(function (require, exports, module) {
      * @param {String} code - verification code
      * @param {Object} [options]
      * @param {Object} [options.service] - the service issuing signup request
-     * @param {String} [options.serverVerificationStatus] - the status of server verification
      * @returns {Promise} - resolves with the account when complete
      */
     completeAccountSignUp (account, code, options) {

app/scripts/views/complete_sign_up.js

@@ -78,7 +78,6 @@ define(function (require, exports, module) {
         primaryEmailVerified: this.getSearchParam('primary_email_verified') || null,
         reminder: verificationInfo.get('reminder'),
         secondaryEmailVerified: this.getSearchParam('secondary_email_verified') || null,
-        serverVerificationStatus: this.getSearchParam('server_verification') || null,
         service: this.relier.get('service') || null,
         type: verificationInfo.get('type')
       };

app/tests/spec/models/account.js

@@ -1009,48 +1009,6 @@ describe('models/account', function () {
       notifier.trigger.resetHistory();
     });
 
-    describe('with custom server verification value', function () {
-      beforeEach(function () {
-        sinon.stub(fxaClient, 'verifyCode').callsFake(function () {
-          return Promise.resolve();
-        });
-      });
-
-      it('does not call verifyCode with verified', function () {
-        account.set('uid', UID);
-
-        return account.verifySignUp('CODE', {
-          serverVerificationStatus: 'verified'
-        }).then(() => {
-          assert.isFalse(fxaClient.verifyCode.called);
-          assert.isTrue(account.get('verified'));
-        });
-      });
-
-      it('calls verifyCode with other status', function () {
-        account.set('uid', UID);
-
-        return account.verifySignUp('CODE', {
-          serverVerificationStatus: 'test'
-        }).then(() => {
-          assert.isTrue(fxaClient.verifyCode.called);
-          assert.isTrue(account.get('verified'));
-        });
-      });
-
-      it('calls verifyCode with undefined status', function () {
-        account.set('uid', UID);
-
-        return account.verifySignUp('CODE', {
-          serverVerificationStatus: undefined
-        }).then(() => {
-          assert.isTrue(fxaClient.verifyCode.called);
-          assert.isTrue(account.get('verified'));
-        });
-      });
-
-    });
-
     describe('without email opt-in', function () {
       beforeEach(function () {
         sinon.stub(fxaClient, 'verifyCode').callsFake(function () {
@@ -1068,10 +1026,6 @@ describe('models/account', function () {
         assert.isTrue(fxaClient.verifyCode.calledWith(UID, 'CODE', options));
       });
 
-      it('sets the `verified` flag', function () {
-        assert.isTrue(account.get('verified'));
-      });
-
       it('did not call notifier.trigger', () => {
         assert.equal(notifier.trigger.callCount, 0);
       });

app/tests/spec/views/complete_sign_up.js

@@ -226,7 +226,6 @@ define(function (require, exports, module) {
             primaryEmailVerified: null,
             reminder: null,
             secondaryEmailVerified: null,
-            serverVerificationStatus: null,
             service: validService,
             type: null
           });
@@ -253,7 +252,6 @@ define(function (require, exports, module) {
             primaryEmailVerified: null,
             reminder: validReminder,
             secondaryEmailVerified: null,
-            serverVerificationStatus: null,
             service: null,
             type: null
           });
@@ -281,41 +279,12 @@ define(function (require, exports, module) {
             primaryEmailVerified: null,
             reminder: validReminder,
             secondaryEmailVerified: null,
-            serverVerificationStatus: null,
             service: validService,
             type: null
           });
         });
       });
 
-      describe('if server_verification is in the url', function () {
-        beforeEach(function () {
-          windowMock.location.search = '?code=' + validCode + '&uid=' + validUid +
-            '&server_verification=verified';
-          relier = new Relier({}, {
-            window: windowMock
-          });
-          relier.fetch();
-          initView(account);
-          sinon.stub(view, '_notifyBrokerAndComplete').callsFake(() => Promise.resolve());
-          return view.render();
-        });
-
-        it('attempt to pass server_verification to verifySignUp', function () {
-          var args = account.verifySignUp.getCall(0).args;
-          assert.isTrue(account.verifySignUp.called);
-          assert.ok(args[0]);
-          assert.deepEqual(args[1], {
-            primaryEmailVerified: null,
-            reminder: null,
-            secondaryEmailVerified: null,
-            serverVerificationStatus: 'verified',
-            service: null,
-            type: null
-          });
-        });
-      });
-
       describe('if type is in the url', function () {
         beforeEach(function () {
           windowMock.location.search = '?code=' + validCode + '&uid=' + validUid +
@@ -337,7 +306,6 @@ define(function (require, exports, module) {
             primaryEmailVerified: null,
             reminder: null,
             secondaryEmailVerified: null,
-            serverVerificationStatus: null,
             service: null,
             type: 'secondary'
           });
@@ -366,7 +334,6 @@ define(function (require, exports, module) {
             primaryEmailVerified: null,
             reminder: null,
             secondaryEmailVerified: 'some@email.com',
-            serverVerificationStatus: null,
             service: null,
             type: null
           });
@@ -394,7 +361,6 @@ define(function (require, exports, module) {
             primaryEmailVerified: 'some@email.com',
             reminder: null,
             secondaryEmailVerified: null,
-            serverVerificationStatus: null,
             service: null,
             type: null
           });

server/lib/routes.js

@@ -32,8 +32,6 @@ module.exports = function (config, i18n) {
     redirectVersionedToUnversioned('complete_reset_password'),
     redirectVersionedToUnversioned('reset_password'),
     redirectVersionedToUnversioned('verify_email'),
-    // Disable server verification for now due to issues with customs
-    //require('./routes/get-verify-email')(),
     require('./routes/get-apple-app-site-association')(),
     require('./routes/get-frontend')(),
     require('./routes/get-terms-privacy')(i18n),