tests(common): Update snapshots to include forwarder.

Author: kaylendog

crates/matrix-sdk-common/src/deserialized_responses.rs

@@ -1686,6 +1686,8 @@ mod tests {
                         "encryption_info": {
                             "sender": "@sender:example.com",
                             "sender_device": null,
+                            "forwarder": null,
+                            "forwarder_device": null,
                             "algorithm_info": {
                                 "MegolmV1AesSha2": {
                                     "curve25519_key": "xxx",

crates/matrix-sdk-common/src/snapshots/matrix_sdk_common__deserialized_responses__tests__encryption_info_migration.snap

@@ -5,6 +5,8 @@ expression: deserialized
 {
   "sender": "@alice:localhost",
   "sender_device": "ABCDEFGH",
+  "forwarder": null,
+  "forwarder_device": null,
   "algorithm_info": {
     "MegolmV1AesSha2": {
       "curve25519_key": "curvecurvecurve",

crates/matrix-sdk-common/src/snapshots/snapshot_test_encryption_info.snap

@@ -5,6 +5,8 @@ expression: info
 {
   "sender": "@alice:localhost",
   "sender_device": "ABCDEFGH",
+  "forwarder": null,
+  "forwarder_device": null,
   "algorithm_info": {
     "MegolmV1AesSha2": {
       "curve25519_key": "curvecurvecurve",

crates/matrix-sdk-common/src/snapshots/snapshot_test_sync_timeline_event.snap

@@ -16,6 +16,8 @@ expression: "serde_json::to_value(&room_event).unwrap()"
             "session_id": "mysessionid112"
           }
         },
+        "forwarder": null,
+        "forwarder_device": null,
         "sender": "@sender:example.com",
         "sender_device": "ABCDEFGHIJ",
         "verification_state": "Verified"

crates/matrix-sdk-crypto/src/machine/mod.rs

@@ -2018,19 +2018,25 @@ impl OlmMachine {
         let (verification_state, device_id) =
             self.get_room_event_verification_state(session, sender).await?;
 
-        let sender = sender.to_owned();
-
         Ok(Arc::new(EncryptionInfo {
-            sender,
-            sender_device: device_id,
+            sender: sender.to_owned(),
+            sender_device: device_id.clone(),
             forwarder: session.forwarder_data.as_ref().and_then(|data| data.user_id()),
             forwarder_device: session.forwarder_data.as_ref().and_then(|data| match data {
                 SenderData::SenderUnverified(known_sender_data)
                 | SenderData::SenderVerified(known_sender_data) => {
                     known_sender_data.device_id.clone()
                 }
-                // TODO: This should never happen.
-                _ => None,
+                _ => {
+                    // TODO: Should this return an error?
+                    warn!(
+                        sender_id = ?sender,
+                        device_id = ?device_id,
+                        session_id = session.session_id(),
+                        "Invalid sender verification state for forwarded session"
+                    );
+                    None
+                }
             }),
             algorithm_info: AlgorithmInfo::MegolmV1AesSha2 {
                 curve25519_key: session.sender_key().to_base64(),