diff --git a/src/DeviceVerificationFlow.cpp b/src/DeviceVerificationFlow.cpp
index 12e31c04..5bbe2a71 100644
--- a/src/DeviceVerificationFlow.cpp
+++ b/src/DeviceVerificationFlow.cpp
@@ -1,9 +1,10 @@
#include "DeviceVerificationFlow.h"
-#include <MatrixClient.h>
+#include "Logging.h"
#include <QDateTime>
#include <QDebug> // only for debugging
#include <QTimer>
+#include <iostream> // only for debugging
static constexpr int TIMEOUT = 2 * 60 * 1000; // 2 minutes
@@ -18,11 +19,42 @@ DeviceVerificationFlow::DeviceVerificationFlow(QObject *)
timeout->start(TIMEOUT);
}
-std::string
-DeviceVerificationFlow::generate_txn_id()
+QString
+DeviceVerificationFlow::getUserId()
{
- this->transaction_id = mtx::client::utils::random_token(32, false);
- return this->transaction_id;
+ toClient = mtx::identifiers::parse<mtx::identifiers::User>((this->userId).toStdString());
+ std::cout << http::client()->device_id() << std::endl;
+ return this->userId;
+}
+
+QString
+DeviceVerificationFlow::getDeviceId()
+{
+ return this->deviceId;
+}
+
+DeviceVerificationFlow::Method
+DeviceVerificationFlow::getMethod()
+{
+ return this->method;
+}
+
+void
+DeviceVerificationFlow::setUserId(QString userID)
+{
+ this->userId = userID;
+}
+
+void
+DeviceVerificationFlow::setDeviceId(QString deviceID)
+{
+ this->deviceId = deviceID;
+}
+
+void
+DeviceVerificationFlow::setMethod(DeviceVerificationFlow::Method method_)
+{
+ this->method = method_;
}
//! accepts a verification
@@ -34,32 +66,53 @@ DeviceVerificationFlow::acceptVerificationRequest()
req.transaction_id = this->transaction_id;
req.method = mtx::events::msg::VerificationMethods::SASv1;
- req.key_agreement_protocol = "";
- req.hash = "";
+ req.key_agreement_protocol = "curve25519";
+ req.hash = "sha256";
req.message_authentication_code = "";
// req.short_authentication_string = "";
req.commitment = "";
- emit verificationRequestAccepted(rand() % 2 ? Emoji : Decimal);
+ emit this->verificationRequestAccepted(this->method);
- // Yet to add send to_device message
+ body[this->toClient][this->deviceId.toStdString()] = req;
+
+ http::client()
+ ->send_to_device<mtx::events::msg::KeyVerificationAccept,
+ mtx::events::EventType::KeyVerificationAccept>(
+ "m.key.verification.accept", body, [](mtx::http::RequestErr err) {
+ if (err)
+ nhlog::net()->warn("failed to accept verification request: {} {}",
+ err->matrix_error.error,
+ static_cast<int>(err->status_code));
+ // emit this->verificationRequestAccepted(rand() % 2 ? Emoji : Decimal);
+ });
}
//! starts the verification flow
void
DeviceVerificationFlow::startVerificationRequest()
{
- mtx::requests::ToDeviceMessages<mtx::events::msg::KeyVerificationAccept> body;
- mtx::events::msg::KeyVerificationAccept req;
-
- // req.from_device = "";
- req.transaction_id = this->transaction_id;
- req.method = mtx::events::msg::VerificationMethods::SASv1;
- req.key_agreement_protocol = {};
- // req.hashes = {};
- req.message_authentication_code = {};
+ mtx::requests::ToDeviceMessages<mtx::events::msg::KeyVerificationStart> body;
+ mtx::events::msg::KeyVerificationStart req;
+
+ req.from_device = http::client()->device_id();
+ req.transaction_id = this->transaction_id;
+ req.method = mtx::events::msg::VerificationMethods::SASv1;
+ req.key_agreement_protocols = {};
+ req.hashes = {};
+ req.message_authentication_codes = {};
// req.short_authentication_string = "";
- // Yet to add send to_device message
+ body[this->toClient][this->deviceId.toStdString()] = req;
+
+ http::client()
+ ->send_to_device<mtx::events::msg::KeyVerificationStart,
+ mtx::events::EventType::KeyVerificationStart>(
+ "m.key.verification.start", body, [](mtx::http::RequestErr err) {
+ if (err)
+ nhlog::net()->warn("failed to start verification request: {} {}",
+ err->matrix_error.error,
+ static_cast<int>(err->status_code));
+ });
}
//! sends a verification request
void
@@ -70,13 +123,25 @@ DeviceVerificationFlow::sendVerificationRequest()
mtx::requests::ToDeviceMessages<mtx::events::msg::KeyVerificationRequest> body;
mtx::events::msg::KeyVerificationRequest req;
- req.from_device = "";
- req.transaction_id = generate_txn_id();
+ this->transaction_id = http::client()->generate_txn_id();
+
+ req.from_device = http::client()->device_id();
+ req.transaction_id = this->transaction_id;
req.methods.resize(1);
req.methods[0] = mtx::events::msg::VerificationMethods::SASv1;
req.timestamp = (uint64_t)CurrentTime.toTime_t();
- // Yet to add send to_device message
+ body[this->toClient][this->deviceId.toStdString()] = req;
+
+ http::client()
+ ->send_to_device<mtx::events::msg::KeyVerificationRequest,
+ mtx::events::EventType::KeyVerificationRequest>(
+ "m.key.verification.request", body, [](mtx::http::RequestErr err) {
+ if (err)
+ nhlog::net()->warn("failed to send verification request: {} {}",
+ err->matrix_error.error,
+ static_cast<int>(err->status_code));
+ });
}
//! cancels a verification flow
void
@@ -86,12 +151,22 @@ DeviceVerificationFlow::cancelVerification()
mtx::events::msg::KeyVerificationCancel req;
req.transaction_id = this->transaction_id;
- req.reason = "";
- req.code = "";
-
- this->deleteLater();
-
- // Yet to add send to_device message
+ // TODO: Add Proper Error Messages and Code
+ req.reason = "Device Verification Cancelled";
+ req.code = "400";
+
+ body[this->toClient][deviceId.toStdString()] = req;
+
+ http::client()
+ ->send_to_device<mtx::events::msg::KeyVerificationCancel,
+ mtx::events::EventType::KeyVerificationCancel>(
+ "m.key.verification.cancel", body, [this](mtx::http::RequestErr err) {
+ if (err)
+ nhlog::net()->warn("failed to cancel verification request: {} {}",
+ err->matrix_error.error,
+ static_cast<int>(err->status_code));
+ this->deleteLater();
+ });
}
//! Completes the verification flow
void
|
