chore: add group policy if role is other than member

raystack · Oct 5, 2023 · dd87a72 · dd87a72
1 parent 8e6e8fe
commit dd87a72
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/sdks/js/packages/core/react/components/organization/teams/members/invite.tsx b/sdks/js/packages/core/react/components/organization/teams/members/invite.tsx
@@ -127,22 +127,30 @@ export const InviteTeamMembers = () => {
     getRoles();
   }, [getRoles, organization?.id]);
 
+  const addGroupTeamPolicy = useCallback(
+    async (roleId: string, userId: string) => {
+      const role = roles.find(r => r.id === roleId);
+      if (role?.name && role.name !== PERMISSIONS.RoleGroupMember) {
+        const resource = `${PERMISSIONS.GroupPrincipal}:${teamId}`;
+        const principal = `${PERMISSIONS.UserPrincipal}:${userId}`;
+        const policy: V1Beta1PolicyRequestBody = {
+          roleId,
+          resource,
+          principal
+        };
+        await client?.frontierServiceCreatePolicy(policy);
+      }
+    },
+    [client, roles, teamId]
+  );
+
   async function onSubmit({ role, userId }: InviteSchemaType) {
     if (!userId || !role || !organization?.id) return;
     try {
-      const resource = `${PERMISSIONS.GroupPrincipal}:${teamId}`;
-      const principal = `${PERMISSIONS.UserPrincipal}:${userId}`;
-
-      const policy: V1Beta1PolicyRequestBody = {
-        roleId: role,
-        resource,
-        principal
-      };
-
       await client?.frontierServiceAddGroupUsers(organization?.id, teamId, {
         userIds: [userId]
       });
-      await client?.frontierServiceCreatePolicy(policy);
+      await addGroupTeamPolicy(role, userId);
       toast.success('member added');
       navigate({
         to: '/teams/$teamId',

diff --git a/sdks/js/packages/core/react/components/organization/teams/team.tsx b/sdks/js/packages/core/react/components/organization/teams/team.tsx
@@ -1,7 +1,12 @@
 import { Flex, Text, Image } from '@raystack/apsara';
 
 import { Tabs } from '@raystack/apsara';
-import { Outlet, useNavigate, useParams } from '@tanstack/react-router';
+import {
+  Outlet,
+  useNavigate,
+  useParams,
+  useRouterState
+} from '@tanstack/react-router';
 import { useEffect, useState } from 'react';
 import { toast } from 'sonner';
 import { useFrontier } from '~/react/contexts/FrontierContext';
@@ -17,6 +22,7 @@ export const TeamPage = () => {
   const [members, setMembers] = useState<V1Beta1User[]>([]);
   const { client, activeOrganization: organization } = useFrontier();
   let navigate = useNavigate({ from: '/teams/$teamId' });
+  const routerState = useRouterState();
 
   useEffect(() => {
     async function getTeamDetails() {
@@ -58,7 +64,7 @@ export const TeamPage = () => {
       }
     }
     getTeamMembers();
-  }, [client, organization?.id, teamId]);
+  }, [client, organization?.id, teamId, routerState.location.key]);
 
   return (
     <Flex direction="column" style={{ width: '100%' }}>

diff --git a/sdks/js/packages/core/utils/index.ts b/sdks/js/packages/core/utils/index.ts
@@ -81,7 +81,8 @@ export const PERMISSIONS = {
   SuperUserPrincipal: 'app/superuser',
 
   // Roles
-  RoleProjectOwner: 'app_project_owner'
+  RoleProjectOwner: 'app_project_owner',
+  RoleGroupMember: 'app_group_member'
 };
 
 export const formatPermissions = (