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

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