Create Mojo Struct for user information used in login/lock screen.

chrome/browser/chromeos/login/screens/user_selection_screen.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/screens/user_selection_screen.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
+#include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_factory.h"
 #include "chrome/browser/chromeos/login/quick_unlock/quick_unlock_storage.h"
 #include "chrome/browser/chromeos/login/reauth_stats.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/views/user_board_view.h"
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/signin/easy_unlock_service.h"
 #include "chrome/browser/ui/webui/chromeos/login/l10n_util.h"
 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
 #include "chrome/grit/generated_resources.h"
+#include "chrome/grit/theme_resources.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/dbus_method_call_status.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "components/arc/arc_util.h"
 #include "components/prefs/pref_service.h"
 #include "components/proximity_auth/screenlock_bridge.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/user_manager/known_user.h"
 #include "components/user_manager/user_manager.h"
 #include "components/user_manager/user_type.h"
 #include "ui/base/l10n/l10n_util.h"
+#include "ui/base/resource/resource_bundle.h"
 #include "ui/base/user_activity/user_activity_detector.h"
 
 namespace chromeos {
 
 namespace {
 
 // User dictionary keys.
 const char kKeyUsername[] = "username";
 const char kKeyGaiaID[] = "gaiaId";
 const char kKeyDisplayName[] = "displayName";
@@ skipping 92 matching lines @@
          arc::IsArcAvailable();
 }
 
 // Returns true if the user can run ARC based on the user type.
 bool IsUserAllowedForARC(const AccountId& account_id) {
   return user_manager::UserManager::IsInitialized() &&
          arc::IsArcAllowedForUser(
              user_manager::UserManager::Get()->FindUser(account_id));
 }
 
+AccountId GetOwnerAccountId() {
+  std::string owner_email;
+  chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner,
+                                           &owner_email);
+  const AccountId owner = user_manager::known_user::GetAccountId(
+      owner_email, std::string() /* id */, AccountType::UNKNOWN);
+  return owner;
+}
+
+bool IsEnterpriseManaged() {
+  policy::BrowserPolicyConnectorChromeOS* connector =
+      g_browser_process->platform_part()->browser_policy_connector_chromeos();
+  return connector->IsEnterpriseManaged();
+}
+
+bool IsSigninToAdd() {
+  return LoginDisplayHost::default_host() &&
+         user_manager::UserManager::Get()->IsUserLoggedIn();
+}
+
+bool CanRemoveUser(bool is_single_user, user_manager::User* user) {

[xiyuan, 2017/06/13 18:00:18]

nit: const user_manager::User*

[xiaoyinh(OOO Sep 11-29), 2017/06/13 22:21:31]

Done.

+  // Single user check here is necessary because owner info might not be
+  // available when running into login screen on first boot.
+  // See http://crosbug.com/12723
+  if (is_single_user && !IsEnterpriseManaged())
+    return false;
+  if (!user->GetAccountId().is_valid())
+    return false;
+  if (user->GetAccountId() == GetOwnerAccountId())
+    return false;
+  if (user->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT ||
+      user->is_logged_in() || IsSigninToAdd())
+    return false;
+
+  return true;
+}
+
+void GetMultiProfilePolicy(user_manager::User* user,

[xiyuan, 2017/06/13 18:00:18]

nit: const user_manager::User*

[xiaoyinh(OOO Sep 11-29), 2017/06/13 22:21:31]

Done.

+                           bool* out_is_allowed,
+                           std::string* out_policy) {
+  const std::string& user_id = user->GetAccountId().GetUserEmail();
+  MultiProfileUserController* multi_profile_user_controller =
+      ChromeUserManager::Get()->GetMultiProfileUserController();
+  MultiProfileUserController::UserAllowedInSessionReason isUserAllowedReason;

[xiyuan, 2017/06/13 18:00:17]

nit: isUserAllowedReason -> is_user_allowed_reason

[xiaoyinh(OOO Sep 11-29), 2017/06/13 22:21:31]

Done.

+  *out_is_allowed = multi_profile_user_controller->IsUserAllowedInSession(
+      user_id, &isUserAllowedReason);
+  switch (isUserAllowedReason) {
+    case MultiProfileUserController::NOT_ALLOWED_OWNER_AS_SECONDARY:
+      *out_policy = MultiProfileUserController::kBehaviorOwnerPrimaryOnly;
+      break;
+    default:
+      *out_policy = multi_profile_user_controller->GetCachedValue(user_id);
+  }
+}
+
 }  // namespace
 
 // Helper class to call cryptohome to check whether a user needs dircrypto
 // migration. The check results are cached to limit calls to cryptohome.
 class UserSelectionScreen::DircryptoMigrationChecker {
  public:
   explicit DircryptoMigrationChecker(UserSelectionScreen* owner)
       : owner_(owner), weak_ptr_factory_(this) {}
   ~DircryptoMigrationChecker() = default;
 
@@ skipping 143 matching lines @@
   if (user_manager::known_user::FindGaiaID(user->GetAccountId(), &gaia_id)) {
     user_dict->SetString(kKeyGaiaID, gaia_id);
   }
 }
 
 // static
 void UserSelectionScreen::FillMultiProfileUserPrefs(
     user_manager::User* user,
     base::DictionaryValue* user_dict,
     bool is_signin_to_add) {
-  const std::string& user_id = user->GetAccountId().GetUserEmail();
+  if (!is_signin_to_add) {
+    user_dict->SetBoolean(kKeyMultiProfilesAllowed, true);
+    return;
+  }
 
-  if (is_signin_to_add) {
-    MultiProfileUserController* multi_profile_user_controller =
-        ChromeUserManager::Get()->GetMultiProfileUserController();
-    MultiProfileUserController::UserAllowedInSessionReason isUserAllowedReason;
-    bool isUserAllowed = multi_profile_user_controller->IsUserAllowedInSession(
-        user_id, &isUserAllowedReason);
-    user_dict->SetBoolean(kKeyMultiProfilesAllowed, isUserAllowed);
-
-    std::string behavior;
-    switch (isUserAllowedReason) {
-      case MultiProfileUserController::NOT_ALLOWED_OWNER_AS_SECONDARY:
-        behavior = MultiProfileUserController::kBehaviorOwnerPrimaryOnly;
-        break;
-      default:
-        behavior = multi_profile_user_controller->GetCachedValue(user_id);
-    }
-    user_dict->SetString(kKeyMultiProfilesPolicy, behavior);
-  } else {
-    user_dict->SetBoolean(kKeyMultiProfilesAllowed, true);
-  }
+  bool is_user_allowed;
+  std::string policy;
+  GetMultiProfilePolicy(user, &is_user_allowed, &policy);
+  user_dict->SetBoolean(kKeyMultiProfilesAllowed, is_user_allowed);
+  user_dict->SetString(kKeyMultiProfilesPolicy, policy);
 }
 
 // static
 bool UserSelectionScreen::ShouldForceOnlineSignIn(
     const user_manager::User* user) {
   // Public sessions are always allowed to log in offline.
   // Supervised users are always allowed to log in offline.
   // For all other users, force online sign in if:
   // * The flag to force online sign-in is set for the user.
   // * The user's OAuth token is invalid or unknown.
@@ skipping 23 matching lines @@
   // We need to force an online signin if the user is marked as requiring it,
   // or if the user's session never completed initialization (still need to
   // check for policy/management state) or if there's an invalid OAUTH token
   // that needs to be refreshed.
   return user->force_online_signin() || !user->profile_ever_initialized() ||
          (has_gaia_account &&
           (token_status == user_manager::User::OAUTH2_TOKEN_STATUS_INVALID ||
            token_status == user_manager::User::OAUTH_TOKEN_STATUS_UNKNOWN));
 }
 
