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

server-util: make destination parameter of XMatrix::new mandatory

Browse Source
This commit is contained in:
Matthias Ahouansou 2024-05-29 15:38:52 +01:00
parent d91e6d7e63
commit a8025de761
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
crates/ruma-server-util/CHANGELOG.md
View File

@ -1,5 +1,10 @@
# [unreleased] # [unreleased]
Breaking changes:
- The `XMatrix::new` method now takes `OwnedServerName` instead of `Option<OwnedServerName>`
for the destination, since servers must always set the destination.
# 0.3.0 # 0.3.0
Breaking changes: Breaking changes:

8
crates/ruma-server-util/src/authorization.rs
View File

@ -31,11 +31,11 @@ impl XMatrix {
/// Construct a new X-Matrix Authorization header. /// Construct a new X-Matrix Authorization header.
pub fn new( pub fn new(
origin: OwnedServerName, origin: OwnedServerName,
destination: Option<OwnedServerName>, destination: OwnedServerName,
key: OwnedServerSigningKeyId, key: OwnedServerSigningKeyId,
sig: String, sig: String,
) -> Self { ) -> Self {
Self { origin, destination, key, sig } Self { origin, destination: Some(destination), key, sig }
} }
} }
@ -259,7 +259,7 @@ mod tests {
assert_eq!(credentials.key, key); assert_eq!(credentials.key, key);
assert_eq!(credentials.sig, sig); assert_eq!(credentials.sig, sig);
let credentials = XMatrix::new(origin, None, key, sig); let credentials = XMatrix { origin, destination: None, key, sig };
assert_eq!(credentials.encode(), header); assert_eq!(credentials.encode(), header);
} }
@ -277,7 +277,7 @@ mod tests {
assert_eq!(credentials.key, key); assert_eq!(credentials.key, key);
assert_eq!(credentials.sig, sig); assert_eq!(credentials.sig, sig);
let credentials = XMatrix::new(origin, Some(destination), key, sig); let credentials = XMatrix::new(origin, destination, key, sig);
assert_eq!(credentials.encode(), header); assert_eq!(credentials.encode(), header);
} }