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

webapp/actions/user_actions.jsx

@@ -655,10 +655,9 @@ export function updatePassword(userId, currentPassword, newPassword, success, er
     );
 }
 
-export function verifyEmail(uid, hid, success, error) {
+export function verifyEmail(token, success, error) {
     Client.verifyEmail(
-        uid,
-        hid,
+        token,
         (data) => {
             if (success) {
                 success(data);
@@ -672,9 +671,9 @@ export function verifyEmail(uid, hid, success, error) {
     );
 }
 
-export function resetPassword(code, password, success, error) {
+export function resetPassword(token, password, success, error) {
     Client.resetPassword(
-        code,
+        token,
         password,
         () => {
             browserHistory.push('/login?extra=' + ActionTypes.PASSWORD_CHANGE);

webapp/client/client.jsx

@@ -1319,19 +1319,19 @@ export default class Client {
         this.trackEvent('api', 'api_channels_set_active', {channel_id: id});
     }
 
-    verifyEmail(uid, hid, success, error) {
+    verifyEmail(token, success, error) {
         request.
-            post(`${this.getUsersRoute()}/verify_email`).
+            post(`${this.url}/api/v4/users/email/verify`).
             set(this.defaultHeaders).
             type('application/json').
             accept('application/json').
-            send({uid, hid}).
+            send({token}).
             end(this.handleResponse.bind(this, 'verifyEmail', success, error));
     }
 
     resendVerification(email, success, error) {
         request.
-            post(`${this.getUsersRoute()}/resend_verification`).
+            post(`${this.url}/api/v4/users/email/verify/send`).
             set(this.defaultHeaders).
             type('application/json').
             accept('application/json').

webapp/components/do_verify_email.jsx

@@ -21,8 +21,7 @@ export default class DoVerifyEmail extends React.Component {
     }
     componentWillMount() {
         verifyEmail(
-            this.props.location.query.uid,
-            this.props.location.query.hid,
+            this.props.location.query.token,
             () => {
                 browserHistory.push('/login?extra=verified&email=' + encodeURIComponent(this.props.location.query.email));
             },

webapp/components/password_reset_form.jsx

@@ -43,7 +43,7 @@ class PasswordResetForm extends React.Component {
         });
 
         resetPassword(
-            this.props.location.query.code,
+            this.props.location.query.token,
             password,
             () => {
                 this.setState({error: null});

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();
                 }
             );