diff options
| author | Christopher Speller <crspeller@gmail.com> | 2016-05-03 15:27:00 -0400 |
|---|---|---|
| committer | Corey Hulen <corey@hulen.com> | 2016-05-03 12:27:00 -0700 |
| commit | 5d7e34c94b56c4b0abb0c3d1702f2b5feb8d2904 (patch) | |
| tree | 8d0892af278fa3d1e75f6cc0d301500042fbebf6 /store | |
| parent | d4a708ce196b08a698ed8c3d4843c8b996ba28ac (diff) | |
| download | chat-5d7e34c94b56c4b0abb0c3d1702f2b5feb8d2904.tar.gz chat-5d7e34c94b56c4b0abb0c3d1702f2b5feb8d2904.tar.bz2 chat-5d7e34c94b56c4b0abb0c3d1702f2b5feb8d2904.zip | |
Fixing ldap ability to modify user fields (#2868)
Diffstat (limited to 'store')
| -rw-r--r-- | store/sql_user_store.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/store/sql_user_store.go b/store/sql_user_store.go index 006ea734b..07e974559 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -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 || |