Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(448)

Unified Diff: components/proximity_auth/webui/proximity_auth_webui_handler.cc

Issue 2953863002: [CrOS Tether] ProximityAuth WebUI improvement: show the local device's ID. (Closed)
Patch Set: Rebased. Created 3 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: components/proximity_auth/webui/proximity_auth_webui_handler.cc
diff --git a/components/proximity_auth/webui/proximity_auth_webui_handler.cc b/components/proximity_auth/webui/proximity_auth_webui_handler.cc
index f0c8baac7f3b56cc80cbd255dea63c3dbe68df5d..a2fccec948fe109499804f2718e09a62a630bc38 100644
--- a/components/proximity_auth/webui/proximity_auth_webui_handler.cc
+++ b/components/proximity_auth/webui/proximity_auth_webui_handler.cc
@@ -415,6 +415,8 @@ void ProximityAuthWebUIHandler::OnReachablePhonesFound(
}
void ProximityAuthWebUIHandler::GetLocalState(const base::ListValue* args) {
+ std::unique_ptr<base::Value> truncated_local_device_id =
+ GetTruncatedLocalDeviceId();
std::unique_ptr<base::DictionaryValue> enrollment_state =
GetEnrollmentStateDictionary();
std::unique_ptr<base::DictionaryValue> device_sync_state =
@@ -422,13 +424,28 @@ void ProximityAuthWebUIHandler::GetLocalState(const base::ListValue* args) {
std::unique_ptr<base::ListValue> synced_devices = GetRemoteDevicesList();
PA_LOG(INFO) << "==== Got Local State ====\n"
- << "Enrollment State: \n"
+ << "Device ID (truncated): " << *truncated_local_device_id
+ << "\nEnrollment State: \n"
<< *enrollment_state << "Device Sync State: \n"
<< *device_sync_state << "Unlock Keys: \n"
<< *synced_devices;
- web_ui()->CallJavascriptFunctionUnsafe("LocalStateInterface.onGotLocalState",
- *enrollment_state, *device_sync_state,
- *synced_devices);
+ web_ui()->CallJavascriptFunctionUnsafe(
+ "LocalStateInterface.onGotLocalState", *truncated_local_device_id,
+ *enrollment_state, *device_sync_state, *synced_devices);
+}
+
+std::unique_ptr<base::Value>
+ProximityAuthWebUIHandler::GetTruncatedLocalDeviceId() {
+ std::string local_public_key =
+ proximity_auth_client_->GetLocalDevicePublicKey();
+
+ std::string device_id;
+ base::Base64UrlEncode(local_public_key,
+ base::Base64UrlEncodePolicy::INCLUDE_PADDING,
+ &device_id);
+
+ return base::MakeUnique<base::Value>(
+ cryptauth::RemoteDevice::TruncateDeviceIdForLogs(device_id));
}
std::unique_ptr<base::DictionaryValue>

Powered by Google App Engine
This is Rietveld 408576698