fix: Do not allow non admin to remove services from conversations (#1…

…5961)
wireapp · Oct 10, 2023 · 3e70e04 · 3e70e04
1 parent 72c4600
commit 3e70e04
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/script/page/RightSidebar/GroupParticipantService/GroupParticipantService.tsx b/src/script/page/RightSidebar/GroupParticipantService/GroupParticipantService.tsx
@@ -41,6 +41,7 @@ interface GroupParticipantServiceProps {
   activeConversation: Conversation;
   actionsViewModel: ActionsViewModel;
   integrationRepository: IntegrationRepository;
+  enableRemove: boolean;
   goToRoot: () => void;
   onBack: () => void;
   onClose: () => void;
@@ -54,6 +55,7 @@ const GroupParticipantService: FC<GroupParticipantServiceProps> = ({
   activeConversation,
   actionsViewModel,
   integrationRepository,
+  enableRemove,
   goToRoot,
   onBack,
   onClose,
@@ -69,7 +71,7 @@ const GroupParticipantService: FC<GroupParticipantServiceProps> = ({
   } = useKoSubscribableChildren(activeConversation, ['inTeam', 'isActiveParticipant', 'participating_user_ids']);
   const {teamRole} = useKoSubscribableChildren(selfUser, ['teamRole']);
 
-  const {canChatWithServices, canUpdateGroupParticipants} = generatePermissionHelpers(teamRole);
+  const {canChatWithServices} = generatePermissionHelpers(teamRole);
 
   const selectedInConversation = participatingUserIds.some(user => matchQualifiedIds(userEntity, user));
 
@@ -117,7 +119,7 @@ const GroupParticipantService: FC<GroupParticipantServiceProps> = ({
           </div>
         )}
 
-        {showActions && canUpdateGroupParticipants() && (
+        {showActions && enableRemove && (
           <div
             role="button"
             tabIndex={TabIndex.FOCUSABLE}

diff --git a/src/script/page/RightSidebar/RightSidebar.tsx b/src/script/page/RightSidebar/RightSidebar.tsx
@@ -274,6 +274,7 @@ const RightSidebar: FC<RightSidebarProps> = ({
               activeConversation={activeConversation}
               actionsViewModel={actionsViewModel}
               integrationRepository={integrationRepository}
+              enableRemove={conversationRoleRepository.canRemoveParticipants(activeConversation)}
               goToRoot={goToRoot}
               onBack={onBackClick}
               onClose={closePanel}