mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-11 17:33:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Review fixes

Browse Source
This commit is contained in:
Florian Duros
2023-06-06 16:25:17 +02:00
parent b4c440a5e7
commit d0f3f1e657
1 changed files with 15 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
bindings/matrix-sdk-crypto-js/src/identities.rs
View File

@@ -88,24 +88,24 @@ impl OwnUserIdentity {
/// Get the master key of the identity.
#[wasm_bindgen(getter, js_name = "masterKey")]
pub fn master_key(&self) -> Option<String> {
let master_key = self.inner.master_key().as_ref().to_owned();
serde_json::to_string(&master_key).ok()
pub fn master_key(&self) -> Result<String, JsError> {
let master_key = self.inner.master_key().as_ref();
Ok(serde_json::to_string(master_key)?)
}
/// Get the self-signing key of the identity.
#[wasm_bindgen(getter, js_name = "selfSigningKey")]
pub fn self_signing_key(&self) -> Option<String> {
let self_signing_key = self.inner.master_key().as_ref().to_owned();
serde_json::to_string(&self_signing_key).ok()
pub fn self_signing_key(&self) -> Result<String, JsError> {
let self_signing_key = self.inner.self_signing_key().as_ref();
Ok(serde_json::to_string(self_signing_key)?)
}
/// Get the user-signing key of the identity, this is only present for our
/// own user identity..
#[wasm_bindgen(getter, js_name = "userSigningKey")]
pub fn user_signing_key(&self) -> Option<String> {
let user_signing_key = self.inner.master_key().as_ref().to_owned();
serde_json::to_string(&user_signing_key).ok()
pub fn user_signing_key(&self) -> Result<String, JsError> {
let user_signing_key = self.inner.user_signing_key().as_ref();
Ok(serde_json::to_string(user_signing_key)?)
}
}
@@ -194,23 +194,15 @@ impl UserIdentity {
/// Get the master key of the identity.
#[wasm_bindgen(getter, js_name = "masterKey")]
pub fn master_key(&self) -> Option<String> {
let master_key = self.inner.master_key().as_ref().to_owned();
serde_json::to_string(&master_key).ok()
pub fn master_key(&self) -> Result<String, JsError> {
let master_key = self.inner.master_key().as_ref();
Ok(serde_json::to_string(master_key)?)
}
/// Get the self-signing key of the identity.
#[wasm_bindgen(getter, js_name = "selfSigningKey")]
pub fn self_signing_key(&self) -> Option<String> {
let self_signing_key = self.inner.master_key().as_ref().to_owned();
serde_json::to_string(&self_signing_key).ok()
}
/// Get the user-signing key of the identity, this is only present for our
/// own user identity..
#[wasm_bindgen(getter, js_name = "userSigningKey")]
pub fn user_signing_key(&self) -> Option<String> {
let user_signing_key = self.inner.master_key().as_ref().to_owned();
serde_json::to_string(&user_signing_key).ok()
pub fn self_signing_key(&self) -> Result<String, JsError> {
let self_signing_key = self.inner.self_signing_key().as_ref();
Ok(serde_json::to_string(self_signing_key)?)
}
}