diff options
author | rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 17:55:54 +0000 |
---|---|---|
committer | rogerta@chromium.org <rogerta@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-15 17:55:54 +0000 |
commit | de265119899a864f047a8124b7f414dc54beb8cd (patch) | |
tree | fd696750a7bab169b8f8402874421cc4f288324c /google_apis/gaia/gaia_auth_util.cc | |
parent | fb69c0969bf3f5bc389011a6d31a9fa2469b6c75 (diff) | |
download | chromium_src-de265119899a864f047a8124b7f414dc54beb8cd.zip chromium_src-de265119899a864f047a8124b7f414dc54beb8cd.tar.gz chromium_src-de265119899a864f047a8124b7f414dc54beb8cd.tar.bz2 |
gaia::AreEmailsSame() should consider X@gmail.com == X@googlemail.com.
BUG=253081
Review URL: https://codereview.chromium.org/235603003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@263914 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis/gaia/gaia_auth_util.cc')
-rw-r--r-- | google_apis/gaia/gaia_auth_util.cc | 29 |
1 files changed, 23 insertions, 6 deletions
diff --git a/google_apis/gaia/gaia_auth_util.cc b/google_apis/gaia/gaia_auth_util.cc index 6532d19..287cd46 100644 --- a/google_apis/gaia/gaia_auth_util.cc +++ b/google_apis/gaia/gaia_auth_util.cc @@ -15,24 +15,41 @@ namespace gaia { namespace { + const char kGmailDomain[] = "gmail.com"; -} +const char kGooglemailDomain[] = "googlemail.com"; -std::string CanonicalizeEmail(const std::string& email_address) { +std::string CanonicalizeEmailImpl(const std::string& email_address, + bool change_googlemail_to_gmail) { std::vector<std::string> parts; char at = '@'; base::SplitString(email_address, at, &parts); if (parts.size() != 2U) { NOTREACHED() << "expecting exactly one @, but got " << parts.size()-1 << " : " << email_address; - } else if (parts[1] == kGmailDomain) { // only strip '.' for gmail accounts. - base::RemoveChars(parts[0], ".", &parts[0]); + } else { + if (change_googlemail_to_gmail && parts[1] == kGooglemailDomain) + parts[1] = kGmailDomain; + + if (parts[1] == kGmailDomain) // only strip '.' for gmail accounts. + base::RemoveChars(parts[0], ".", &parts[0]); } + std::string new_email = StringToLowerASCII(JoinString(parts, at)); VLOG(1) << "Canonicalized " << email_address << " to " << new_email; return new_email; } +} // namespace + +std::string CanonicalizeEmail(const std::string& email_address) { + // CanonicalizeEmail() is called to process email strings that are eventually + // shown to the user, and may also be used in persisting email strings. To + // avoid breaking this existing behavior, this function will not try to + // change googlemail to gmail. + return CanonicalizeEmailImpl(email_address, false); +} + std::string CanonicalizeDomain(const std::string& domain) { // Canonicalization of domain names means lower-casing them. Make sure to // update this function in sync with Canonicalize if this ever changes. @@ -52,8 +69,8 @@ std::string SanitizeEmail(const std::string& email_address) { } bool AreEmailsSame(const std::string& email1, const std::string& email2) { - return gaia::CanonicalizeEmail(gaia::SanitizeEmail(email1)) == - gaia::CanonicalizeEmail(gaia::SanitizeEmail(email2)); + return CanonicalizeEmailImpl(gaia::SanitizeEmail(email1), true) == + CanonicalizeEmailImpl(gaia::SanitizeEmail(email2), true); } std::string ExtractDomainName(const std::string& email_address) { |