diff options
| -rw-r--r-- | api/user.go | 2 | ||||
| -rw-r--r-- | einterfaces/ldap.go | 2 | ||||
| -rw-r--r-- | webapp/components/claim/claim.jsx | 2 | ||||
| -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/ldap_to_email.jsx | 4 | ||||
| -rw-r--r-- | webapp/components/claim/components/oauth_to_email.jsx | 4 |
7 files changed, 11 insertions, 11 deletions
diff --git a/api/user.go b/api/user.go index 04bd673a8..6803a946c 100644 --- a/api/user.go +++ b/api/user.go @@ -2303,7 +2303,7 @@ func emailToLdap(c *Context, w http.ResponseWriter, r *http.Request) { return } - if err := ldapInterface.DoSwitch(user.Id, ldapId, ldapPassword); err != nil { + if err := ldapInterface.SwitchToEmail(user.Id, ldapId, ldapPassword); err != nil { c.LogAuditWithUserId(user.Id, "fail - ldap switch failed") c.Err = err return diff --git a/einterfaces/ldap.go b/einterfaces/ldap.go index 583fa02c0..2977ab812 100644 --- a/einterfaces/ldap.go +++ b/einterfaces/ldap.go @@ -11,7 +11,7 @@ type LdapInterface interface { DoLogin(team *model.Team, id string, password string) (*model.User, *model.AppError) GetUser(id string) (*model.User, *model.AppError) CheckPassword(id string, password string) *model.AppError - DoSwitch(userId, ldapId, ldapPassword string) *model.AppError + SwitchToEmail(userId, ldapId, ldapPassword string) *model.AppError } var theLdapInterface LdapInterface diff --git a/webapp/components/claim/claim.jsx b/webapp/components/claim/claim.jsx index 0254897f9..464187c37 100644 --- a/webapp/components/claim/claim.jsx +++ b/webapp/components/claim/claim.jsx @@ -1,7 +1,7 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -import TeamStore from '../../stores/team_store.jsx'; +import TeamStore from 'stores/team_store.jsx'; import React from 'react'; import {FormattedMessage} from 'react-intl'; diff --git a/webapp/components/claim/components/email_to_ldap.jsx b/webapp/components/claim/components/email_to_ldap.jsx index bb2a3f0ed..f3046fa74 100644 --- a/webapp/components/claim/components/email_to_ldap.jsx +++ b/webapp/components/claim/components/email_to_ldap.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -import * as Utils from '../../../utils/utils.jsx'; -import * as Client from '../../../utils/client.jsx'; +import * as Utils from 'utils/utils.jsx'; +import * as Client from 'utils/client.jsx'; import React from 'react'; import ReactDOM from 'react-dom'; diff --git a/webapp/components/claim/components/email_to_oauth.jsx b/webapp/components/claim/components/email_to_oauth.jsx index 51549423d..f3e370a4a 100644 --- a/webapp/components/claim/components/email_to_oauth.jsx +++ b/webapp/components/claim/components/email_to_oauth.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -import * as Utils from '../../../utils/utils.jsx'; -import * as Client from '../../../utils/client.jsx'; +import * as Utils from 'utils/utils.jsx'; +import * as Client from 'utils/client.jsx'; import React from 'react'; import ReactDOM from 'react-dom'; diff --git a/webapp/components/claim/components/ldap_to_email.jsx b/webapp/components/claim/components/ldap_to_email.jsx index d645819b5..b4ffd4944 100644 --- a/webapp/components/claim/components/ldap_to_email.jsx +++ b/webapp/components/claim/components/ldap_to_email.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -import * as Utils from '../../../utils/utils.jsx'; -import * as Client from '../../../utils/client.jsx'; +import * as Utils from 'utils/utils.jsx'; +import * as Client from 'utils/client.jsx'; import React from 'react'; import ReactDOM from 'react-dom'; diff --git a/webapp/components/claim/components/oauth_to_email.jsx b/webapp/components/claim/components/oauth_to_email.jsx index 11246bea7..476677aeb 100644 --- a/webapp/components/claim/components/oauth_to_email.jsx +++ b/webapp/components/claim/components/oauth_to_email.jsx @@ -1,8 +1,8 @@ // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // See License.txt for license information. -import * as Utils from '../../../utils/utils.jsx'; -import * as Client from '../../../utils/client.jsx'; +import * as Utils from 'utils/utils.jsx'; +import * as Client from 'utils/client.jsx'; import React from 'react'; import ReactDOM from 'react-dom'; |