backend: Correct permissions reference in recording middleware for retrieval and deletion. Reorder recording routes definition for clarity
This commit is contained in:
parent
0b00153349
commit
8b2d0dd34c
@ -73,7 +73,7 @@ export const withCanRetrieveRecordingsPermission = async (req: Request, res: Res
|
|||||||
|
|
||||||
const sameRoom = roomId ? payload.video?.room === roomId : true;
|
const sameRoom = roomId ? payload.video?.room === roomId : true;
|
||||||
const metadata = JSON.parse(payload.metadata || '{}');
|
const metadata = JSON.parse(payload.metadata || '{}');
|
||||||
const permissions = metadata.permissions as RecordingPermissions | undefined;
|
const permissions = metadata.recordingPermissions as RecordingPermissions | undefined;
|
||||||
const canRetrieveRecordings = permissions?.canRetrieveRecordings;
|
const canRetrieveRecordings = permissions?.canRetrieveRecordings;
|
||||||
|
|
||||||
if (!sameRoom || !canRetrieveRecordings) {
|
if (!sameRoom || !canRetrieveRecordings) {
|
||||||
@ -96,7 +96,7 @@ export const withCanDeleteRecordingsPermission = async (req: Request, res: Respo
|
|||||||
|
|
||||||
const sameRoom = payload.video?.room === roomId;
|
const sameRoom = payload.video?.room === roomId;
|
||||||
const metadata = JSON.parse(payload.metadata || '{}');
|
const metadata = JSON.parse(payload.metadata || '{}');
|
||||||
const permissions = metadata.permissions as RecordingPermissions | undefined;
|
const permissions = metadata.recordingPermissions as RecordingPermissions | undefined;
|
||||||
const canDeleteRecordings = permissions?.canDeleteRecordings;
|
const canDeleteRecordings = permissions?.canDeleteRecordings;
|
||||||
|
|
||||||
if (!sameRoom || !canDeleteRecordings) {
|
if (!sameRoom || !canDeleteRecordings) {
|
||||||
|
|||||||
@ -25,20 +25,6 @@ recordingRouter.use(bodyParser.urlencoded({ extended: true }));
|
|||||||
recordingRouter.use(bodyParser.json());
|
recordingRouter.use(bodyParser.json());
|
||||||
|
|
||||||
// Recording Routes
|
// Recording Routes
|
||||||
recordingRouter.delete(
|
|
||||||
'/:recordingId',
|
|
||||||
withAuth(apiKeyValidator, tokenAndRoleValidator(UserRole.ADMIN), recordingTokenValidator),
|
|
||||||
withValidRecordingId,
|
|
||||||
withCanDeleteRecordingsPermission,
|
|
||||||
recordingCtrl.deleteRecording
|
|
||||||
);
|
|
||||||
recordingRouter.get(
|
|
||||||
'/:recordingId',
|
|
||||||
withAuth(apiKeyValidator, tokenAndRoleValidator(UserRole.ADMIN), recordingTokenValidator),
|
|
||||||
withValidRecordingId,
|
|
||||||
withCanRetrieveRecordingsPermission,
|
|
||||||
recordingCtrl.getRecording
|
|
||||||
);
|
|
||||||
recordingRouter.get(
|
recordingRouter.get(
|
||||||
'/',
|
'/',
|
||||||
withAuth(apiKeyValidator, tokenAndRoleValidator(UserRole.ADMIN), recordingTokenValidator),
|
withAuth(apiKeyValidator, tokenAndRoleValidator(UserRole.ADMIN), recordingTokenValidator),
|
||||||
@ -52,6 +38,20 @@ recordingRouter.delete(
|
|||||||
withValidRecordingBulkDeleteRequest,
|
withValidRecordingBulkDeleteRequest,
|
||||||
recordingCtrl.bulkDeleteRecordings
|
recordingCtrl.bulkDeleteRecordings
|
||||||
);
|
);
|
||||||
|
recordingRouter.get(
|
||||||
|
'/:recordingId',
|
||||||
|
withAuth(apiKeyValidator, tokenAndRoleValidator(UserRole.ADMIN), recordingTokenValidator),
|
||||||
|
withValidRecordingId,
|
||||||
|
withCanRetrieveRecordingsPermission,
|
||||||
|
recordingCtrl.getRecording
|
||||||
|
);
|
||||||
|
recordingRouter.delete(
|
||||||
|
'/:recordingId',
|
||||||
|
withAuth(apiKeyValidator, tokenAndRoleValidator(UserRole.ADMIN), recordingTokenValidator),
|
||||||
|
withValidRecordingId,
|
||||||
|
withCanDeleteRecordingsPermission,
|
||||||
|
recordingCtrl.deleteRecording
|
||||||
|
);
|
||||||
recordingRouter.get(
|
recordingRouter.get(
|
||||||
'/:recordingId/media',
|
'/:recordingId/media',
|
||||||
withValidGetMediaRequest,
|
withValidGetMediaRequest,
|
||||||
@ -73,7 +73,6 @@ internalRecordingRouter.post(
|
|||||||
withCanRecordPermission,
|
withCanRecordPermission,
|
||||||
recordingCtrl.startRecording
|
recordingCtrl.startRecording
|
||||||
);
|
);
|
||||||
|
|
||||||
internalRecordingRouter.post(
|
internalRecordingRouter.post(
|
||||||
'/:recordingId/stop',
|
'/:recordingId/stop',
|
||||||
withValidRecordingId,
|
withValidRecordingId,
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user