Translate device-local account IDs to user IDs

chrome/browser/chromeos/login/existing_user_controller.cc

Index: chrome/browser/chromeos/login/existing_user_controller.cc
diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc
index a68276985cd5bca8bd2be8422fb58b5ef76ba983..6a0c6fdc19d3bc81c696d1f9e573193591e62874 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.cc
+++ b/chrome/browser/chromeos/login/existing_user_controller.cc
@@ -33,6 +33,7 @@
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/net/connectivity_state_helper.h"
+#include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/cros_settings_names.h"
@@ -899,10 +900,24 @@ void ExistingUserController::ActivateWizard(const std::string& screen_name) {
 }
 
 void ExistingUserController::ConfigurePublicSessionAutoLogin() {

[Mattias Nissler (ping if slow), 2013/05/15 09:38:47]

Hm, maybe a better approach for this would be to put the auto-login flag into
the User object?

[bartfab (slow), 2013/05/17 11:14:28]

I don't think that would be right. Auto-login is not a property of an individual
device-local account but a single, global setting. If you do not want
ExistingUserController to be managing the auto-login settings separately, the
approach I would take is to create a DeviceLocalAccounts class that contains a
the account list (an std::vector) and the auto-login settings (int + std::string
and/or a reference into the account list).

[Mattias Nissler (ping if slow), 2013/05/17 14:29:44]

What I'm saying is that ExistingUserController should probably not read the auto
login property directly from the persistence layer and instead UserManager
should be in charge of telling the login UI what the auto-login account should
be.

[bartfab (slow), 2013/05/17 16:08:47]

A near-term goal is to create User objects for all device-local accounts and
keep them in UserManagerImpl::users_. At that point, I agree,
ExistingUserController should just ask the UserManager for the right User.

Right now, the only complete list of device-local accounts exists in
CrosSettings. It is unavoidable that the list be read from CrosSettings and then
searched for the right entry. I can move the chunk of code that does that to
UserManager but this will not really buy us anything: Every LOC I remove here
will have to be added to UserManagerImpl. Plus, I will have to inflate the
UserManager interface by adding yet another method.

The careful reader will notice that UserManagerImpl already does read and parse
the list of device-local accounts. It might appear that UserManagerImpl can just
extract and store the auto-login user ID at that point. Unfortunately, that will
not work. The reading and parsing happens only after the device settings have
become trusted while this method here may run earlier.

Since this method already accesses the CrosSettings backend, I think it is most
appropriate to leave the reading and parsing of the device-local account list
here. Once device-local accounts appear in UserManagerImpl::users_, all of the
code can go away.

-  if (!cros_settings_->GetString(
-          kAccountsPrefDeviceLocalAccountAutoLoginId,
-          &public_session_auto_login_username_)) {
-    public_session_auto_login_username_.clear();
+  std::string auto_login_account_id;
+  cros_settings_->GetString(kAccountsPrefDeviceLocalAccountAutoLoginId,
+                            &auto_login_account_id);
+
+  const base::ListValue* device_local_accounts_list;
+  cros_settings_->GetList(kAccountsPrefDeviceLocalAccounts,
+                          &device_local_accounts_list);
+  const std::vector<policy::DeviceLocalAccount> device_local_accounts =
+      policy::DecodeDeviceLocalAccountsList(device_local_accounts_list);
+
+  public_session_auto_login_username_.clear();
+  for (std::vector<policy::DeviceLocalAccount>::const_iterator
+           it = device_local_accounts.begin();
+       it != device_local_accounts.end(); ++it) {
+    if (it->account_id == auto_login_account_id) {
+      public_session_auto_login_username_ = it->user_id;
+      break;
+    }
   }
 
   const User* user =