Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / google_apis / gaia / gaia_auth_util.cc

diff --git a/src/google_apis/gaia/gaia_auth_util.cc b/src/google_apis/gaia/gaia_auth_util.cc
index f8f95c1..6532d19 100644 (file)
--- a/src/google_apis/gaia/gaia_auth_util.cc
+++ b/src/google_apis/gaia/gaia_auth_util.cc
@@ -22,10 +22,12 @@ std::string CanonicalizeEmail(const std::string& email_address) {
   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.
+  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]);
+  }
   std::string new_email = StringToLowerASCII(JoinString(parts, at));
   VLOG(1) << "Canonicalized " << email_address << " to " << new_email;
   return new_email;
@@ -73,35 +75,48 @@ bool IsGaiaSignonRealm(const GURL& url) {
 }
 
 
-std::vector<std::string> ParseListAccountsData(const std::string& data) {
-  std::vector<std::string> account_ids;
+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 account_ids;
+    return false;
 
   base::ListValue* list;
   if (!value->GetAsList(&list) || list->GetSize() < 2)
-    return account_ids;
+    return false;
 
   // Get list of account info.
-  base::ListValue* accounts;
-  if (!list->GetList(1, &accounts) || accounts == NULL)
-    return account_ids;
+  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 < accounts->GetSize(); ++i) {
+  for (size_t i = 0; i < account_list->GetSize(); ++i) {
     base::ListValue* account;
-    if (accounts->GetList(i, &account) && account != NULL) {
+    if (account_list->GetList(i, &account) && account != NULL) {
       std::string email;
-      if (account->GetString(3, &email) && !email.empty())
-        account_ids.push_back(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 account_ids;
+  return true;
 }
 
 }  // namespace gaia