Commit c2be86b5 authored by Rémy Coutable's avatar Rémy Coutable

Merge branch 'improve_oauth_user_error' into 'master'

Improve the `Gitlab::OAuth::User` error message

## What does this MR do?

Fixes a logging issue submitted by a customer at https://gitlab.zendesk.com/agent/tickets/50728. 

The error saving the user is logged to application.log. Previously,
the entry had no context and was unusable - `Error saving user:
[Email address already taken]`. Adding the auth hash UID and email
makes the error more helpful.

For such a small logging change, do we need a changelog entry?

See merge request !7851
parents bbcce5f7 374033fe
...@@ -39,7 +39,7 @@ module Gitlab ...@@ -39,7 +39,7 @@ module Gitlab
log.info "(#{provider}) saving user #{auth_hash.email} from login with extern_uid => #{auth_hash.uid}" log.info "(#{provider}) saving user #{auth_hash.email} from login with extern_uid => #{auth_hash.uid}"
gl_user gl_user
rescue ActiveRecord::RecordInvalid => e rescue ActiveRecord::RecordInvalid => e
log.info "(#{provider}) Error saving user: #{gl_user.errors.full_messages}" log.info "(#{provider}) Error saving user #{auth_hash.uid} (#{auth_hash.email}): #{gl_user.errors.full_messages}"
return self, e.record.errors return self, e.record.errors
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment