Add a Key class

chrome/browser/chromeos/login/managed/managed_user_creation_controller_old.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/managed/managed_user_creation_controller_old.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/sys_info.h"
 #include "base/task_runner_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
+#include "chrome/browser/chromeos/login/auth/key.h"
 #include "chrome/browser/chromeos/login/auth/mount_manager.h"
+#include "chrome/browser/chromeos/login/auth/user_context.h"
 #include "chrome/browser/chromeos/login/managed/locally_managed_user_constants.h"
 #include "chrome/browser/chromeos/login/managed/supervised_user_authentication.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/profile_sync_service_factory.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
@@ skipping 125 matching lines @@
   manager->SetCreationTransactionUserId(creation_context_->local_user_id);
   SupervisedUserAuthentication* authentication = manager->GetAuthentication();
   base::DictionaryValue extra;
   if (authentication->FillDataForNewUser(creation_context_->local_user_id,
                                          creation_context_->password,
                                          &creation_context_->password_data,
                                          &extra)) {
     authentication->StorePasswordData(creation_context_->local_user_id,
                                       creation_context_->password_data);
   }
+
   VLOG(1) << "Creating cryptohome";
+
+  UserContext context(creation_context_->local_user_id);
+  context.SetKey(Key(creation_context_->password));
   authenticator_ = new ManagedUserAuthenticator(this);
   authenticator_->AuthenticateToCreate(
-      creation_context_->local_user_id,
-      authentication->TransformPassword(creation_context_->local_user_id,
-                                        creation_context_->password));
+      context.GetUserID(),
+      authentication->TransformKey(context).GetKey()->GetSecret());
 }
 
 void ManagedUserCreationControllerOld::OnAuthenticationFailure(
     ManagedUserAuthenticator::AuthState error) {
   timeout_timer_.Stop();
   ErrorCode code = NO_ERROR;
   switch (error) {
     case ManagedUserAuthenticator::NO_MOUNT:
       code = CRYPTOHOME_NO_MOUNT;
       break;
@@ skipping 17 matching lines @@
   SupervisedUserAuthentication* authentication =
       UserManager::Get()->GetSupervisedUserManager()->GetAuthentication();
 
   if (creation_context_->creation_type == NEW_USER) {
     // Generate master password.
     creation_context_->master_key = authentication->GenerateMasterKey();
   }
 
   VLOG(1) << "Adding master key";
 
+  UserContext context(creation_context_->local_user_id);
+  context.SetKey(Key(creation_context_->password));
   authenticator_->AddMasterKey(
       creation_context_->local_user_id,
-      authentication->TransformPassword(creation_context_->local_user_id,
-                                        creation_context_->password),
+      authentication->TransformKey(context).GetKey()->GetSecret(),
       creation_context_->master_key);
 }
 
 void ManagedUserCreationControllerOld::OnAddKeySuccess() {
   creation_context_->registration_utility =
       ManagedUserRegistrationUtility::Create(
           creation_context_->manager_profile);
 
   VLOG(1) << "Creating user on server";
   // TODO(antrim) : add password data to sync once API is ready.
@@ skipping 74 matching lines @@
   // Assume that new token is valid. It will be automatically invalidated if
   // sync service fails to use it.
   UserManager::Get()->SaveUserOAuthStatus(creation_context_->local_user_id,
                                           User::OAUTH2_TOKEN_STATUS_VALID);
   UserManager::Get()->GetSupervisedUserManager()->CommitCreationTransaction();
   if (consumer_)
     consumer_->OnCreationSuccess();
 }
 
 }  // namespace chromeos