Add account_type into AccountId

components/user_manager/known_user.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/user_manager/known_user.h"
 
 #include <stddef.h>
 
 #include <memory>
 #include <utility>
@@ skipping 14 matching lines @@
 const char kKnownUsers[] = "KnownUsers";
 
 // Known user preferences keys (stored in Local State).
 
 // Key of canonical e-mail value.
 const char kCanonicalEmail[] = "email";
 
 // Key of obfuscated GAIA id value.
 const char kGAIAIdKey[] = "gaia_id";
 
+// Key of account type.
+const char kAccountTypeKey[] = "account_type";
+
 // Key of whether this user ID refers to a SAML user.
 const char kUsingSAMLKey[] = "using_saml";
 
 // Key of Device Id.
 const char kDeviceId[] = "device_id";
 
 // Key of GAPS cookie.
 const char kGAPSCookie[] = "gaps_cookie";
 
 // Key of the reason for re-auth.
 const char kReauthReasonKey[] = "reauth_reason";
 
 // Key for the GaiaId migration status.
 const char kGaiaIdMigration[] = "gaia_id_migration";
 
 PrefService* GetLocalState() {
   if (!UserManager::IsInitialized())
     return nullptr;
 
   return UserManager::Get()->GetLocalState();
 }
 
 // Checks if values in |dict| correspond with |account_id| identity.
 bool UserMatches(const AccountId& account_id,
                  const base::DictionaryValue& dict) {
   std::string value;
+  std::string account_type;
+  if (!dict.GetString(kAccountTypeKey, &account_type))
+    account_type = AccountId::kGoogle;
 
   // TODO(alemate): update code once user id is really a struct.
   bool has_gaia_id = dict.GetString(kGAIAIdKey, &value);
-  if (has_gaia_id && account_id.GetGaiaId() == value)
+  if (has_gaia_id && account_id.GetGaiaId() == value) {
+    DCHECK(account_id.GetAccountType() == account_type);
     return true;
+  }
 
   bool has_email = dict.GetString(kCanonicalEmail, &value);
   if (has_email && account_id.GetUserEmail() == value)
     return true;
 
   return false;
 }
 
 // Fills relevant |dict| values based on |account_id|.
 void UpdateIdentity(const AccountId& account_id, base::DictionaryValue& dict) {
   if (!account_id.GetUserEmail().empty())
     dict.SetString(kCanonicalEmail, account_id.GetUserEmail());
 
   if (!account_id.GetGaiaId().empty())
     dict.SetString(kGAIAIdKey, account_id.GetGaiaId());
+
+  if (!account_id.GetAccountType().empty())
+    dict.SetString(kAccountTypeKey, account_id.GetAccountType());
 }
 
 }  // namespace
 
 bool FindPrefs(const AccountId& account_id,
                const base::DictionaryValue** out_value) {
   PrefService* local_state = GetLocalState();
 
   // Local State may not be initialized in tests.
   if (!local_state)
@@ skipping 118 matching lines @@
   if (!local_state)
     return;
 
   ListPrefUpdate update(local_state, kKnownUsers);
   base::DictionaryValue dict;
   dict.SetInteger(path, in_value);
   UpdatePrefs(account_id, dict, false);
 }
 
 AccountId GetAccountId(const std::string& user_email,
-                       const std::string& gaia_id) {
+                       const std::string& gaia_id,
+                       const std::string& account_type) {
+  // Account type shouldn't be passed w/o gaia_id.
+  DCHECK(account_type.empty() || !gaia_id.empty());
   // In tests empty accounts are possible.
   if (user_email.empty() && gaia_id.empty())
     return EmptyAccountId();
 
   AccountId result(EmptyAccountId());
   // UserManager is usually NULL in unit tests.
   if (UserManager::IsInitialized() &&
       UserManager::Get()->GetPlatformKnownUserId(user_email, gaia_id,
                                                  &result)) {
     return result;
   }
 
   // We can have several users with the same gaia_id but different e-mails.
   // The opposite case is not possible.
   std::string stored_gaia_id;
   const std::string sanitized_email =
       user_email.empty()
           ? std::string()
           : gaia::CanonicalizeEmail(gaia::SanitizeEmail(user_email));
+  std::string stored_account_type;
+  const bool has_stored_account_type =
+      GetStringPref(AccountId::FromUserEmail(sanitized_email), kAccountTypeKey,
+                    &stored_account_type);
+  if (has_stored_account_type && !account_type.empty() &&
+      account_type != stored_account_type) {
+    LOG(FATAL) << "Account type has changed";
+  }
 
   if (!sanitized_email.empty() &&
       GetStringPref(AccountId::FromUserEmail(sanitized_email), kGAIAIdKey,
                     &stored_gaia_id)) {
     if (!gaia_id.empty() && gaia_id != stored_gaia_id)
       LOG(ERROR) << "User gaia id has changed. Sync will not work.";
 
-    // gaia_id is associated with cryptohome.
-    return AccountId::FromUserEmailGaiaId(sanitized_email, stored_gaia_id);
+    return has_stored_account_type
+               ? AccountId::FromUserEmailGaiaIdAccountType(
+                     sanitized_email, stored_gaia_id, stored_account_type)
+               : AccountId::FromUserEmailGaiaId(sanitized_email,
+                                                stored_gaia_id);
   }
+  DCHECK(!has_stored_account_type);
 
   std::string stored_email;
   // GetStringPref() returns the first user record that matches
   // given ID. So we will get the first one if there are multiples.
-  if (!gaia_id.empty() && GetStringPref(AccountId::FromGaiaId(gaia_id),
-                                        kCanonicalEmail, &stored_email)) {
-    return AccountId::FromUserEmailGaiaId(stored_email, gaia_id);
+  if (!gaia_id.empty()) {
+    const AccountId account_id(
+        account_type.empty()
+            ? AccountId::FromGaiaId(gaia_id)
+            : AccountId::FromGaiaIdAccountType(gaia_id, account_type));
+    if (GetStringPref(account_id, kCanonicalEmail, &stored_email)) {
+      return AccountId::FromUserEmailGaiaIdAccountType(
+          stored_email, gaia_id, account_id.GetAccountType());
+    }
   }
 
-  return (gaia_id.empty()
-              ? AccountId::FromUserEmail(user_email)
-              : AccountId::FromUserEmailGaiaId(user_email, gaia_id));
+  if (!account_type.empty()) {
+    return AccountId::FromUserEmailGaiaIdAccountType(user_email, gaia_id,
+                                                     account_type);
+  } else {
+    return (gaia_id.empty()

[Alexander Alekseev, 2016/11/27 08:41:54]

nit: no else

[Roman Sorokin (ftl), 2016/12/02 11:13:11]

Done.

+                ? AccountId::FromUserEmail(user_email)
+                : AccountId::FromUserEmailGaiaId(user_email, gaia_id));
+  }
 }
 
 std::vector<AccountId> GetKnownAccountIds() {
   std::vector<AccountId> result;
   PrefService* local_state = GetLocalState();
 
   // Local State may not be initialized in tests.
   if (!local_state)
     return result;
 
   const base::ListValue* known_users = local_state->GetList(kKnownUsers);
   for (size_t i = 0; i < known_users->GetSize(); ++i) {
     const base::DictionaryValue* element = nullptr;
     if (known_users->GetDictionary(i, &element)) {
       std::string email;
       std::string gaia_id;
+      std::string account_type = AccountId::kGoogle;
       const bool has_email = element->GetString(kCanonicalEmail, &email);
       const bool has_gaia_id = element->GetString(kGAIAIdKey, &gaia_id);
-      if (has_email || has_gaia_id)
-        result.push_back(AccountId::FromUserEmailGaiaId(email, gaia_id));
+      element->GetString(kAccountTypeKey, &account_type);
+      if (has_email || has_gaia_id) {
+        result.push_back(AccountId::FromUserEmailGaiaIdAccountType(
+            email, gaia_id, account_type));
+      }
     }
   }
   return result;
 }
 
 bool GetGaiaIdMigrationStatus(const AccountId& account_id,
                               const std::string& subsystem) {
   bool migrated = false;
 
   if (GetBooleanPref(account_id,
                      std::string(kGaiaIdMigration) + "." + subsystem,
                      &migrated)) {
     return migrated;
   }
 
   return false;
 }
 
 void SetGaiaIdMigrationStatusDone(const AccountId& account_id,
                                   const std::string& subsystem) {
   SetBooleanPref(account_id, std::string(kGaiaIdMigration) + "." + subsystem,
                  true);
 }
 
 void UpdateGaiaID(const AccountId& account_id, const std::string& gaia_id) {
   SetStringPref(account_id, kGAIAIdKey, gaia_id);
 }
 
+void UpdateAccountType(const AccountId& account_id) {
+  SetStringPref(account_id, kAccountTypeKey, account_id.GetAccountType());
+}
+
 bool FindGaiaID(const AccountId& account_id, std::string* out_value) {
   return GetStringPref(account_id, kGAIAIdKey, out_value);
 }
 
 void SetDeviceId(const AccountId& account_id, const std::string& device_id) {
   const std::string known_device_id = GetDeviceId(account_id);
   if (!known_device_id.empty() && device_id != known_device_id) {
     NOTREACHED() << "Trying to change device ID for known user.";
   }
   SetStringPref(account_id, kDeviceId, device_id);
@@ skipping 57 matching lines @@
     }
   }
 }
 
 void RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterListPref(kKnownUsers);
 }
 
 }  // namespace known_user
 }  // namespace user_manager