Creating common token store and moving email invites and verification to it (#6213)

webapp/tests/client/client_user.test.jsx

@@ -655,13 +655,12 @@ describe('Client.User', function() {
         TestHelper.initBasic(done, () => {
             TestHelper.basicClient().enableLogErrorsToConsole(false); // Disabling since this unit test causes an error
             TestHelper.basicClient().verifyEmail(
-                'junk',
                 'junk',
                 function() {
                     done.fail(new Error('should be invalid'));
                 },
                 function(err) {
-                    expect(err.id).toBe('api.context.invalid_param.app_error');
+                    expect(err.id).toBe('api.context.invalid_body_param.app_error');
                     done();
                 }
             );