#include "google_apis/gaia/gaia_auth_util.h"
-#include <vector>
-
+#include "base/json/json_reader.h"
#include "base/logging.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
+#include "base/values.h"
#include "google_apis/gaia/gaia_urls.h"
#include "url/gurl.h"
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();
- else if (parts[1] == kGmailDomain) // only strip '.' for gmail accounts.
- RemoveChars(parts[0], ".", &parts[0]);
- std::string new_email = StringToLowerASCII(JoinString(parts, at));
+ if (parts.size() != 2U) {
+ NOTREACHED() << "expecting exactly one @, but got " << parts.size()-1 <<
+ " : " << email_address;
+ } 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 = base::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.
- return StringToLowerASCII(domain);
+ return base::StringToLowerASCII(domain);
}
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) {
return url == GaiaUrls::GetInstance()->gaia_url();
}
+
+bool ParseListAccountsData(
+ const std::string& data,
+ std::vector<std::pair<std::string, bool> >* accounts) {
+ accounts->clear();
+
+ // Parse returned data and make sure we have data.
+ scoped_ptr<base::Value> value(base::JSONReader::Read(data));
+ if (!value)
+ return false;
+
+ base::ListValue* list;
+ if (!value->GetAsList(&list) || list->GetSize() < 2)
+ return false;
+
+ // Get list of account info.
+ base::ListValue* account_list;
+ if (!list->GetList(1, &account_list) || accounts == NULL)
+ return false;
+
+ // Build a vector of accounts from the cookie. Order is important: the first
+ // account in the list is the primary account.
+ for (size_t i = 0; i < account_list->GetSize(); ++i) {
+ base::ListValue* account;
+ if (account_list->GetList(i, &account) && account != NULL) {
+ std::string email;
+ // Canonicalize the email since ListAccounts returns "display email".
+ if (account->GetString(3, &email) && !email.empty()) {
+ // New version if ListAccounts indicates whether the email's session
+ // is still valid or not. If this value is present and false, assume
+ // its invalid. Otherwise assume it's valid to remain compatible with
+ // old version.
+ int is_email_valid = 1;
+ if (!account->GetInteger(9, &is_email_valid))
+ is_email_valid = 1;
+
+ accounts->push_back(
+ std::make_pair(CanonicalizeEmail(email), is_email_valid != 0));
+ }
+ }
+ }
+
+ return true;
+}
+
} // namespace gaia