+// static
+void UserSelectionScreen::FillUserMojoStruct(
+    user_manager::User* user,
+    bool is_owner,
+    bool is_signin_to_add,
+    AuthType auth_type,
+    ash::mojom::LoginUserInfo& user_info) {
+  user_info.basic_user_info = ash::mojom::UserInfo::New();
+  user_info.basic_user_info->type = user->GetType();
+  user_info.basic_user_info->account_id = user->GetAccountId();
+  user_info.basic_user_info->display_name =
+      base::UTF16ToUTF8(user->GetDisplayName());
+  user_info.basic_user_info->display_email = user->display_email();
+  user_info.basic_user_info->avatar = user->GetImage();
+  if (user_info.basic_user_info->avatar.isNull()) {
+    user_info.basic_user_info->avatar =
+        *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+            IDR_PROFILE_PICTURE_LOADING);
+  }
+  user_info.is_desktop_user = false;
+  user_info.auth_type = static_cast<ash::mojom::AuthType>(auth_type);
+  user_info.is_signed_in = user->is_logged_in();
+  user_info.is_owner = is_owner;
+  user_info.allow_fingerprint_unlock = AllowFingerprintForUser(user);
+
+  FillMultiProfileUserPrefsInMojo(user, user_info, is_signin_to_add);

