Merge pull request #17 from bitwarden/anders/session-refreshed-event

Handle re-pair with known clients

Author: abergs

crates/bw-rat-client/src/clients/user_client.rs

@@ -78,6 +78,11 @@ pub enum UserClientEvent {
         /// Domain
         domain: String,
     },
+    /// A known/cached device reconnected — transport keys refreshed, no re-verification needed
+    SessionRefreshed {
+        /// The remote device's identity fingerprint
+        fingerprint: IdentityFingerprint,
+    },
     /// Client disconnected
     ClientDisconnected {},
     /// An error occurred
@@ -407,6 +412,13 @@ impl UserClient {
             self.session_store.cache_session(source)?;
             self.session_store
                 .save_transport_state(&source, transport)?;
+
+            event_tx
+                .send(UserClientEvent::SessionRefreshed {
+                    fingerprint: source,
+                })
+                .await
+                .ok();
         } else if is_psk_connection {
             // PSK connection: trust established via pre-shared key, no verification needed
             self.transports.insert(source, transport.clone());

crates/bw-remote/src/command/listen.rs

@@ -462,6 +462,10 @@ async fn run_event_loop(
                                 // Update session panel with pending label
                                 app.set_session_panel(session_info_messages(sessions, Some("New session  (awaiting connection)")));
                             }
+                            UserClientEvent::SessionRefreshed { .. } => {
+                                // Known device reconnected — clear pending label
+                                app.set_session_panel(session_info_messages(sessions, None));
+                            }
                             _ => {}
                         }
                     }

crates/bw-remote/src/command/util.rs

@@ -215,6 +215,7 @@ pub fn format_connect_event(event: &RemoteClientEvent) -> Option<Message> {
 ///
 /// Returns `None` for events handled structurally by the caller
 /// (e.g., `Listening`, `CredentialRequest`, `HandshakeFingerprint`).
+#[allow(clippy::string_slice)]
 pub fn format_listen_event(event: &UserClientEvent) -> Option<Message> {
     match event {
         UserClientEvent::Listening {} => None,
@@ -315,6 +316,21 @@ pub fn format_listen_event(event: &UserClientEvent) -> Option<Message> {
             ],
         )),
 
+        UserClientEvent::SessionRefreshed { fingerprint } => {
+            let fp_hex = hex::encode(fingerprint.0);
+            let short = &fp_hex[..12.min(fp_hex.len())];
+            Some(Message::rich(
+                MessageKind::Success,
+                vec![
+                    Span::styled(
+                        "Known client re-paired and connected — transport keys refreshed: ",
+                        text(),
+                    ),
+                    Span::styled(short.to_string(), val_style()),
+                ],
+            ))
+        }
+
         UserClientEvent::ClientDisconnected {} => {
             Some(Message::new(MessageKind::Info, "Client disconnected"))
         }