Added affiliation IDs for the new affiliation determination.

chrome/browser/chromeos/login/users/chrome_user_manager_impl.cc

 // Copyright 2014 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 "chrome/browser/chromeos/login/users/chrome_user_manager_impl.h"
 
 #include <cstddef>
 #include <set>
 
 #include "ash/multi_profile_uma.h"
@@ skipping 11 matching lines @@
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
 #include "chrome/browser/chromeos/login/signin/auth_sync_observer.h"
 #include "chrome/browser/chromeos/login/signin/auth_sync_observer_factory.h"
+#include "chrome/browser/chromeos/login/users/affiliation.h"
 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager_impl.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager_impl.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/profiles/multiprofiles_session_aborted_dialog.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/session_length_limiter.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ skipping 45 matching lines @@
 }
 
 }  // namespace
 
 // static
 void ChromeUserManagerImpl::RegisterPrefs(PrefRegistrySimple* registry) {
   ChromeUserManager::RegisterPrefs(registry);
 
   registry->RegisterListPref(kPublicAccounts);
   registry->RegisterStringPref(kPublicAccountPendingDataRemoval, std::string());
+
   SupervisedUserManager::RegisterPrefs(registry);
   SessionLengthLimiter::RegisterPrefs(registry);
   BootstrapManager::RegisterPrefs(registry);
 }
 
 // static
 scoped_ptr<ChromeUserManager> ChromeUserManagerImpl::CreateChromeUserManager() {
   return scoped_ptr<ChromeUserManager>(new ChromeUserManagerImpl());
 }
 
@@ skipping 607 matching lines @@
 
   // Make sure that new data is persisted to Local State.
   GetLocalState()->CommitPendingWrite();
 }
 
 bool ChromeUserManagerImpl::HasPendingBootstrap(
     const std::string& user_id) const {
   return bootstrap_manager_->HasPendingBootstrap(user_id);
 }
 
+std::set<std::string> ChromeUserManagerImpl::GetDeviceAffiliationIDs() const {

[Mattias Nissler (ping if slow), 2015/07/29 20:08:13]

Any good reason to have this as a separate function?

[peletskyi, 2015/07/30 11:02:27]

Done.

+  return g_browser_process->platform_part()
+      ->browser_policy_connector_chromeos()
+      ->GetDeviceAffiliationIDs();
+}
+
+std::string ChromeUserManagerImpl::GetEnterpriseDomain() const {

[Mattias Nissler (ping if slow), 2015/07/29 20:08:13]

ditto, can't this simply be inlined in IsUserAffiliated?

[peletskyi, 2015/07/30 11:02:27]

Done.

+  return g_browser_process->platform_part()
+      ->browser_policy_connector_chromeos()
+      ->GetEnterpriseDomain();
+}
+
+bool ChromeUserManagerImpl::IsUserAffiliated(
+    const std::set<std::string>& user_affiliation_ids,
+    const std::string& user_email) const {
+  return chromeos::IsUserAffiliated(user_affiliation_ids,
+                                    GetDeviceAffiliationIDs(), user_email,
+                                    GetEnterpriseDomain());
+}
+
 void ChromeUserManagerImpl::PublicAccountUserLoggedIn(
     user_manager::User* user) {
   SetIsCurrentUserNew(true);
   active_user_ = user;
 
   // The UserImageManager chooses a random avatar picture when a user logs in
   // for the first time. Tell the UserImageManager that this user is not new to
   // prevent the avatar from getting changed.
   GetUserImageManager(user->email())->UserLoggedIn(false, true);
   WallpaperManager::Get()->EnsureLoggedInUserWallpaperLoaded();
@@ skipping 380 matching lines @@
   }
 
   if (profile->GetPrefs()->GetBoolean(prefs::kResolveTimezoneByGeolocation) &&
       !system::HasSystemTimezonePolicy()) {
     g_browser_process->platform_part()->GetTimezoneResolver()->Start();
   } else {
     g_browser_process->platform_part()->GetTimezoneResolver()->Stop();
   }
 }
 
+void ChromeUserManagerImpl::SetUserAffiliation(
+    const std::string& user_id,
+    const std::set<std::string>& user_affiliation_ids) {
+  LOG(ERROR) << "SetUserAffiliation is not implemented yet. Called for user: "
+             << user_id;
+  if (user_manager::User* user = FindUserAndModify(user_id)) {
+    LOG(ERROR) << "Affiliation to set: "
+               << IsUserAffiliated(user_affiliation_ids, user->GetEmail());

[Mattias Nissler (ping if slow), 2015/07/29 20:08:13]

If you really just need to set the affiliation field in the user object, you
might just as well compute the affiliation in the caller, and then pass it in
here. However, neither solution will handle the case where the device-level
affiliation IDs change after policy fetch, and hence user affiliation needs to
be adjusted. Or maybe that is an edge case we don't care about?

On a related note: Wasn't the whole reason we decided to move the affiliation
field to User to enable caching there? Will we still cache something? If not, it
might actually not make much sense to move the affiliation field into the User
class at all... I might be missing something though.

[peletskyi, 2015/07/30 11:02:27]

Many features are not updated when affiliation is changed after user is
logged-in. Thus we only care about login-time value and guarantee that new
affiliation will fully work after user would log in again. On that time new
device affiliation IDs are fetched and will have affect. Besides this after each
user policy fetch affiliation status is updated. So, if admin wants to have
updated affiliation at any time, he can just enforce user policy update.
The whole idea was that we should keep affiliation value somewhere. And User
seems to be the best place.

[Mattias Nissler (ping if slow), 2015/07/30 12:10:57]

OK, fair.
OK - now that components/User doesn't do any data caching etc., please make sure
that components/user/OWNERS are fine with this. I see you already added
dpolukhin@, so let's see what he says.

+  }
+}
+
 }  // namespace chromeos