From 70a3fa31fbe909ae1db77f662d02d407cae47cfe Mon Sep 17 00:00:00 2001
From: Hatter Jiang <jht5945@gmail.com>
Date: Sat, 3 Jul 2021 11:36:28 +0800
Subject: [PATCH] chore: add app id

---
 src/fido.rs     | 7 ++++---
 src/register.rs | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/fido.rs b/src/fido.rs
index ed09c06..9916f18 100644
--- a/src/fido.rs
+++ b/src/fido.rs
@@ -51,7 +51,8 @@ impl fmt::Display for U2FDeviceInfo {
 
 #[derive(Clone, Debug, Serialize, Deserialize)]
 pub struct U2fRegistrationData {
-    pub u2f_device_info: U2FDeviceInfo,
+    pub app_id: String,
+    pub device_info: U2FDeviceInfo,
     pub device_name: Option<String>,
     pub attestation_cert_pem: Option<String>,
     pub pub_key: String,
@@ -65,8 +66,8 @@ impl U2fRegistrationData {
             Err(e) => return simple_error!("Parse registration data failed: {}", e),
         };
         Ok(Self {
-            // register_result,
-            u2f_device_info: U2FDeviceInfo::from(&register_result),
+            app_id: app_id.to_string(),
+            device_info: U2FDeviceInfo::from(&register_result),
             device_name: rr.device_name,
             attestation_cert_pem: rr.attestation_cert.map(|c| {
                 to_pem(&c, "CERTIFICATE", 64)
diff --git a/src/register.rs b/src/register.rs
index ff8fe3f..0ead80a 100644
--- a/src/register.rs
+++ b/src/register.rs
@@ -67,7 +67,7 @@ impl Command for CommandImpl {
                 if json_output {
                     success!("{}", serde_json::to_string_pretty(&data).unwrap());
                 } else {
-                    success!("Device info: {}", data.u2f_device_info);
+                    success!("Device info: {}", data.device_info);
                     if let Some(cert) = data.attestation_cert_pem {
                         success!("Certificate: {}", cert);
                     }