Durable keys

keyhive_core/src/ability.rs

@@ -6,6 +6,7 @@ use crate::{
     crypto::signer::async_signer::AsyncSigner,
     listener::{membership::MembershipListener, no_listener::NoListener},
     principal::document::Document,
+    store::secret_key::traits::ShareSecretStore,
 };
 use derive_where::derive_where;
 use std::{cell::RefCell, rc::Rc};
@@ -15,16 +16,19 @@ use std::{cell::RefCell, rc::Rc};
 pub struct Ability<
     'a,
     S: AsyncSigner,
+    K: ShareSecretStore,
     T: ContentRef = [u8; 32],
-    L: MembershipListener<S, T> = NoListener,
+    L: MembershipListener<S, K, T> = NoListener,
 > {
-    pub(crate) doc: &'a Rc<RefCell<Document<S, T, L>>>,
+    pub(crate) doc: &'a Rc<RefCell<Document<S, K, T, L>>>,
     pub(crate) can: Access,
 }
 
-impl<S: AsyncSigner, T: ContentRef, L: MembershipListener<S, T>> Ability<'_, S, T, L> {
+impl<S: AsyncSigner, K: ShareSecretStore, T: ContentRef, L: MembershipListener<S, K, T>>
+    Ability<'_, S, K, T, L>
+{
     /// Getter for the referenced [`Document`].
-    pub fn doc(&self) -> &Rc<RefCell<Document<S, T, L>>> {
+    pub fn doc(&self) -> &Rc<RefCell<Document<S, K, T, L>>> {
         self.doc
     }
 

keyhive_core/src/archive.rs

@@ -4,7 +4,6 @@ use crate::{
     content::reference::ContentRef,
     crypto::digest::Digest,
     principal::{
-        active::archive::ActiveArchive,
         document::{archive::DocumentArchive, id::DocumentId},
         group::{id::GroupId, membership_operation::StaticMembershipOperation, GroupArchive},
         individual::{id::IndividualId, Individual},
@@ -16,7 +15,7 @@ use std::collections::HashMap;
 /// Serialized representation of [`Keyhive`][crate::keyhive::Keyhive].
 #[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Archive<T: ContentRef> {
-    pub(crate) active: ActiveArchive,
+    pub(crate) active: Individual,
     pub(crate) topsorted_ops: Vec<(
         Digest<StaticMembershipOperation<T>>,
         StaticMembershipOperation<T>,
@@ -29,6 +28,6 @@ pub struct Archive<T: ContentRef> {
 impl<T: ContentRef> Archive<T> {
     /// Getter for the user that the [`Archive`] is for.
     pub fn id(&self) -> IndividualId {
-        self.active.individual.id()
+        self.active.id()
     }
 }