[jdufault, 2017/06/13 17:41:54]

I think the existing code is structured like this (ie, FillFoo, FillBar, ...),
but FillMultiProfilePrefsInMojo is unconditionally called once, which makes it a
great candidate for removal :)

Please inline FillMultiProfileUserPrefsInMojo. Feel free to put a comment above
the inlined code, ie,

  // Fill multi-profile data.

[xiaoyinh(OOO Sep 11-29), 2017/06/13 22:21:31]

Done.

+}
+
+// static
+void UserSelectionScreen::FillMultiProfileUserPrefsInMojo(
+    user_manager::User* user,
+    ash::mojom::LoginUserInfo& user_info,
+    bool is_signin_to_add) {
+  if (!is_signin_to_add) {
+    user_info.is_multiprofile_allowed = true;
+    return;
+  }
+
+  bool is_user_allowed;
+  std::string policy;
+  GetMultiProfilePolicy(user, &is_user_allowed, &policy);
+  user_info.is_multiprofile_allowed = is_user_allowed;
+  user_info.multiprofile_policy = policy;
+}
+
 void UserSelectionScreen::SetHandler(LoginDisplayWebUIHandler* handler) {
   handler_ = handler;
 
   if (handler_) {
     // Forcibly refresh all of the user images, as the |handler_| instance may
     // have been reused.
     for (user_manager::User* user : users_)
       handler_->OnUserImageChanged(*user);
   }
 }
@@ skipping 229 matching lines @@
   service->RecordClickOnLockIcon();
 }
 
 std::unique_ptr<base::ListValue> UserSelectionScreen::PrepareUserList() {
   std::unique_ptr<base::ListValue> users_list =
       base::MakeUnique<base::ListValue>();
 
   // TODO(nkostylev): Move to a separate method in UserManager.
   // http://crbug.com/230852
   bool single_user = users_.size() == 1;
-  bool is_signin_to_add = LoginDisplayHost::default_host() &&
-                          user_manager::UserManager::Get()->IsUserLoggedIn();
-  std::string owner_email;
-  chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner,
-                                           &owner_email);
-  const AccountId owner = user_manager::known_user::GetAccountId(
-      owner_email, std::string() /* id */, AccountType::UNKNOWN);
-
-  policy::BrowserPolicyConnectorChromeOS* connector =
-      g_browser_process->platform_part()->browser_policy_connector_chromeos();
-  bool is_enterprise_managed = connector->IsEnterpriseManaged();
+  AccountId owner = GetOwnerAccountId();
+  bool is_signin_to_add = IsSigninToAdd();
 
   users_to_send_ = PrepareUserListForSending(users_, owner, is_signin_to_add);
 
   user_auth_type_map_.clear();
 
   const std::vector<std::string> kEmptyRecommendedLocales;
   for (user_manager::UserList::const_iterator it = users_to_send_.begin();
        it != users_to_send_.end(); ++it) {
     const AccountId& account_id = (*it)->GetAccountId();
     bool is_owner = (account_id == owner);
     const bool is_public_account =
         ((*it)->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT);
     const AuthType initial_auth_type =
         is_public_account ? EXPAND_THEN_USER_CLICK
                           : (ShouldForceOnlineSignIn(*it) ? ONLINE_SIGN_IN
                                                           : OFFLINE_PASSWORD);
     user_auth_type_map_[account_id] = initial_auth_type;
 
     auto user_dict = base::MakeUnique<base::DictionaryValue>();
     const std::vector<std::string>* public_session_recommended_locales =
         public_session_recommended_locales_.find(account_id) ==
                 public_session_recommended_locales_.end()
             ? &kEmptyRecommendedLocales
             : &public_session_recommended_locales_[account_id];
     FillUserDictionary(*it, is_owner, is_signin_to_add, initial_auth_type,
                        public_session_recommended_locales, user_dict.get());
-    bool signed_in = (*it)->is_logged_in();
-
-    // Single user check here is necessary because owner info might not be
-    // available when running into login screen on first boot.
-    // See http://crosbug.com/12723
-    bool can_remove_user =
-        ((!single_user || is_enterprise_managed) && account_id.is_valid() &&
-         !is_owner && !is_public_account && !signed_in && !is_signin_to_add);
-    user_dict->SetBoolean(kKeyCanRemove, can_remove_user);
+    user_dict->SetBoolean(kKeyCanRemove, CanRemoveUser(single_user, *it));
     users_list->Append(std::move(user_dict));
   }
 
   return users_list;
 }
 
