From c0bb6f99f89259f6728856ace23d5dd505494b26 Mon Sep 17 00:00:00 2001 From: Poornima Date: Mon, 27 Feb 2017 00:18:01 +0530 Subject: Updating user attributes on oauth login (#5324) Moving update function to app package Fixing duplicate userID on create user test --- store/sql_user_store.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'store/sql_user_store.go') 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 { -- cgit v1.2.3-1-g7c22