[Easy signin]Set more permit record data when converting from key device list

chrome/browser/chromeos/login/easy_unlock/easy_unlock_key_manager.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_key_manager.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 
 namespace chromeos {
 
 namespace {
 
 const char kKeyBluetoothAddress[] = "bluetoothAddress";
 const char kKeyPermitRecord[] = "permitRecord";
-const char kKeyId[] = "id";
 const char kKeyPermitId[] = "permitRecord.id";
+const char kKeyPermitPermitId[] = "permitRecord.permitId";
+const char kKeyPermitData[] = "permitRecord.data";
+const char kKeyPermitType[] = "permitRecord.type";
 const char kKeyPsk[] = "psk";
 
 const char kKeyLabelPrefix[] = "easy-unlock-";
 
+const char kPermitPermitIdFormat[] = "permit://google.com/easyunlock/v1/%s";
+const char kPermitTypeValue[] = "licence";

[xiyuan, 2014/09/19 22:26:48]

nit: kPermitTypeValue -> kPermitTypeLicense

[tbarzic, 2014/09/19 23:59:18]

Done.

+
 }  // namespace
 
 EasyUnlockKeyManager::EasyUnlockKeyManager()
     : operation_id_(0),
       weak_ptr_factory_(this) {
 }
 
 EasyUnlockKeyManager::~EasyUnlockKeyManager() {
   STLDeleteContainerPairSecondPointers(get_keys_ops_.begin(),
                                        get_keys_ops_.end());
@@ skipping 52 matching lines @@
       base::Bind(&EasyUnlockKeyManager::OnKeysFetched,
                  weak_ptr_factory_.GetWeakPtr(),
                  op_id,
                  callback)));
   op->Start();
   get_keys_ops_[op_id] = op.release();
 }
 
 // static
 void EasyUnlockKeyManager::DeviceDataToRemoteDeviceDictionary(
+    const std::string& user_id,
     const EasyUnlockDeviceKeyData& data,
     base::DictionaryValue* dict) {
   dict->SetString(kKeyBluetoothAddress, data.bluetooth_address);
   dict->SetString(kKeyPsk, data.psk);
   scoped_ptr<base::DictionaryValue> permit_record(new base::DictionaryValue);
-  permit_record->SetString(kKeyId, data.public_key);
   dict->Set(kKeyPermitRecord, permit_record.release());
+  dict->SetString(kKeyPermitId, data.public_key);
+  dict->SetString(kKeyPermitData, data.public_key);
+  dict->SetString(kKeyPermitType, kPermitTypeValue);
+  dict->SetString(kKeyPermitPermitId,
+                  base::StringPrintf(kPermitPermitIdFormat,
+                                     user_id.c_str()));
 }
 
 // static
 bool EasyUnlockKeyManager::RemoteDeviceDictionaryToDeviceData(
     const base::DictionaryValue& dict,
     EasyUnlockDeviceKeyData* data) {
   std::string bluetooth_address;
   std::string public_key;
   std::string psk;
 
   if (!dict.GetString(kKeyBluetoothAddress, &bluetooth_address) ||
       !dict.GetString(kKeyPermitId, &public_key) ||
       !dict.GetString(kKeyPsk, &psk)) {
     return false;
   }
 
   data->bluetooth_address.swap(bluetooth_address);
   data->public_key.swap(public_key);
   data->psk.swap(psk);
   return true;
 }
 
 // static
 void EasyUnlockKeyManager::DeviceDataListToRemoteDeviceList(
+    const std::string& user_id,
     const EasyUnlockDeviceKeyDataList& data_list,
     base::ListValue* device_list) {
   device_list->Clear();
   for (size_t i = 0; i < data_list.size(); ++i) {
     scoped_ptr<base::DictionaryValue> device_dict(new base::DictionaryValue);
-    DeviceDataToRemoteDeviceDictionary(data_list[i], device_dict.get());
+    DeviceDataToRemoteDeviceDictionary(
+        user_id, data_list[i], device_dict.get());
     device_list->Append(device_dict.release());
   }
 }
 
 // static
 bool EasyUnlockKeyManager::RemoteDeviceListToDeviceDataList(
     const base::ListValue& device_list,
     EasyUnlockDeviceKeyDataList* data_list) {
   EasyUnlockDeviceKeyDataList parsed_devices;
   for (base::ListValue::const_iterator it = device_list.begin();
@@ skipping 60 matching lines @@
     get_keys_ops_.erase(it);
   } else {
     NOTREACHED();
   }
 
   if (!callback.is_null())
     callback.Run(fetch_success, fetched_data);
 }
 
 }  // namespace chromeos