+std::vector<ash::mojom::LoginUserInfoPtr>
+UserSelectionScreen::PrepareUserListToMojo() {
+  std::vector<ash::mojom::LoginUserInfoPtr> user_info_list;
+
+  bool single_user = users_.size() == 1;

[xiyuan, 2017/06/13 18:00:18]

nit: Declare it as "const" since the rest of the function would not change it.
Same goes for |owner| and |is_signin_to_add|.

[xiaoyinh(OOO Sep 11-29), 2017/06/13 22:21:31]

Done.

+  AccountId owner = GetOwnerAccountId();
+  bool is_signin_to_add = IsSigninToAdd();
+  users_to_send_ = PrepareUserListForSending(users_, owner, is_signin_to_add);
+
+  user_auth_type_map_.clear();

[jdufault, 2017/06/13 17:41:54]

:(, it is a bit unexpected that this method changes internal state.

Please either add a function level comment or rename the method; I'm not sure of
a great name, maybe UpdateAndReturnUserListForMojo? Up to you.

[xiaoyinh(OOO Sep 11-29), 2017/06/13 22:21:31]

Thanks! Both this and PrepareUserList will update internal states. I've renamed
both.

+
+  for (user_manager::UserList::const_iterator it = users_to_send_.begin();
+       it != users_to_send_.end(); ++it) {
+    const AccountId& account_id = (*it)->GetAccountId();
+    bool is_owner = owner == account_id;
+    const bool is_public_account =
+        ((*it)->GetType() == user_manager::USER_TYPE_PUBLIC_ACCOUNT);
+    const AuthType initial_auth_type =
+        is_public_account ? EXPAND_THEN_USER_CLICK
+                          : (ShouldForceOnlineSignIn(*it) ? ONLINE_SIGN_IN
+                                                          : OFFLINE_PASSWORD);
+    user_auth_type_map_[account_id] = initial_auth_type;
+
+    ash::mojom::LoginUserInfoPtr login_user_info =
+        ash::mojom::LoginUserInfo::New();
+    FillUserMojoStruct(*it, is_owner, is_signin_to_add, initial_auth_type,
+                       *login_user_info);
+    login_user_info->can_remove = CanRemoveUser(single_user, *it);
+    user_info_list.push_back(std::move(login_user_info));
+  }
+
+  return user_info_list;
+}
+
 EasyUnlockService* UserSelectionScreen::GetEasyUnlockServiceForUser(
     const AccountId& account_id) const {
   if (GetScreenType() == OTHER_SCREEN)
     return nullptr;
 
   const user_manager::User* unlock_user = nullptr;
   for (const user_manager::User* user : users_) {
     if (user->GetAccountId() == account_id) {
       unlock_user = user;
       break;
     }
   }
   if (!unlock_user)
     return nullptr;
 
   ProfileHelper* profile_helper = ProfileHelper::Get();
   Profile* profile = profile_helper->GetProfileByUser(unlock_user);
 
   // The user profile should exist if and only if this is the lock screen.
   DCHECK_EQ(!!profile, GetScreenType() == LOCK_SCREEN);
 
   if (!profile)
     profile = profile_helper->GetSigninProfile();
 
   return EasyUnlockService::Get(profile);
 }
 
 }  // namespace chromeos