IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixing ldap ability to modify user fields (#2868)

Browse Source
This commit is contained in:
Christopher Speller
2016-05-03 15:27:00 -04:00
committed by Corey Hulen
parent d4a708ce19
commit 5d7e34c94b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
store/sql_user_store.go
View File

@@ -95,7 +95,7 @@ func (us SqlUserStore) Save(user *model.User) StoreChannel {
return storeChannel
}
func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreChannel {
func (us SqlUserStore) Update(user *model.User, trustedUpdateData bool) StoreChannel {
storeChannel := make(StoreChannel)
@@ -129,14 +129,14 @@ func (us SqlUserStore) Update(user *model.User, allowActiveUpdate bool) StoreCha
user.MfaSecret = oldUser.MfaSecret
user.MfaActive = oldUser.MfaActive
if !allowActiveUpdate {
if !trustedUpdateData {
user.Roles = oldUser.Roles
user.DeleteAt = oldUser.DeleteAt
}
if user.IsOAuthUser() {
user.Email = oldUser.Email
} else if user.IsLDAPUser() {
} else if user.IsLDAPUser() && !trustedUpdateData {
if user.Username != oldUser.Username ||
user.FirstName != oldUser.FirstName ||
user.LastName != oldUser.LastName ||