Skip to content

BC-10804 - Bug fix for Room Admin Table Deleting Members #3922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

BC-10804 - Bug fix for Room Admin Table Deleting Members #3922

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
37462f8
add an additional check if the user has permission to remove member
muratmerdoglu-dp Oct 15, 2025
de445f8
create seperate method for code readability
muratmerdoglu-dp Oct 16, 2025
1cf1869
add logic in changeRole method
muratmerdoglu-dp Oct 16, 2025
3ed8399
Merge branch 'main' into BC-10804-bug-fix-admin
muratmerdoglu-dp Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/modules/data/room/roomMembers/RoomMembers.store.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,7 @@ export const useRoomMembersStore = defineStore("roomMembersStore", () => {
addMembers,
isRoomOwner,
changeRoomOwner,
currentUserId,
confirmInvitations,
fetchMembers,
resetPotentialMembers,
Expand Down
7 changes: 6 additions & 1 deletion src/modules/feature/room/manageRoom/tables/RoomAdminMembersTable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ withDefaults(defineProps<Props>(), {

const { t } = useI18n();
const roomMembersStore = useRoomMembersStore();
const { roomMembersWithoutApplicants, roomMembersForAdmins, selectedIds, baseTableHeaders } =
const { currentUserId, roomMembersWithoutApplicants, roomMembersForAdmins, selectedIds, baseTableHeaders } =
storeToRefs(roomMembersStore);
const { isRoomOwner, removeMembers, fetchMembers } = roomMembersStore;
const { askConfirmation } = useConfirmationDialog();
Expand Down Expand Up @@ -163,6 +163,11 @@ const canRemoveMember = (item: RoomMember | string[]) => {
const members = membersByIds(item);
return members.every(canRemoveMember);
}

if (currentUserId.value && isRoomOwner(currentUserId.value)) {
return !isRoomOwner(item.userId);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since there can be only one person as room owner and we checked already in the if above do we still need this check? would currentUserId.value === item.userId be enough? But I am really confused by the whole topic so... :)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the method isRoomOwner is a suitable one to check if a user has this room role which is not the currentUser.
But using it together now with the currentUser somehow confuses the logic within the method for me. What exactly do we want to allow with it? Maybe we can write another method for this usecase (which is still unclear to me) to check for that specific property of the currentUser we want to check for.

}

return !isRoomOwner(item.userId) && belongsToOwnSchool(item.userId);
};

Expand Down
Loading