matrix/authentication-service
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-authentication-service.git synced 2025-07-31 09:24:31 +03:00
Code Activity

Fix Device to ScopeToken conversion and test it

Browse Source
This commit is contained in:
Quentin Gliech
2023-04-21 17:20:33 +02:00
parent d34e01fc67
commit a55976eeeb
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
crates/data-model/src/compat/device.rs
View File

@ -40,9 +40,7 @@ impl Device {
#[must_use] #[must_use]
pub fn to_scope_token(&self) -> ScopeToken { pub fn to_scope_token(&self) -> ScopeToken {
// SAFETY: the inner id should only have valid scope characters // SAFETY: the inner id should only have valid scope characters
format!("{DEVICE_SCOPE_PREFIX}:{}", self.id) format!("{DEVICE_SCOPE_PREFIX}{}", self.id).parse().unwrap()
.parse()
.unwrap()
} }
/// Get the corresponding [`Device`] from a [`ScopeToken`] /// Get the corresponding [`Device`] from a [`ScopeToken`]
@ -81,3 +79,22 @@ impl TryFrom<String> for Device {
Ok(Self { id }) Ok(Self { id })
} }
} }
#[cfg(test)]
mod test {
use oauth2_types::scope::OPENID;
use crate::Device;
#[test]
fn test_device_id_to_from_scope_token() {
let device = Device::try_from("AABBCCDDEE".to_owned()).unwrap();
let scope_token = device.to_scope_token();
assert_eq!(
scope_token.as_str(),
"urn:matrix:org.matrix.msc2967.client:device:AABBCCDDEE"
);
assert_eq!(Device::from_scope_token(&scope_token), Some(device));
assert_eq!(Device::from_scope_token(&OPENID), None);
}
}