diff options
| author | Poornima <mpoornima@users.noreply.github.com> | 2017-02-27 00:18:01 +0530 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2017-02-26 13:48:01 -0500 |
| commit | c0bb6f99f89259f6728856ace23d5dd505494b26 (patch) | |
| tree | 024fb446bef25eb74763da14f8e98a6685807af6 /store/sql_user_store.go | |
| parent | 04f4545bbd6c9a1f85071483e96e29684871d547 (diff) | |
| download | chat-c0bb6f99f89259f6728856ace23d5dd505494b26.tar.gz chat-c0bb6f99f89259f6728856ace23d5dd505494b26.tar.bz2 chat-c0bb6f99f89259f6728856ace23d5dd505494b26.zip | |
Updating user attributes on oauth login (#5324)
Moving update function to app package
Fixing duplicate userID on create user test
Diffstat (limited to 'store/sql_user_store.go')
| -rw-r--r-- | store/sql_user_store.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/store/sql_user_store.go b/store/sql_user_store.go index a2a9c8347..838c2a80d 100644 --- a/store/sql_user_store.go +++ b/store/sql_user_store.go @@ -127,7 +127,6 @@ func (us SqlUserStore) Save(user *model.User) StoreChannel { } func (us SqlUserStore) Update(user *model.User, trustedUpdateData bool) StoreChannel { - storeChannel := make(StoreChannel, 1) go func() { @@ -164,7 +163,9 @@ func (us SqlUserStore) Update(user *model.User, trustedUpdateData bool) StoreCha } if user.IsOAuthUser() { - user.Email = oldUser.Email + if !trustedUpdateData { + user.Email = oldUser.Email + } } else if user.IsLDAPUser() && !trustedUpdateData { if user.Username != oldUser.Username || user.Email != oldUser.Email { |