mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Fix imports and change ldap function name

Просмотр исходного кода
Этот коммит содержится в:
JoramWilander
2016-03-23 15:59:43 -04:00
родитель 463fd8c20b
Коммит 934c7c7a7c
7 изменённых файлов: 11 добавлений и 11 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
api/user.go
Просмотреть файл

@@ -2303,7 +2303,7 @@ func emailToLdap(c *Context, w http.ResponseWriter, r *http.Request) {
return 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.LogAuditWithUserId(user.Id, "fail - ldap switch failed")
c.Err = err c.Err = err
return return

2
einterfaces/ldap.go
Просмотреть файл

@@ -11,7 +11,7 @@ type LdapInterface interface {
DoLogin(team *model.Team, id string, password string) (*model.User, *model.AppError) DoLogin(team *model.Team, id string, password string) (*model.User, *model.AppError)
GetUser(id string) (*model.User, *model.AppError) GetUser(id string) (*model.User, *model.AppError)
CheckPassword(id string, password string) *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 var theLdapInterface LdapInterface

2
webapp/components/claim/claim.jsx
Просмотреть файл

@@ -1,7 +1,7 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information. // 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 React from 'react';
import {FormattedMessage} from 'react-intl'; import {FormattedMessage} from 'react-intl';

4
webapp/components/claim/components/email_to_ldap.jsx
Просмотреть файл

@@ -1,8 +1,8 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information. // See License.txt for license information.
import * as Utils from '../../../utils/utils.jsx'; import * as Utils from 'utils/utils.jsx';
import * as Client from '../../../utils/client.jsx'; import * as Client from 'utils/client.jsx';
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';

4
webapp/components/claim/components/email_to_oauth.jsx
Просмотреть файл

@@ -1,8 +1,8 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information. // See License.txt for license information.
import * as Utils from '../../../utils/utils.jsx'; import * as Utils from 'utils/utils.jsx';
import * as Client from '../../../utils/client.jsx'; import * as Client from 'utils/client.jsx';
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';

4
webapp/components/claim/components/ldap_to_email.jsx
Просмотреть файл

@@ -1,8 +1,8 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information. // See License.txt for license information.
import * as Utils from '../../../utils/utils.jsx'; import * as Utils from 'utils/utils.jsx';
import * as Client from '../../../utils/client.jsx'; import * as Client from 'utils/client.jsx';
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';

4
webapp/components/claim/components/oauth_to_email.jsx
Просмотреть файл

@@ -1,8 +1,8 @@
// Copyright (c) 2015 Mattermost, Inc. All Rights Reserved. // Copyright (c) 2015 Mattermost, Inc. All Rights Reserved.
// See License.txt for license information. // See License.txt for license information.
import * as Utils from '../../../utils/utils.jsx'; import * as Utils from 'utils/utils.jsx';
import * as Client from '../../../utils/client.jsx'; import * as Client from 'utils/client.jsx';
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';