5 files changed, 18 insertions, 21 deletions

diff --git a/webapp/components/claim/claim.jsx b/webapp/components/claim/claim_controller.jsx
index 0197e1677..dbb944bb9 100644
--- a/webapp/components/claim/claim.jsx
+++ b/webapp/components/claim/claim_controller.jsx
@@ -7,7 +7,7 @@ import {Link} from 'react-router';
 
 import logoImage from 'images/logo.png';
 
-export default class Claim extends React.Component {
+export default class ClaimController extends React.Component {
     constructor(props) {
         super(props);
 
@@ -51,9 +51,9 @@ export default class Claim extends React.Component {
     }
 }
 
-Claim.defaultProps = {
+ClaimController.defaultProps = {
 };
-Claim.propTypes = {
+ClaimController.propTypes = {
     location: React.PropTypes.object.isRequired,
     children: React.PropTypes.node
 };
diff --git a/webapp/components/claim/components/email_to_ldap.jsx b/webapp/components/claim/components/email_to_ldap.jsx
index fbf26cade..f7bb02c6e 100644
--- a/webapp/components/claim/components/email_to_ldap.jsx
+++ b/webapp/components/claim/components/email_to_ldap.jsx
@@ -20,7 +20,7 @@ export default class EmailToLDAP extends React.Component {
         e.preventDefault();
         var state = {};
 
-        const password = ReactDOM.findDOMNode(this.refs.emailpassword).value.trim();
+        const password = ReactDOM.findDOMNode(this.refs.emailpassword).value;
         if (!password) {
             state.error = Utils.localizeMessage('claim.email_to_ldap.pwdError', 'Please enter your password.');
             this.setState(state);
@@ -34,7 +34,7 @@ export default class EmailToLDAP extends React.Component {
             return;
         }
 
-        const ldapPassword = ReactDOM.findDOMNode(this.refs.ldappassword).value.trim();
+        const ldapPassword = ReactDOM.findDOMNode(this.refs.ldappassword).value;
         if (!ldapPassword) {
             state.error = Utils.localizeMessage('claim.email_to_ldap.ldapPasswordError', 'Please enter your LDAP password.');
             this.setState(state);
diff --git a/webapp/components/claim/components/email_to_oauth.jsx b/webapp/components/claim/components/email_to_oauth.jsx
index 1fd284bed..171ebe8a4 100644
--- a/webapp/components/claim/components/email_to_oauth.jsx
+++ b/webapp/components/claim/components/email_to_oauth.jsx
@@ -20,7 +20,7 @@ export default class EmailToOAuth extends React.Component {
         e.preventDefault();
         var state = {};
 
-        var password = ReactDOM.findDOMNode(this.refs.password).value.trim();
+        var password = ReactDOM.findDOMNode(this.refs.password).value;
         if (!password) {
             state.error = Utils.localizeMessage('claim.email_to_oauth.pwdError', 'Please enter your password.');
             this.setState(state);
diff --git a/webapp/components/claim/components/ldap_to_email.jsx b/webapp/components/claim/components/ldap_to_email.jsx
index a10cefd6f..fbc8bcebf 100644
--- a/webapp/components/claim/components/ldap_to_email.jsx
+++ b/webapp/components/claim/components/ldap_to_email.jsx
@@ -2,7 +2,8 @@
 // See License.txt for license information.
 
 import * as Utils from 'utils/utils.jsx';
-import Client from 'utils/web_client.jsx';
+
+import {switchFromLdapToEmail} from 'actions/user_actions.jsx';
 
 import React from 'react';
 import ReactDOM from 'react-dom';
@@ -16,25 +17,26 @@ export default class LDAPToEmail extends React.Component {
 
         this.state = {};
     }
+
     submit(e) {
         e.preventDefault();
         var state = {};
 
-        const password = ReactDOM.findDOMNode(this.refs.password).value.trim();
+        const password = ReactDOM.findDOMNode(this.refs.password).value;
         if (!password) {
             state.error = Utils.localizeMessage('claim.ldap_to_email.pwdError', 'Please enter your password.');
             this.setState(state);
             return;
         }
 
-        const confirmPassword = ReactDOM.findDOMNode(this.refs.passwordconfirm).value.trim();
+        const confirmPassword = ReactDOM.findDOMNode(this.refs.passwordconfirm).value;
         if (!confirmPassword || password !== confirmPassword) {
             state.error = Utils.localizeMessage('claim.ldap_to_email.pwdNotMatch', 'Passwords do not match.');
             this.setState(state);
             return;
         }
 
-        const ldapPassword = ReactDOM.findDOMNode(this.refs.ldappassword).value.trim();
+        const ldapPassword = ReactDOM.findDOMNode(this.refs.ldappassword).value;
         if (!ldapPassword) {
             state.error = Utils.localizeMessage('claim.ldap_to_email.ldapPasswordError', 'Please enter your LDAP password.');
             this.setState(state);
@@ -44,20 +46,15 @@ export default class LDAPToEmail extends React.Component {
         state.error = null;
         this.setState(state);
 
-        Client.ldapToEmail(
+        switchFromLdapToEmail(
             this.props.email,
             password,
             ldapPassword,
-            (data) => {
-                if (data.follow_link) {
-                    window.location.href = data.follow_link;
-                }
-            },
-            (error) => {
-                this.setState({error});
-            }
+            null,
+            (err) => this.setState({error: err.message})
         );
     }
+
     render() {
         var error = null;
         if (this.state.error) {
diff --git a/webapp/components/claim/components/oauth_to_email.jsx b/webapp/components/claim/components/oauth_to_email.jsx
index 7fd18aaa6..1a3b962a2 100644
--- a/webapp/components/claim/components/oauth_to_email.jsx
+++ b/webapp/components/claim/components/oauth_to_email.jsx
@@ -21,14 +21,14 @@ export default class OAuthToEmail extends React.Component {
         e.preventDefault();
         const state = {};
 
-        const password = ReactDOM.findDOMNode(this.refs.password).value.trim();
+        const password = ReactDOM.findDOMNode(this.refs.password).value;
         if (!password) {
             state.error = Utils.localizeMessage('claim.oauth_to_email.enterPwd', 'Please enter a password.');
             this.setState(state);
             return;
         }
 
-        const confirmPassword = ReactDOM.findDOMNode(this.refs.passwordconfirm).value.trim();
+        const confirmPassword = ReactDOM.findDOMNode(this.refs.passwordconfirm).value;
         if (!confirmPassword || password !== confirmPassword) {
             state.error = Utils.localizeMessage('claim.oauth_to_email.pwdNotMatch', 'Password do not match.');
             this.setState(state);