Connection::Private::assembleEncryptedContent()

What was partially factored out before into encryptSessionKeyEvent()
is now the complete algorithm converting any event json into encrypted
content.

3 files changed, 27 insertions, 32 deletions

diff --git a/lib/connection.cpp b/lib/connection.cpp
index fbe365de..19fc484a 100644
--- a/lib/connection.cpp
+++ b/lib/connection.cpp
@@ -371,9 +371,9 @@ public:
                           const OneTimeKeys &oneTimeKeyObject);
     QString curveKeyForUserDevice(const QString& userId,
                                   const QString& device) const;
-    QJsonObject encryptSessionKeyEvent(QJsonObject payloadJson,
-                                       const QString& targetUserId,
-                                       const QString& targetDeviceId) const;
+    QJsonObject assembleEncryptedContent(QJsonObject payloadJson,
+                                         const QString& targetUserId,
+                                         const QString& targetDeviceId) const;
 #endif
 
     void saveAccessTokenToKeychain() const
@@ -2364,10 +2364,16 @@ bool Connection::Private::createOlmSession(const QString& targetUserId,
     return true;
 }
 
-QJsonObject Connection::Private::encryptSessionKeyEvent(
+QJsonObject Connection::Private::assembleEncryptedContent(
     QJsonObject payloadJson, const QString& targetUserId,
     const QString& targetDeviceId) const
 {
+    payloadJson.insert(SenderKeyL, data->userId());
+//    eventJson.insert("sender_device"_ls, data->deviceId());
+    payloadJson.insert("keys"_ls,
+                       QJsonObject{
+                           { Ed25519Key,
+                             QString(olmAccount->identityKeys().ed25519) } });
     payloadJson.insert("recipient"_ls, targetUserId);
     payloadJson.insert(
         "recipient_keys"_ls,
@@ -2381,7 +2387,6 @@ QJsonObject Connection::Private::encryptSessionKeyEvent(
           QJsonObject { { "type"_ls, type },
                         { "body"_ls, QString(cipherText) } } }
     };
-
     return EncryptedEvent(encrypted, olmAccount->identityKeys().curve25519)
         .contentJson();
 }
@@ -2404,18 +2409,8 @@ void Connection::sendSessionKeyToDevices(
     if (hash.isEmpty())
         return;
 
-    auto keyEventJson = RoomKeyEvent(MegolmV1AesSha2AlgoKey, roomId, sessionId,
-                                     sessionKey, userId())
-                            .fullJson();
-    keyEventJson.insert(SenderKeyL, userId());
-    keyEventJson.insert("sender_device"_ls, deviceId());
-    keyEventJson.insert(
-        "keys"_ls,
-        QJsonObject {
-            { Ed25519Key, QString(olmAccount()->identityKeys().ed25519) } });
-
     auto job = callApi<ClaimKeysJob>(hash);
-    connect(job, &BaseJob::success, this, [job, this, roomId, sessionId, keyEventJson, devices, index] {
+    connect(job, &BaseJob::success, this, [job, this, roomId, sessionId, sessionKey, devices, index] {
         QHash<QString, QHash<QString, QJsonObject>> usersToDevicesToContent;
         for (const auto oneTimeKeys = job->oneTimeKeys();
              const auto& [targetUserId, targetDeviceId] :
@@ -2429,10 +2424,14 @@ void Connection::sendSessionKeyToDevices(
             // Noisy but nice for debugging
 //            qDebug(E2EE) << "Creating the payload for" << targetUserId
 //                         << targetDeviceId << sessionId << sessionKey.toHex();
+            const auto keyEventJson = RoomKeyEvent(MegolmV1AesSha2AlgoKey,
+                                                   roomId, sessionId, sessionKey)
+                                          .fullJson();
+
             usersToDevicesToContent[targetUserId][targetDeviceId] =
-                d->encryptSessionKeyEvent(keyEventJson, targetUserId,
+                d->assembleEncryptedContent(keyEventJson, targetUserId,
                                           targetDeviceId);
-        }
+            }
         if (!usersToDevicesToContent.empty()) {
             sendToDevices(EncryptedEvent::TypeId, usersToDevicesToContent);
             QVector<std::tuple<QString, QString, QString>> receivedDevices;
diff --git a/lib/events/roomkeyevent.cpp b/lib/events/roomkeyevent.cpp
index 68962950..3a8601d1 100644
--- a/lib/events/roomkeyevent.cpp
+++ b/lib/events/roomkeyevent.cpp
@@ -5,21 +5,18 @@
 
 using namespace Quotient;
 
-RoomKeyEvent::RoomKeyEvent(const QJsonObject &obj) : Event(typeId(), obj)
+RoomKeyEvent::RoomKeyEvent(const QJsonObject &obj) : Event(TypeId, obj)
 {
     if (roomId().isEmpty())
         qCWarning(E2EE) << "Room key event has empty room id";
 }
 
-RoomKeyEvent::RoomKeyEvent(const QString& algorithm, const QString& roomId, const QString& sessionId, const QString& sessionKey, const QString& senderId)
-    : Event(typeId(), {
-        {"content", QJsonObject{
-            {"algorithm", algorithm},
-            {"room_id", roomId},
-            {"session_id", sessionId},
-            {"session_key", sessionKey},
-        }},
-        {"sender", senderId},
-        {"type", "m.room_key"},
-    })
+RoomKeyEvent::RoomKeyEvent(const QString& algorithm, const QString& roomId,
+                           const QString& sessionId, const QString& sessionKey)
+    : Event(TypeId, basicJson(TypeId, {
+                                          { "algorithm", algorithm },
+                                          { "room_id", roomId },
+                                          { "session_id", sessionId },
+                                          { "session_key", sessionKey },
+                                      }))
 {}
diff --git a/lib/events/roomkeyevent.h b/lib/events/roomkeyevent.h
index 9eb2854b..0dfdf383 100644
--- a/lib/events/roomkeyevent.h
+++ b/lib/events/roomkeyevent.h
@@ -13,8 +13,7 @@ public:
 
     explicit RoomKeyEvent(const QJsonObject& obj);
     explicit RoomKeyEvent(const QString& algorithm, const QString& roomId,
-                          const QString& sessionId, const QString& sessionKey,
-                          const QString& senderId);
+                          const QString& sessionId, const QString& sessionKey);
 
     QUO_CONTENT_GETTER(QString, algorithm)
     QUO_CONTENT_GETTER(QString, roomId)