Skip to content

Fix adding and removing permissions #13027

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

Merged
nickvergessen merged 5 commits into from
Aug 22, 2024
Merged

Fix adding and removing permissions #13027

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f1164db
test: Add integration tests for adding and removing permissions
danxuliu Aug 17, 2024
b1fce9a
fix: Fix adding permissions when attendees have default permissions
danxuliu Aug 17, 2024
a974742
refactor: Extract method to get the base query for setting permissions
danxuliu Aug 17, 2024
1111bd3
fix: Fix adding and removing several attendee permissions at once
danxuliu Aug 17, 2024
7d8ea65
fix: Fix adding or removing permissions without call permissions set
danxuliu Aug 17, 2024
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
Prev Previous commit
Next Next commit
refactor: Extract method to get the base query for setting permissions 
Signed-off-by: Daniel Calviño Sánchez <[email protected]>
  • Loading branch information
@danxuliu
danxuliu committed Aug 17, 2024
commit a974742ec69cde24fbe64f129d5387421e1007bd
20 changes: 13 additions & 7 deletions lib/Model/AttendeeMapper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,13 +203,7 @@ public function deleteByIds(array $ids): int {
}

public function modifyPermissions(int $roomId, string $mode, int $newState): void {
$query = $this->db->getQueryBuilder();
$query->update($this->getTableName())
->where($query->expr()->eq('room_id', $query->createNamedParameter($roomId, IQueryBuilder::PARAM_INT)))
->andWhere($query->expr()->notIn('actor_type', $query->createNamedParameter([
Attendee::ACTOR_CIRCLES,
Attendee::ACTOR_GROUPS,
], IQueryBuilder::PARAM_STR_ARRAY)));
$query = $this->getModifyPermissionsBaseQuery($roomId);

if ($mode === Attendee::PERMISSIONS_MODIFY_SET) {
if ($newState !== Attendee::PERMISSIONS_DEFAULT) {
Expand Down Expand Up @@ -237,6 +231,18 @@ public function modifyPermissions(int $roomId, string $mode, int $newState): voi
}
}

protected function getModifyPermissionsBaseQuery(int $roomId): IQueryBuilder {
$query = $this->db->getQueryBuilder();
$query->update($this->getTableName())
->where($query->expr()->eq('room_id', $query->createNamedParameter($roomId, IQueryBuilder::PARAM_INT)))
->andWhere($query->expr()->notIn('actor_type', $query->createNamedParameter([
Attendee::ACTOR_CIRCLES,
Attendee::ACTOR_GROUPS,
], IQueryBuilder::PARAM_STR_ARRAY)));

return $query;
}

protected function addSinglePermission(IQueryBuilder $query, int $permission): void {
$query->set('permissions', $query->func()->add(
'permissions',
Expand Down