chris/ruwuma
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

events: Use TransactionId for secret request IDs

Browse Source
This commit is contained in:
Jonas Platte 2022-01-23 17:21:53 +01:00
parent 9aa748459a
commit 46d2957c29
No known key found for this signature in database
GPG Key ID: 7D261D771D915378
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ruma-events/src/room_key_request.rs
View File

@ -3,7 +3,7 @@
//! [`m.room_key_request`]: https://spec.matrix.org/v1.1/client-server-api/#mroom_key_request //! [`m.room_key_request`]: https://spec.matrix.org/v1.1/client-server-api/#mroom_key_request
use ruma_events_macros::EventContent; use ruma_events_macros::EventContent;
use ruma_identifiers::{DeviceId, EventEncryptionAlgorithm, RoomId}; use ruma_identifiers::{DeviceId, EventEncryptionAlgorithm, RoomId, TransactionId};
use ruma_serde::StringEnum; use ruma_serde::StringEnum;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -29,7 +29,7 @@ pub struct ToDeviceRoomKeyRequestEventContent {
/// ///
/// If the key is requested multiple times, it should be reused. It should also reused /// If the key is requested multiple times, it should be reused. It should also reused
/// in order to cancel a request. /// in order to cancel a request.
pub request_id: String, pub request_id: Box<TransactionId>,
} }
impl ToDeviceRoomKeyRequestEventContent { impl ToDeviceRoomKeyRequestEventContent {
@ -39,7 +39,7 @@ impl ToDeviceRoomKeyRequestEventContent {
action: Action, action: Action,
body: Option<RequestedKeyInfo>, body: Option<RequestedKeyInfo>,
requesting_device_id: Box<DeviceId>, requesting_device_id: Box<DeviceId>,
request_id: String, request_id: Box<TransactionId>,
) -> Self { ) -> Self {
Self { action, body, requesting_device_id, request_id } Self { action, body, requesting_device_id, request_id }
} }

6
crates/ruma-events/src/secret/request.rs
View File

@ -5,7 +5,7 @@
use std::convert::TryFrom; use std::convert::TryFrom;
use ruma_events_macros::EventContent; use ruma_events_macros::EventContent;
use ruma_identifiers::DeviceId; use ruma_identifiers::{DeviceId, TransactionId};
use ruma_serde::StringEnum; use ruma_serde::StringEnum;
use serde::{ser::SerializeStruct, Deserialize, Serialize}; use serde::{ser::SerializeStruct, Deserialize, Serialize};
@ -32,7 +32,7 @@ pub struct ToDeviceSecretRequestEventContent {
/// ///
/// If the secret is requested from multiple devices at the same time, the same ID may be used /// If the secret is requested from multiple devices at the same time, the same ID may be used
/// for every target. The same ID is also used in order to cancel a previous request. /// for every target. The same ID is also used in order to cancel a previous request.
pub request_id: String, pub request_id: Box<TransactionId>,
} }
impl ToDeviceSecretRequestEventContent { impl ToDeviceSecretRequestEventContent {
@ -41,7 +41,7 @@ impl ToDeviceSecretRequestEventContent {
pub fn new( pub fn new(
action: RequestAction, action: RequestAction,
requesting_device_id: Box<DeviceId>, requesting_device_id: Box<DeviceId>,
request_id: String, request_id: Box<TransactionId>,
) -> Self { ) -> Self {
Self { action, requesting_device_id, request_id } Self { action, requesting_device_id, request_id }
} }

4
crates/ruma-events/src/secret/send.rs
View File

@ -16,7 +16,7 @@ use serde::{Deserialize, Serialize};
#[ruma_event(type = "m.secret.send", kind = ToDevice)] #[ruma_event(type = "m.secret.send", kind = ToDevice)]
pub struct ToDeviceSecretSendEventContent { pub struct ToDeviceSecretSendEventContent {
/// The ID of the request that this is a response to. /// The ID of the request that this is a response to.
pub request_id: String, pub request_id: Box<TransactionId>,
/// The contents of the secret. /// The contents of the secret.
pub secret: String, pub secret: String,
@ -24,7 +24,7 @@ pub struct ToDeviceSecretSendEventContent {
impl ToDeviceSecretSendEventContent { impl ToDeviceSecretSendEventContent {
/// Creates a new `SecretSendEventContent` with the given request ID and secret. /// Creates a new `SecretSendEventContent` with the given request ID and secret.
pub fn new(request_id: String, secret: String) -> Self { pub fn new(request_id: Box<TransactionId>, secret: String) -> Self {
Self { request_id, secret } Self { request_id, secret }
} }
} }