From f2f0eda543ab54eec0f6bcdd8ccf6e382d5cafb6 Mon Sep 17 00:00:00 2001 From: Rigel Kent Date: Thu, 9 Jan 2020 16:51:51 +0100 Subject: Adapt feeds content-type to accept header --- server/middlewares/validators/feeds.ts | 36 ++++++++++++++++++++++++++++++---- 1 file changed, 32 insertions(+), 4 deletions(-) (limited to 'server/middlewares/validators') diff --git a/server/middlewares/validators/feeds.ts b/server/middlewares/validators/feeds.ts index 1bef9891b..29f6c87be 100644 --- a/server/middlewares/validators/feeds.ts +++ b/server/middlewares/validators/feeds.ts @@ -12,9 +12,37 @@ import { doesVideoChannelNameWithHostExist } from '../../helpers/middlewares' -const videoFeedsValidator = [ +const feedsFormatValidator = [ param('format').optional().custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)'), - query('format').optional().custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)'), + query('format').optional().custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)') +] + +function setFeedFormatContentType (req: express.Request, res: express.Response, next: express.NextFunction) { + const format = req.query.format || req.params.format || 'rss' + + let acceptableContentTypes: string[] + if (format === 'atom' || format === 'atom1') { + acceptableContentTypes = ['application/atom+xml', 'application/xml', 'text/xml'] + } else if (format === 'json' || format === 'json1') { + acceptableContentTypes = ['application/json'] + } else if (format === 'rss' || format === 'rss2') { + acceptableContentTypes = ['application/rss+xml', 'application/xml', 'text/xml'] + } else { + acceptableContentTypes = ['application/xml', 'text/xml'] + } + + if (req.accepts(acceptableContentTypes)) { + res.set('Content-Type', req.accepts(acceptableContentTypes) as string) + } else { + return res.status(406).send({ + message: `You should accept at least one of the following content-types: ${acceptableContentTypes.join(', ')}` + }).end() + } + + return next() +} + +const videoFeedsValidator = [ query('accountId').optional().custom(isIdValid), query('accountName').optional(), query('videoChannelId').optional().custom(isIdValid), @@ -35,8 +63,6 @@ const videoFeedsValidator = [ ] const videoCommentsFeedsValidator = [ - param('format').optional().custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)'), - query('format').optional().custom(isValidRSSFeed).withMessage('Should have a valid format (rss, atom, json)'), query('videoId').optional().custom(isIdOrUUIDValid), async (req: express.Request, res: express.Response, next: express.NextFunction) => { @@ -53,6 +79,8 @@ const videoCommentsFeedsValidator = [ // --------------------------------------------------------------------------- export { + feedsFormatValidator, + setFeedFormatContentType, videoFeedsValidator, videoCommentsFeedsValidator } -- cgit v1.2.3