Merge pull request #4420 from webkom/meeting-invite-bug

Catch inviting groups you can't access members of
webkom · Feb 2, 2024 · 93699de · 93699de
2 parents 190cadf + bdae82d
commit 93699de
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 20 deletions.
diff --git a/app/actions/GroupActions.ts b/app/actions/GroupActions.ts
@@ -123,7 +123,7 @@ export function joinGroup(groupId: ID, user: CurrentUser, role = 'member') {
         },
       })
     ).then(() => {
-      return dispatch(fetchMemberships(groupId));
+      return dispatch(fetchMemberships({ groupId }));
     });
 }
 
@@ -143,7 +143,7 @@ export function leaveGroup(membership: MembershipType, groupId: ID) {
         },
       })
     ).then(() => {
-      return dispatch(fetchMemberships(groupId));
+      return dispatch(fetchMemberships({ groupId }));
     });
   };
 }
@@ -163,16 +163,23 @@ export function fetchAllMemberships(groupId: ID, descendants = false) {
   };
 }
 
-export function fetchMemberships(
-  groupId: ID,
+export function fetchMemberships({
+  groupId,
   descendants = false,
-  query: Record<string, any> = {}
-) {
+  query = {},
+  propagateError = true,
+}: {
+  groupId: ID;
+  descendants?: boolean;
+  query?: Record<string, any>;
+  propagateError?: boolean;
+}) {
   return fetchMembershipsPagination({
     groupId,
     descendants,
     next: true,
     query,
+    propagateError,
   });
 }
 
@@ -181,11 +188,13 @@ export function fetchMembershipsPagination({
   next,
   descendants = false,
   query = {},
+  propagateError = true,
 }: {
   groupId: ID;
   next: boolean;
   descendants: boolean;
   query?: Record<string, string | number | boolean>;
+  propagateError?: boolean;
 }) {
   return callAPI<MembershipType[]>({
     types: Group.MEMBERSHIP_FETCH,
@@ -199,7 +208,7 @@ export function fetchMembershipsPagination({
       groupId: groupId,
       errorMessage: 'Henting av medlemmene for gruppen feilet',
     },
-    propagateError: true,
+    propagateError,
   });
 }
 

diff --git a/app/routes/meetings/components/MeetingEditor.tsx b/app/routes/meetings/components/MeetingEditor.tsx
@@ -132,19 +132,28 @@ const MeetingEditor = () => {
   );
 
   const fetchAndSetGroupMembers = async (groupId: number) => {
-    dispatch(fetchMemberships(groupId)).then((res) => {
-      setFetchedGroupIds((prevIds) => [...prevIds, groupId]);
-
-      const members = Object.values(res.payload.entities.users || {}).map(
-        (member) => ({
-          value: member.username,
-          label: member.fullName,
-          id: member.id,
-          groupId: groupId,
-        })
-      );
-      setInvitedGroupMembers((prevMembers) => [...prevMembers, ...members]);
-    });
+    dispatch(fetchMemberships({ groupId, propagateError: false }))
+      .then((res) => {
+        setFetchedGroupIds((prevIds) => [...prevIds, groupId]);
+
+        const members = Object.values(res.payload.entities.users || {}).map(
+          (member) => ({
+            value: member.username,
+            label: member.fullName,
+            id: member.id,
+            groupId: groupId,
+          })
+        );
+        setInvitedGroupMembers((prevMembers) => [...prevMembers, ...members]);
+      })
+      .catch((error) => {
+        // Allow users to invite groups they can't see the members of
+        if (error?.payload?.response?.status === 403) {
+          setFetchedGroupIds((prevIds) => [...prevIds, groupId]);
+          return;
+        }
+        throw error;
+      });
   };
 
   const navigate = useNavigate();