[Easy signin] Wire up userClick auth attempt to easy unlock app and back

chrome/browser/chromeos/login/easy_unlock/easy_unlock_create_keys_operation.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/easy_unlock/easy_unlock_create_keys_operation.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 336 matching lines @@
       kEasyUnlockKeyPrivileges);
   key_def.revision = kEasyUnlockKeyRevision;
   key_def.provider_data.push_back(cryptohome::KeyDefinition::ProviderData(
       kEasyUnlockKeyMetaNameBluetoothAddress, device->bluetooth_address));
   key_def.provider_data.push_back(cryptohome::KeyDefinition::ProviderData(
       kEasyUnlockKeyMetaNamePsk, device->psk));
   key_def.provider_data.push_back(cryptohome::KeyDefinition::ProviderData(
       kEasyUnlockKeyMetaNamePubKey, device->public_key));
   key_def.provider_data.push_back(cryptohome::KeyDefinition::ProviderData(
       kEasyUnlockKeyMetaNameChallenge, device->challenge));
-  // TODO(xiyuan): Store wrapped secret when all pieces are in place.
   key_def.provider_data.push_back(cryptohome::KeyDefinition::ProviderData(
-      kEasyUnlockKeyMetaNameWrappedSecret, challenge_creator_->user_key()));
+      kEasyUnlockKeyMetaNameWrappedSecret, device->wrapped_secret));
 
   // Add cryptohome key.
   std::string canonicalized =
       gaia::CanonicalizeEmail(user_context_.GetUserID());
   cryptohome::Identification id(canonicalized);
   const Key* const auth_key = user_context_.GetKey();
   cryptohome::Authorization auth(auth_key->GetSecret(), auth_key->GetLabel());
   cryptohome::HomedirMethods::GetInstance()->AddKeyEx(
       id,
       auth,
       key_def,
       true,  // clobber
       base::Bind(&EasyUnlockCreateKeysOperation::OnKeyCreated,
                  weak_ptr_factory_.GetWeakPtr(),
-                 index));
+                 index,
+                 user_key));
 }
 
 void EasyUnlockCreateKeysOperation::OnKeyCreated(
     size_t index,
+    const Key& user_key,
     bool success,
     cryptohome::MountError return_code) {
   DCHECK_EQ(key_creation_index_, index);
 
   if (!success) {
     LOG(ERROR) << "Easy unlock failed to create key, code=" << return_code;
     callback_.Run(false);
     return;
   }
 
+  // If the key associated with the current context changed (i.e. in the case
+  // the current signin flow was Easy signin), update the user context.
+  if (user_context_.GetAuthFlow() == UserContext::AUTH_FLOW_EASY_UNLOCK &&
+      user_context_.GetKey()->GetLabel() ==
+          EasyUnlockKeyManager::GetKeyLabel(key_creation_index_)) {
+    user_context_.SetKey(user_key);
+  }
+
   ++key_creation_index_;
   CreateKeyForDeviceAtIndex(key_creation_index_);
 }
 
 }  // namespace chromeos