Skip to content

fix: Dont override custom user_info #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
untitaker merged 2 commits into from
Sep 29, 2018
Merged

fix: Dont override custom user_info #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14a641f
fix: Dont override custom user_info
untitaker Sep 29, 2018
e6deb63
Merge remote-tracking branch 'origin/master' into fix/overridable-use…
untitaker Sep 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion sentry_sdk/integrations/_wsgi.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,8 @@ def event_processor(event, hint):

if _should_send_default_pii():
user_info = event.setdefault("user", {})
user_info["ip_address"] = get_client_ip(environ)
if "ip_address" not in user_info:
user_info["ip_address"] = get_client_ip(environ)

if "query_string" not in request_info:
request_info["query_string"] = environ.get("QUERY_STRING")
Expand Down
18 changes: 10 additions & 8 deletions sentry_sdk/integrations/django.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,17 @@ def _set_user_info(request, event):
if user is None or not is_authenticated(user):
return

try:
user_info["email"] = user.email
except Exception:
pass
if "email" not in user_info:
try:
user_info["email"] = user.email
except Exception:
pass

try:
user_info["username"] = user.get_username()
except Exception:
pass
if "username" not in user_info:
try:
user_info["username"] = user.get_username()
except Exception:
pass


class _FormatConverter(object):
Expand Down
2 changes: 1 addition & 1 deletion sentry_sdk/integrations/flask.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ def _add_user_to_event(event):

user_info = event.setdefault("user", {})

if user_info.get("id", None) is None:
if "id" not in user_info:
try:
user_info["id"] = user.get_id()
# TODO: more configurable user attrs here
Expand Down