Skip to content

[NEW] Add "Ring other users when calling" permission #26180

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
pierre-lehnen-rc merged 1 commit into from
Jul 8, 2022
Merged

[NEW] Add "Ring other users when calling" permission #26180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions apps/meteor/app/api/server/v1/videoConference.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {

import { API } from '../api';
import { canAccessRoomIdAsync } from '../../../authorization/server/functions/canAccessRoom';
import { hasPermissionAsync } from '../../../authorization/server/functions/hasPermission';
import { VideoConf } from '../../../../server/sdk';
import { videoConfProviders } from '../../../../server/lib/videoConfProviders';
import { availabilityErrors } from '../../../../lib/videoConference/constants';
Expand All @@ -18,7 +19,7 @@ API.v1.addRoute(
{ authRequired: true, validateParams: isVideoConfStartProps, rateLimiterOptions: { numRequestsAllowed: 3, intervalTimeInMS: 60000 } },
{
async post() {
const { roomId, title, allowRinging } = this.bodyParams;
const { roomId, title, allowRinging: requestRinging } = this.bodyParams;
const { userId } = this;
if (!userId || !(await canAccessRoomIdAsync(roomId, userId))) {
return API.v1.failure('invalid-params');
Expand All @@ -31,9 +32,11 @@ API.v1.addRoute(
throw new Error(availabilityErrors.NOT_ACTIVE);
}

const allowRinging = Boolean(requestRinging) && (await hasPermissionAsync(userId, 'videoconf-ring-users'));

return API.v1.success({
data: {
...(await VideoConf.start(userId, roomId, { title, allowRinging: Boolean(allowRinging) })),
...(await VideoConf.start(userId, roomId, { title, allowRinging })),
providerName,
},
});
Expand Down
1 change: 1 addition & 0 deletions apps/meteor/app/authorization/server/functions/upsertPermissions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,7 @@ export const upsertPermissions = async (): Promise<void> => {
{ _id: 'remove-slackbridge-links', roles: ['admin'] },
{ _id: 'view-import-operations', roles: ['admin'] },
{ _id: 'clear-oembed-cache', roles: ['admin'] },
{ _id: 'videoconf-ring-users', roles: ['admin', 'owner', 'moderator', 'user'] },
];

for await (const permission of permissions) {
Expand Down
1 change: 1 addition & 0 deletions apps/meteor/packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4868,6 +4868,7 @@
"VideoConf_Enable_Groups": "Enable in private channels",
"VideoConf_Enable_DMs": "Enable in direct messages",
"VideoConf_Enable_Teams": "Enable in teams",
"videoconf-ring-users": "Ring other users when calling",
"Videos": "Videos",
"View_All": "View All Members",
"View_channels": "View Channels",
Expand Down
1 change: 1 addition & 0 deletions apps/meteor/server/startup/migrations/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,5 @@ import './v274';
import './v275';
import './v276';
import './v277';
import './v278';
import './xrun';
9 changes: 9 additions & 0 deletions apps/meteor/server/startup/migrations/v278.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import { addMigration } from '../../lib/migrations';
import { upsertPermissions } from '../../../app/authorization/server/functions/upsertPermissions';

addMigration({
version: 278,
up() {
upsertPermissions();
},
});