diff options
author | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2017-01-27 11:39:13 +0100 |
---|---|---|
committer | George Goldberg <george@gberg.me> | 2017-01-27 10:39:13 +0000 |
commit | d72547433af3ec5829ce0de4f4e1cfd440be7142 (patch) | |
tree | 6bd7664e9058468842c7b7bb7c7a76abf1b7c5e3 /webapp/components/claim | |
parent | 49c677f6b46409289210abc0e0bda63735be3e9f (diff) | |
download | chat-d72547433af3ec5829ce0de4f4e1cfd440be7142.tar.gz chat-d72547433af3ec5829ce0de4f4e1cfd440be7142.tar.bz2 chat-d72547433af3ec5829ce0de4f4e1cfd440be7142.zip |
Move remaining client functions in components to actions (#5171)
Diffstat (limited to 'webapp/components/claim')
-rw-r--r-- | webapp/components/claim/components/email_to_ldap.jsx | 4 | ||||
-rw-r--r-- | webapp/components/claim/components/email_to_oauth.jsx | 4 | ||||
-rw-r--r-- | webapp/components/claim/components/oauth_to_email.jsx | 12 |
3 files changed, 8 insertions, 12 deletions
diff --git a/webapp/components/claim/components/email_to_ldap.jsx b/webapp/components/claim/components/email_to_ldap.jsx index 890512803..7d062a957 100644 --- a/webapp/components/claim/components/email_to_ldap.jsx +++ b/webapp/components/claim/components/email_to_ldap.jsx @@ -4,9 +4,9 @@ import LoginMfa from 'components/login/components/login_mfa.jsx'; import * as Utils from 'utils/utils.jsx'; -import Client from 'client/web_client.jsx'; import {checkMfa} from 'actions/user_actions.jsx'; +import {emailToLdap} from 'actions/admin_actions.jsx'; import React from 'react'; import {FormattedMessage} from 'react-intl'; @@ -79,7 +79,7 @@ export default class EmailToLDAP extends React.Component { } submit(loginId, password, token, ldapId, ldapPassword) { - Client.emailToLdap( + emailToLdap( loginId, password, token, diff --git a/webapp/components/claim/components/email_to_oauth.jsx b/webapp/components/claim/components/email_to_oauth.jsx index 3cede15a3..bc5a7bdaa 100644 --- a/webapp/components/claim/components/email_to_oauth.jsx +++ b/webapp/components/claim/components/email_to_oauth.jsx @@ -4,10 +4,10 @@ import LoginMfa from 'components/login/components/login_mfa.jsx'; import * as Utils from 'utils/utils.jsx'; -import Client from 'client/web_client.jsx'; import Constants from 'utils/constants.jsx'; import {checkMfa} from 'actions/user_actions.jsx'; +import {emailToOAuth} from 'actions/admin_actions.jsx'; import React from 'react'; import ReactDOM from 'react-dom'; @@ -55,7 +55,7 @@ export default class EmailToOAuth extends React.Component { } submit(loginId, password, token) { - Client.emailToOAuth( + emailToOAuth( loginId, password, token, diff --git a/webapp/components/claim/components/oauth_to_email.jsx b/webapp/components/claim/components/oauth_to_email.jsx index ed604583d..ffba1c331 100644 --- a/webapp/components/claim/components/oauth_to_email.jsx +++ b/webapp/components/claim/components/oauth_to_email.jsx @@ -2,13 +2,13 @@ // See License.txt for license information. import * as Utils from 'utils/utils.jsx'; -import Client from 'client/web_client.jsx'; import Constants from 'utils/constants.jsx'; import React from 'react'; import ReactDOM from 'react-dom'; import {FormattedMessage} from 'react-intl'; -import {browserHistory} from 'react-router/es6'; + +import {oauthToEmail} from 'actions/admin_actions.jsx'; export default class OAuthToEmail extends React.Component { constructor(props) { @@ -48,14 +48,10 @@ export default class OAuthToEmail extends React.Component { state.error = null; this.setState(state); - Client.oauthToEmail( + oauthToEmail( this.props.email, password, - (data) => { - if (data.follow_link) { - browserHistory.push(data.follow_link); - } - }, + null, (err) => { this.setState({error: err.message}); } |