diff --git a/backend/src/middlewares/recording.middleware.ts b/backend/src/middlewares/recording.middleware.ts index 9c1d8b0..de70c7a 100644 --- a/backend/src/middlewares/recording.middleware.ts +++ b/backend/src/middlewares/recording.middleware.ts @@ -73,7 +73,7 @@ export const withCanRetrieveRecordingsPermission = async (req: Request, res: Res const sameRoom = roomId ? payload.video?.room === roomId : true; const metadata = JSON.parse(payload.metadata || '{}'); - const permissions = metadata.permissions as RecordingPermissions | undefined; + const permissions = metadata.recordingPermissions as RecordingPermissions | undefined; const canRetrieveRecordings = permissions?.canRetrieveRecordings; if (!sameRoom || !canRetrieveRecordings) { @@ -96,7 +96,7 @@ export const withCanDeleteRecordingsPermission = async (req: Request, res: Respo const sameRoom = payload.video?.room === roomId; const metadata = JSON.parse(payload.metadata || '{}'); - const permissions = metadata.permissions as RecordingPermissions | undefined; + const permissions = metadata.recordingPermissions as RecordingPermissions | undefined; const canDeleteRecordings = permissions?.canDeleteRecordings; if (!sameRoom || !canDeleteRecordings) { diff --git a/backend/src/routes/recording.routes.ts b/backend/src/routes/recording.routes.ts index cac4f53..860f2b5 100644 --- a/backend/src/routes/recording.routes.ts +++ b/backend/src/routes/recording.routes.ts @@ -25,20 +25,6 @@ recordingRouter.use(bodyParser.urlencoded({ extended: true })); recordingRouter.use(bodyParser.json()); // 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( '/', withAuth(apiKeyValidator, tokenAndRoleValidator(UserRole.ADMIN), recordingTokenValidator), @@ -52,6 +38,20 @@ recordingRouter.delete( withValidRecordingBulkDeleteRequest, 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( '/:recordingId/media', withValidGetMediaRequest, @@ -73,7 +73,6 @@ internalRecordingRouter.post( withCanRecordPermission, recordingCtrl.startRecording ); - internalRecordingRouter.post( '/:recordingId/stop', withValidRecordingId,