feat: String based permission nodes

Cargo.toml

@@ -94,6 +94,7 @@ tracing = { version = "0.1" }
 either = "1"
 void = "1"
 indexmap = { version = "2.4.0", features = ["serde"] }
+enum_macro = { path = "./tools/enum_macro" }
 
 # ipfs dependency
 rust-ipfs = "0.14.0"

extensions/warp-ipfs/src/lib.rs

@@ -24,9 +24,7 @@ use store::protocols;
 use tokio_util::compat::TokioAsyncReadCompatExt;
 use tracing::{Instrument, Span};
 use uuid::Uuid;
-use warp::raygun::community::{
-    CommunityChannelPermission, CommunityPermission, CommunityRole, RoleId,
-};
+use warp::raygun::community::{CommunityRole, RoleId};
 
 use crate::config::{Bootstrap, DiscoveryType};
 use crate::store::discovery::Discovery;
@@ -1897,42 +1895,67 @@ impl RayGunCommunity for WarpIpfs {
             .edit_community_description(community_id, description)
             .await
     }
-    async fn grant_community_permission(
+    async fn grant_community_permission<T>(
         &mut self,
         community_id: Uuid,
-        permission: CommunityPermission,
+        permission: T,
         role_id: RoleId,
-    ) -> Result<(), Error> {
+    ) -> Result<(), Error>
+    where
+        T: ToString + Send,
+    {
         self.messaging_store()?
-            .grant_community_permission(community_id, permission, role_id)
+            .grant_community_permission(community_id, permission.to_string(), role_id)
             .await
     }
-    async fn revoke_community_permission(
+    async fn revoke_community_permission<T>(
         &mut self,
         community_id: Uuid,
-        permission: CommunityPermission,
+        permission: T,
         role_id: RoleId,
-    ) -> Result<(), Error> {
+    ) -> Result<(), Error>
+    where
+        T: ToString + Send,
+    {
         self.messaging_store()?
-            .revoke_community_permission(community_id, permission, role_id)
+            .revoke_community_permission(community_id, permission.to_string(), role_id)
             .await
     }
-    async fn grant_community_permission_for_all(
+    async fn grant_community_permission_for_all<T>(
         &mut self,
         community_id: Uuid,
-        permission: CommunityPermission,
-    ) -> Result<(), Error> {
+        permission: T,
+    ) -> Result<(), Error>
+    where
+        T: ToString + Send,
+    {
         self.messaging_store()?
-            .grant_community_permission_for_all(community_id, permission)
+            .grant_community_permission_for_all(community_id, permission.to_string())
             .await
     }
-    async fn revoke_community_permission_for_all(
+    async fn revoke_community_permission_for_all<T>(
         &mut self,
         community_id: Uuid,
-        permission: CommunityPermission,
-    ) -> Result<(), Error> {
+        permission: T,
+    ) -> Result<(), Error>
+    where
+        T: ToString + Send,
+    {
         self.messaging_store()?
-            .revoke_community_permission_for_all(community_id, permission)
+            .revoke_community_permission_for_all(community_id, permission.to_string())
+            .await
+    }
+    async fn has_community_permission<T>(
+        &mut self,
+        community_id: Uuid,
+        permission: T,
+        member: DID,
+    ) -> Result<bool, Error>
+    where
+        T: ToString + Send,
+    {
+        self.messaging_store()?
+            .has_community_permission(community_id, permission.to_string(), member)
             .await
     }
     async fn remove_community_member(
@@ -1965,46 +1988,95 @@ impl RayGunCommunity for WarpIpfs {
             .edit_community_channel_description(community_id, channel_id, description)
             .await
     }
-    async fn grant_community_channel_permission(
+    async fn grant_community_channel_permission<T>(
         &mut self,
         community_id: Uuid,
         channel_id: Uuid,
-        permission: CommunityChannelPermission,
+        permission: T,
         role_id: RoleId,
-    ) -> Result<(), Error> {
+    ) -> Result<(), Error>
+    where
+        T: ToString + Send,
+    {
         self.messaging_store()?
-            .grant_community_channel_permission(community_id, channel_id, permission, role_id)
+            .grant_community_channel_permission(
+                community_id,
+                channel_id,
+                permission.to_string(),
+                role_id,
+            )
             .await
     }
-    async fn revoke_community_channel_permission(
+    async fn revoke_community_channel_permission<T>(
         &mut self,
         community_id: Uuid,
         channel_id: Uuid,
-        permission: CommunityChannelPermission,
+        permission: T,
         role_id: RoleId,
-    ) -> Result<(), Error> {
+    ) -> Result<(), Error>
+    where
+        T: ToString + Send,
+    {
         self.messaging_store()?
-            .revoke_community_channel_permission(community_id, channel_id, permission, role_id)
+            .revoke_community_channel_permission(
+                community_id,
+                channel_id,
+                permission.to_string(),
+                role_id,
+            )
             .await
     }
-    async fn grant_community_channel_permission_for_all(
+    async fn grant_community_channel_permission_for_all<T>(
         &mut self,
         community_id: Uuid,
         channel_id: Uuid,
-        permission: CommunityChannelPermission,
-    ) -> Result<(), Error> {
+        permission: T,
+    ) -> Result<(), Error>
+    where
+        T: ToString + Send,
+    {
         self.messaging_store()?
-            .grant_community_channel_permission_for_all(community_id, channel_id, permission)
+            .grant_community_channel_permission_for_all(
+                community_id,
+                channel_id,
+                permission.to_string(),
+            )
             .await
     }
-    async fn revoke_community_channel_permission_for_all(
+    async fn revoke_community_channel_permission_for_all<T>(
         &mut self,
         community_id: Uuid,
         channel_id: Uuid,
-        permission: CommunityChannelPermission,
-    ) -> Result<(), Error> {
+        permission: T,
+    ) -> Result<(), Error>
+    where
+        T: ToString + Send,
+    {
+        self.messaging_store()?
+            .revoke_community_channel_permission_for_all(
+                community_id,
+                channel_id,
+                permission.to_string(),
+            )
+            .await
+    }
+    async fn has_community_channel_permission<T>(
+        &mut self,
+        community_id: Uuid,
+        channel_id: Uuid,
+        permission: T,
+        member: DID,
+    ) -> Result<bool, Error>
+    where
+        T: ToString + Send,
+    {
         self.messaging_store()?
-            .revoke_community_channel_permission_for_all(community_id, channel_id, permission)
+            .has_community_channel_permission(
+                community_id,
+                channel_id,
+                permission.to_string(),
+                member,
+            )
             .await
     }
 

extensions/warp-ipfs/src/store/community.rs

@@ -22,9 +22,8 @@ use warp::{
     error::Error,
     raygun::{
         community::{
-            Community, CommunityChannel, CommunityChannelPermission, CommunityChannelPermissions,
-            CommunityChannelType, CommunityInvite, CommunityPermission, CommunityPermissions,
-            CommunityRole, RoleId,
+            Community, CommunityChannel, CommunityChannelPermissions, CommunityChannelType,
+            CommunityInvite, CommunityPermission, CommunityPermissions, CommunityRole, RoleId,
         },
         Message, MessageOptions, MessagePage, MessageReference, Messages, MessagesType,
     },
@@ -190,33 +189,9 @@ impl CommunityDocument {
         let creator = keypair.to_did()?;
 
         let mut permissions = CommunityPermissions::new();
-        permissions.insert(CommunityPermission::EditName, IndexSet::new());
-        permissions.insert(CommunityPermission::EditDescription, IndexSet::new());
-        permissions.insert(CommunityPermission::EditIcon, IndexSet::new());
-        permissions.insert(CommunityPermission::EditBanner, IndexSet::new());
-
-        permissions.insert(CommunityPermission::CreateRoles, IndexSet::new());
-        permissions.insert(CommunityPermission::EditRoles, IndexSet::new());
-        permissions.insert(CommunityPermission::DeleteRoles, IndexSet::new());
-
-        permissions.insert(CommunityPermission::GrantRoles, IndexSet::new());
-        permissions.insert(CommunityPermission::RevokeRoles, IndexSet::new());
-
-        permissions.insert(CommunityPermission::GrantPermissions, IndexSet::new());
-        permissions.insert(CommunityPermission::RevokePermissions, IndexSet::new());
-
-        permissions.insert(CommunityPermission::CreateChannels, IndexSet::new());
-        permissions.insert(CommunityPermission::EditChannels, IndexSet::new());
-        permissions.insert(CommunityPermission::DeleteChannels, IndexSet::new());
-
-        //We don't add CreateInvites permission since by default we leave it unrestricted.
-        permissions.insert(CommunityPermission::EditInvites, IndexSet::new());
-        permissions.insert(CommunityPermission::DeleteInvites, IndexSet::new());
-
-        permissions.insert(CommunityPermission::RemoveMembers, IndexSet::new());
-
-        permissions.insert(CommunityPermission::DeleteMessages, IndexSet::new());
-        permissions.insert(CommunityPermission::PinMessages, IndexSet::new());
+        for permission in CommunityPermission::default_disabled() {
+            permissions.insert(permission.to_string(), IndexSet::new());
+        }
 
         let mut members = IndexSet::new();
         members.insert(creator.clone());
@@ -299,14 +274,17 @@ impl CommunityDocument {
         }
         false
     }
-    pub fn has_permission(&self, user: &DID, has_permission: &CommunityPermission) -> bool {
+    pub fn has_permission<T>(&self, user: &DID, has_permission: &T) -> bool
+    where
+        T: ToString,
+    {
         if &self.owner == user {
             return true;
         }
         if !self.members.contains(user) {
             return false;
         }
-        let Some(authorized_roles) = self.permissions.get(has_permission) else {
+        let Some(authorized_roles) = self.permissions.get(&has_permission.to_string()) else {
             return true;
         };
         for authorized_role in authorized_roles {
@@ -318,13 +296,15 @@ impl CommunityDocument {
         }
         false
     }
-
-    pub fn has_channel_permission(
+    pub fn has_channel_permission<T>(
         &self,
         user: &DID,
-        has_permission: &CommunityChannelPermission,
+        has_permission: &T,
         channel_id: Uuid,
-    ) -> bool {
+    ) -> bool
+    where
+        T: ToString,
+    {
         if &self.owner == user {
             return true;
         }
@@ -334,7 +314,7 @@ impl CommunityDocument {
         let Some(channel) = self.channels.get(&channel_id.to_string()) else {
             return false;
         };
-        let Some(authorized_roles) = channel.permissions.get(has_permission) else {
+        let Some(authorized_roles) = channel.permissions.get(&has_permission.to_string()) else {
             return true;
         };
         for authorized_role in authorized_roles {