You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by je...@apache.org on 2015/01/13 17:58:41 UTC
[2/4] allura git commit: [#7813] ticket:711 Use canonicalized address
when saving new email & remove redundant calls to canonical
[#7813] ticket:711 Use canonicalized address when saving new email & remove redundant calls to canonical
Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/802ee46a
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/802ee46a
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/802ee46a
Branch: refs/heads/ib/7813
Commit: 802ee46abf358ce5975345004cfaa144bca20784
Parents: f5b4a83
Author: Igor Bondarenko <je...@gmail.com>
Authored: Tue Jan 13 15:12:11 2015 +0000
Committer: Igor Bondarenko <je...@gmail.com>
Committed: Tue Jan 13 15:12:11 2015 +0000
----------------------------------------------------------------------
Allura/allura/controllers/auth.py | 2 +-
Allura/allura/lib/mail_util.py | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/allura/blob/802ee46a/Allura/allura/controllers/auth.py
----------------------------------------------------------------------
diff --git a/Allura/allura/controllers/auth.py b/Allura/allura/controllers/auth.py
index c81c572..453ad8a 100644
--- a/Allura/allura/controllers/auth.py
+++ b/Allura/allura/controllers/auth.py
@@ -489,8 +489,8 @@ class PreferencesController(BaseController):
flash('Email address already claimed', 'error')
elif mail_util.isvalid(new_addr['addr']):
- user.email_addresses.append(new_addr['addr'])
em = M.EmailAddress.create(new_addr['addr'])
+ user.email_addresses.append(em.email)
em.claimed_by_user_id = user._id
confirmed_emails = filter(lambda email: email.confirmed, claimed_emails)
http://git-wip-us.apache.org/repos/asf/allura/blob/802ee46a/Allura/allura/lib/mail_util.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/mail_util.py b/Allura/allura/lib/mail_util.py
index bef2403..68a9649 100644
--- a/Allura/allura/lib/mail_util.py
+++ b/Allura/allura/lib/mail_util.py
@@ -158,14 +158,13 @@ def parse_message(data):
def identify_sender(peer, email_address, headers, msg):
from allura import model as M
# Dumb ID -- just look for email address claimed by a particular user
- addr = M.EmailAddress.get(
- email=M.EmailAddress.canonical(email_address), confirmed=True)
+ addr = M.EmailAddress.get(email=email_address, confirmed=True)
if addr and addr.claimed_by_user_id:
return addr.claimed_by_user() or M.User.anonymous()
from_address = headers.get('From', '').strip()
if not from_address:
return M.User.anonymous()
- addr = M.EmailAddress.get(email=M.EmailAddress.canonical(from_address))
+ addr = M.EmailAddress.get(email=from_address)
if addr and addr.claimed_by_user_id:
return addr.claimed_by_user() or M.User.anonymous()
return M.User.anonymous()