fix: permission hook

AFK-AlignedFamKernel · Aug 31, 2024 · e6f10f7 · e6f10f7
1 parent ac4292b
commit e6f10f7
Show file tree

Hide file tree

Showing 14 changed files with 163 additions and 116 deletions.
diff --git a/apps/mobile/src/modules/Group/groupDetail/GroupChatDetail.tsx b/apps/mobile/src/modules/Group/groupDetail/GroupChatDetail.tsx
@@ -87,7 +87,6 @@ const GroupChatDetail: React.FC<GroupChatDetailScreenProps> = ({navigation, rout
         </Modalize>
         <Modalize ref={addMemberModalizeRef}>
           <AddMemberView
-            permissionData={permissionData as any}
             handleClose={() => addMemberModalizeRef.current?.close()}
             groupId={route.params.groupId ? route.params.groupId : ''}
           />
@@ -103,7 +102,6 @@ const GroupChatDetail: React.FC<GroupChatDetailScreenProps> = ({navigation, rout
               mutate(
                 {
                   groupId: route.params.groupId,
-                  permissionData: permissionData as any,
                 },
                 {
                   onSuccess: () => {

diff --git a/apps/mobile/src/modules/Group/memberAction/addMember.tsx b/apps/mobile/src/modules/Group/memberAction/addMember.tsx
@@ -16,11 +16,9 @@ import stylesheet from './styles';
 export default function AddMemberView({
   groupId,
   handleClose,
-  permissionData,
 }: {
   groupId: string;
   handleClose: () => void;
-  permissionData: AdminGroupPermission[];
 }) {
   const groupMembers = useGetGroupMemberList({
     groupId,
@@ -61,7 +59,6 @@ export default function AddMemberView({
               {
                 pubkey: values.pubKey,
                 groupId,
-                permissionData: permissionData as any,
               },
               {
                 onSuccess() {

diff --git a/apps/mobile/src/modules/Group/memberAction/editGroup.tsx b/apps/mobile/src/modules/Group/memberAction/editGroup.tsx
@@ -13,7 +13,6 @@ import stylesheet from '../addGroup/styles';
 export const EditGroup = ({
   groupId,
   handleClose,
-  permissionData,
 }: {
   groupId: string;
   handleClose: () => void;
@@ -39,7 +38,7 @@ export const EditGroup = ({
           mutate(
             {
               groupId,
-              permissionData: permissionData as any,
+
               meta: {
                 name: values.name,
                 about: values.about,

diff --git a/apps/mobile/src/modules/Group/memberAction/groupAction.tsx b/apps/mobile/src/modules/Group/memberAction/groupAction.tsx
@@ -94,7 +94,6 @@ const GroupAdminActions = ({
       {
         groupId,
         pubkey: memberPubKey,
-        permissionData: permissionData as any,
       },
       {
         onSuccess: () => {

diff --git a/apps/mobile/src/modules/Group/message/GroupMessage.tsx b/apps/mobile/src/modules/Group/message/GroupMessage.tsx
@@ -75,7 +75,6 @@ const GroupChat: React.FC<GroupChatScreenProps> = ({navigation, route}) => {
         pubkey: publicKey,
         name: profile.data?.nip05,
         replyId: replyToId ?? (null as any),
-        permissionData: permissionData as any,
       },
       {
         onSuccess() {

diff --git a/packages/afk_nostr_sdk/src/hooks/group/private/useAddMember.ts b/packages/afk_nostr_sdk/src/hooks/group/private/useAddMember.ts
@@ -2,10 +2,13 @@ import {NDKEvent, NDKKind} from '@nostr-dev-kit/ndk';
 import {useMutation} from '@tanstack/react-query';
 
 import {useNostrContext} from '../../../context/NostrContext';
+import {useAuth} from '../../../store';
 import {AdminGroupPermission} from './useAddPermissions';
+import {checkGroupPermission} from './useGetPermission';
 
 export const useAddMember = () => {
   const {ndk} = useNostrContext();
+  const {publicKey: pubkey} = useAuth();
 
   return useMutation({
     mutationKey: ['addMemberGroup', ndk],
@@ -14,17 +17,22 @@ export const useAddMember = () => {
       groupId: string;
       permissionData?: AdminGroupPermission[];
     }) => {
-      if (data?.permissionData && !data.permissionData.includes(AdminGroupPermission.AddMember)) {
+      const event = new NDKEvent(ndk);
+      const hasPermission = await checkGroupPermission({
+        groupId: data.groupId,
+        ndk,
+        pubkey,
+        action: AdminGroupPermission.AddMember,
+      });
+      if (!hasPermission) {
         throw new Error('You do not have permission to add a member to this group');
-      } else {
-        const event = new NDKEvent(ndk);
-        event.kind = NDKKind.GroupAdminAddUser;
-        event.tags = [
-          ['d', data.groupId],
-          ['p', data.pubkey],
-        ];
-        return event.publish();
       }
+      event.kind = NDKKind.GroupAdminAddUser;
+      event.tags = [
+        ['d', data.groupId],
+        ['p', data.pubkey],
+      ];
+      return event.publish();
     },
   });
 };
diff --git a/packages/afk_nostr_sdk/src/hooks/group/private/useDeleteEvent.ts b/packages/afk_nostr_sdk/src/hooks/group/private/useDeleteEvent.ts
@@ -2,29 +2,38 @@ import {NDKEvent} from '@nostr-dev-kit/ndk';
 import {useMutation} from '@tanstack/react-query';
 
 import {useNostrContext} from '../../../context/NostrContext';
+import {useAuth} from '../../../store';
 import {AdminGroupPermission} from './useAddPermissions';
+import {checkGroupPermission} from './useGetPermission';
 
 // TODO
 export const useDeleteEvent = () => {
   const {ndk} = useNostrContext();
+  const {publicKey: pubkey} = useAuth();
   return useMutation({
-    mutationKey: ['deleteEventGroup', ndk],
+    mutationKey: ['deleteEventGroup'],
     mutationFn: async (data: {
       id: string;
       groupId: string;
       permissionData?: AdminGroupPermission[];
     }) => {
-      if (data.permissionData && !data.permissionData.includes(AdminGroupPermission.DeleteEvent)) {
+      const event = new NDKEvent(ndk);
+      const hasPermission = await checkGroupPermission({
+        groupId: data.groupId,
+        ndk,
+        pubkey,
+        action: AdminGroupPermission.DeleteEvent,
+      });
+
+      if (!hasPermission) {
         throw new Error('You do not have permission to delete this event');
-      } else {
-        const event = new NDKEvent(ndk);
-        event.kind = 9005; //NDKKind.GroupAdminDeleteEvent;
-        event.tags = [
-          ['d', data.groupId],
-          ['e', data.id],
-        ];
-        return event.publish();
       }
+      event.kind = 9005; //NDKKind.GroupAdminDeleteEvent;
+      event.tags = [
+        ['d', data.groupId],
+        ['e', data.id],
+      ];
+      return event.publish();
     },
   });
 };
diff --git a/packages/afk_nostr_sdk/src/hooks/group/private/useDeleteGroup.ts b/packages/afk_nostr_sdk/src/hooks/group/private/useDeleteGroup.ts
@@ -2,23 +2,33 @@ import {NDKEvent} from '@nostr-dev-kit/ndk';
 import {useMutation} from '@tanstack/react-query';
 
 import {useNostrContext} from '../../../context/NostrContext';
+import {useAuth} from '../../../store';
 import {AdminGroupPermission} from './useAddPermissions';
+import {checkGroupPermission} from './useGetPermission';
 
 // TODO
 export const useDeleteGroup = () => {
   const {ndk} = useNostrContext();
+  const {publicKey: pubkey} = useAuth();
 
   return useMutation({
-    mutationKey: ['deleteGroup', ndk],
-    mutationFn: async (data: {groupId: string; permissionData: AdminGroupPermission[]}) => {
-      if (data.permissionData && !data.permissionData.includes(AdminGroupPermission.DeleteGroup)) {
+    mutationKey: ['deleteGroup'],
+    mutationFn: async (data: {groupId: string}) => {
+      const event = new NDKEvent(ndk);
+      const hasPermission = await checkGroupPermission({
+        groupId: data.groupId,
+        ndk,
+        pubkey,
+        action: AdminGroupPermission.DeleteGroup,
+      });
+
+      if (!hasPermission) {
         throw new Error('You do not have permission to delete group');
-      } else {
-        const event = new NDKEvent(ndk);
-        event.kind = 9008; // NDKKind.GroupAdminDeleteGroup;
-        event.tags = [['d', data.groupId]];
-        return event.publish();
       }
+
+      event.kind = 9008; // NDKKind.GroupAdminDeleteGroup;
+      event.tags = [['d', data.groupId]];
+      return event.publish();
     },
   });
 };
diff --git a/packages/afk_nostr_sdk/src/hooks/group/private/useEditGroupStatus.ts b/packages/afk_nostr_sdk/src/hooks/group/private/useEditGroupStatus.ts
@@ -2,7 +2,9 @@ import {NDKEvent, NDKKind} from '@nostr-dev-kit/ndk';
 import {useMutation} from '@tanstack/react-query';
 
 import {useNostrContext} from '../../../context/NostrContext';
+import {useAuth} from '../../../store';
 import {AdminGroupPermission} from './useAddPermissions';
+import {checkGroupPermission} from './useGetPermission';
 import {objectToTagArray} from './util';
 
 type GroupStatus = {
@@ -13,25 +15,25 @@ type GroupStatus = {
 // TODO
 export const useGroupEditStatus = () => {
   const {ndk} = useNostrContext();
+  const {publicKey: pubkey} = useAuth();
 
   return useMutation({
-    mutationKey: ['editGroupStatus', ndk],
-    mutationFn: async (data: {
-      groupId: string;
-      status: GroupStatus;
-      permissionData: AdminGroupPermission[];
-    }) => {
-      if (
-        data.permissionData &&
-        !data.permissionData.includes(AdminGroupPermission.EditGroupStatus)
-      ) {
+    mutationKey: ['editGroupStatus'],
+    mutationFn: async (data: {groupId: string; status: GroupStatus}) => {
+      const event = new NDKEvent(ndk);
+      const hasPermission = await checkGroupPermission({
+        groupId: data.groupId,
+        ndk,
+        pubkey,
+        action: AdminGroupPermission.EditGroupStatus,
+      });
+
+      if (!hasPermission) {
         throw new Error('You do not have permission to edit status');
-      } else {
-        const event = new NDKEvent(ndk);
-        event.kind = NDKKind.GroupAdminEditStatus;
-        event.tags = [['d', data.groupId], objectToTagArray(data.status)[0]];
-        return event.publish();
       }
+      event.kind = NDKKind.GroupAdminEditStatus;
+      event.tags = [['d', data.groupId], objectToTagArray(data.status)[0]];
+      return event.publish();
     },
   });
 };
diff --git a/packages/afk_nostr_sdk/src/hooks/group/private/useGetPermission.ts b/packages/afk_nostr_sdk/src/hooks/group/private/useGetPermission.ts
@@ -29,6 +29,7 @@ export const fetchPermissions = async ({
     kinds: [9003],
     '#h': [groupId],
     '#p': [pubkey],
+    since: 0,
   });
 
   if (!events || events.size === 0) return null;

diff --git a/packages/afk_nostr_sdk/src/hooks/group/private/useGroupEditMetadata.ts b/packages/afk_nostr_sdk/src/hooks/group/private/useGroupEditMetadata.ts
@@ -2,7 +2,9 @@ import {NDKEvent, NDKKind} from '@nostr-dev-kit/ndk';
 import {useMutation, useQuery} from '@tanstack/react-query';
 
 import {useNostrContext} from '../../../context/NostrContext';
+import {useAuth} from '../../../store';
 import {AdminGroupPermission} from './useAddPermissions';
+import {checkGroupPermission} from './useGetPermission';
 import {objectToTagArray} from './util';
 
 type UpdateMetaData = {
@@ -21,26 +23,33 @@ interface UseGetGroupMetaData {
 
 export const useGroupEditMetadata = () => {
   const {ndk} = useNostrContext();
+  const {publicKey: pubkey} = useAuth();
 
   return useMutation({
     mutationKey: ['editGroupMetadata', ndk],
     mutationFn: async (data: {
       groupId: string;
       meta: UpdateMetaData;
-      permissionData: AdminGroupPermission[];
+      permissionData?: AdminGroupPermission[];
     }) => {
-      if (data.permissionData && !data.permissionData.includes(AdminGroupPermission.EditMetadata)) {
+      const event = new NDKEvent(ndk);
+      const hasPermission = checkGroupPermission({
+        groupId: data.groupId,
+        ndk,
+        pubkey,
+        action: AdminGroupPermission.EditMetadata,
+      });
+
+      if (!hasPermission) {
         throw new Error('You do not have permission to edit metadata');
-      } else {
-        const editedTag = objectToTagArray(data.meta);
+      }
+      const editedTag = objectToTagArray(data.meta);
 
-        const event = new NDKEvent(ndk);
-        event.content = data.meta.name;
-        event.kind = NDKKind.GroupAdminEditMetadata;
-        event.tags = [['h', data.groupId], ['d', data.groupId], ...editedTag];
+      event.content = data.meta.name;
+      event.kind = NDKKind.GroupAdminEditMetadata;
+      event.tags = [['h', data.groupId], ['d', data.groupId], ...editedTag];
 
-        return event.publish();
-      }
+      return event.publish();
     },
   });
 };

diff --git a/packages/afk_nostr_sdk/src/hooks/group/private/useRemoveMember.ts b/packages/afk_nostr_sdk/src/hooks/group/private/useRemoveMember.ts
@@ -2,32 +2,37 @@ import {NDKEvent, NDKKind} from '@nostr-dev-kit/ndk';
 import {useMutation} from '@tanstack/react-query';
 
 import {useNostrContext} from '../../../context/NostrContext';
+import {useAuth} from '../../../store';
 import {AdminGroupPermission} from './useAddPermissions';
+import {checkGroupPermission} from './useGetPermission';
 
 export const useRemoveMember = () => {
   const {ndk} = useNostrContext();
+  const {publicKey: pubkey} = useAuth();
 
   return useMutation({
     mutationKey: ['removeMemberGroup'],
-    mutationFn: async (data: {
-      pubkey: string;
-      groupId: string;
-      permissionData: AdminGroupPermission[];
-    }) => {
-      if (!data.permissionData && !data.permissionData.includes(AdminGroupPermission.RemoveUser)) {
-        throw new Error('You do not have permission to remove member');
-      } else {
-        const event = new NDKEvent(ndk);
-        event.kind = NDKKind.GroupAdminRemoveUser;
-        event.tags = [
-          ['h', data.groupId],
-          ['d', data.groupId],
-          ['p', data.pubkey],
-        ];
+    mutationFn: async (data: {pubkey: string; groupId: string}) => {
+      const event = new NDKEvent(ndk);
+      const hasPermission = await checkGroupPermission({
+        groupId: data.groupId,
+        ndk,
+        pubkey,
+        action: AdminGroupPermission.RemoveUser,
+      });
 
-        event.publish();
-        return event;
+      if (!hasPermission) {
+        throw new Error('You do not have permission to remove member');
       }
+      event.kind = NDKKind.GroupAdminRemoveUser;
+      event.tags = [
+        ['h', data.groupId],
+        ['d', data.groupId],
+        ['p', data.pubkey],
+      ];
+
+      event.publish();
+      return event;
     },
   });
 };