From d0f3f1e657e08e6ca33f88481fd1ecaecb510029 Mon Sep 17 00:00:00 2001
From: Florian Duros <florianduros@element.io>
Date: Tue, 6 Jun 2023 16:25:17 +0200
Subject: [PATCH] Review fixes

---
 .../matrix-sdk-crypto-js/src/identities.rs    | 38 ++++++++-----------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/bindings/matrix-sdk-crypto-js/src/identities.rs b/bindings/matrix-sdk-crypto-js/src/identities.rs
index cd9baf9ed..a8f74a0f1 100644
--- a/bindings/matrix-sdk-crypto-js/src/identities.rs
+++ b/bindings/matrix-sdk-crypto-js/src/identities.rs
@@ -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)?)
     }
 }