refactor: remove MlsCredentialExt trait

Author: SimonThormeyer

keystore/src/connection/platform/wasm/migrations/v6/v5_entities/credential.rs

@@ -1,10 +1,9 @@
-use wasm_bindgen::JsValue;
 use web_time::SystemTime;
 
 use crate::{
     CryptoKeystoreError, CryptoKeystoreResult, MissingKeyErrorKind,
-    connection::{DatabaseConnection, KeystoreDatabaseConnection, storage::WasmStorageTransaction},
-    entities::{Entity, EntityBase, EntityFindParams, EntityTransactionExt, MlsCredentialExt, StringEntityId},
+    connection::{DatabaseConnection, KeystoreDatabaseConnection},
+    entities::{Entity, EntityBase, EntityFindParams, EntityTransactionExt, StringEntityId},
     migrations::V5Credential,
 };
 
@@ -78,41 +77,3 @@ impl Entity for V5Credential {
         Ok(())
     }
 }
-
-#[async_trait::async_trait(?Send)]
-impl MlsCredentialExt for V5Credential {
-    async fn delete_by_credential(
-        transaction: &WasmStorageTransaction<'_>,
-        credential: Vec<u8>,
-    ) -> CryptoKeystoreResult<()> {
-        match transaction {
-            WasmStorageTransaction::Persistent {
-                tx: transaction,
-                cipher,
-            } => {
-                let store = transaction.object_store(Self::COLLECTION_NAME)?;
-                let store_index = store.index("credential")?;
-                let credential_js: wasm_bindgen::JsValue = js_sys::Uint8Array::from(&credential[..]).into();
-                let request = store_index.get(credential_js)?;
-                let Some(entity_raw) = request.await? else {
-                    let reason = "'credential' in 'mls_credentials' collection";
-                    let value = hex::encode(&credential);
-                    return Err(CryptoKeystoreError::NotFound(reason, value));
-                };
-
-                let mut credential = serde_wasm_bindgen::from_value::<V5Credential>(entity_raw)?;
-                credential.decrypt(cipher)?;
-
-                let id = JsValue::from(credential.id.clone());
-                let request = store.delete(id)?;
-                request.await?;
-            }
-            WasmStorageTransaction::InMemory { .. } => {
-                // current table model does not fit in a hashmap (no more primary key)
-                // memory keystore is never used in prod
-            }
-        }
-
-        Ok(())
-    }
-}

keystore/src/connection/platform/wasm/migrations/v7/v6_entities.rs

@@ -1,10 +1,9 @@
-use wasm_bindgen::JsValue;
 use web_time::SystemTime;
 
 use crate::{
     CryptoKeystoreError, CryptoKeystoreResult, MissingKeyErrorKind,
-    connection::{DatabaseConnection, KeystoreDatabaseConnection, storage::WasmStorageTransaction},
-    entities::{Entity, EntityBase, EntityFindParams, EntityTransactionExt, MlsCredentialExt, StringEntityId},
+    connection::{DatabaseConnection, KeystoreDatabaseConnection},
+    entities::{Entity, EntityBase, EntityFindParams, EntityTransactionExt, StringEntityId},
     migrations::V6Credential,
 };
 
@@ -78,41 +77,3 @@ impl Entity for V6Credential {
         Ok(())
     }
 }
-
-#[async_trait::async_trait(?Send)]
-impl MlsCredentialExt for V6Credential {
-    async fn delete_by_credential(
-        transaction: &WasmStorageTransaction<'_>,
-        credential: Vec<u8>,
-    ) -> CryptoKeystoreResult<()> {
-        match transaction {
-            WasmStorageTransaction::Persistent {
-                tx: transaction,
-                cipher,
-            } => {
-                let store = transaction.object_store(Self::COLLECTION_NAME)?;
-                let store_index = store.index("credential")?;
-                let credential_js: wasm_bindgen::JsValue = js_sys::Uint8Array::from(&credential[..]).into();
-                let request = store_index.get(credential_js)?;
-                let Some(entity_raw) = request.await? else {
-                    let reason = "'credential' in 'mls_credentials' collection";
-                    let value = hex::encode(&credential);
-                    return Err(CryptoKeystoreError::NotFound(reason, value));
-                };
-
-                let mut credential = serde_wasm_bindgen::from_value::<V6Credential>(entity_raw)?;
-                credential.decrypt(cipher)?;
-
-                let id = JsValue::from(credential.session_id.clone());
-                let request = store.delete(id)?;
-                request.await?;
-            }
-            WasmStorageTransaction::InMemory { .. } => {
-                // current table model does not fit in a hashmap (no more primary key)
-                // memory keystore is never used in prod
-            }
-        }
-
-        Ok(())
-    }
-}

keystore/src/entities/mls.rs

@@ -143,12 +143,6 @@ pub struct StoredCredential {
     pub private_key: Vec<u8>,
 }
 
-#[cfg_attr(target_family = "wasm", async_trait::async_trait(?Send))]
-#[cfg_attr(not(target_family = "wasm"), async_trait::async_trait)]
-pub trait MlsCredentialExt: Entity {
-    async fn delete_by_credential(tx: &TransactionWrapper<'_>, credential: Vec<u8>) -> CryptoKeystoreResult<()>;
-}
-
 /// Entity representing a persisted `HpkePrivateKey` (related to LeafNode Private keys that the client is aware of)
 #[derive(core_crypto_macros::Debug, Clone, PartialEq, Eq, Zeroize, serde::Serialize, serde::Deserialize)]
 #[zeroize(drop)]

keystore/src/entities/platform/generic/mls/credential.rs

@@ -9,8 +9,8 @@ use crate::{
     CryptoKeystoreError, CryptoKeystoreResult, MissingKeyErrorKind,
     connection::{DatabaseConnection, KeystoreDatabaseConnection, TransactionWrapper},
     entities::{
-        Entity, EntityBase, EntityFindParams, EntityIdStringExt as _, EntityTransactionExt, MlsCredentialExt,
-        StoredCredential, StringEntityId,
+        Entity, EntityBase, EntityFindParams, EntityIdStringExt as _, EntityTransactionExt, StoredCredential,
+        StringEntityId,
     },
 };