From edf715919dd37dd98113e692f2de48bd4cf192a8 Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 3 Nov 2014 11:48:56 +0000 Subject: [PATCH] send user to 404 if templates returns 404 --- .../Features/Templates/TemplatesWebController.coffee | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/services/web/app/coffee/Features/Templates/TemplatesWebController.coffee b/services/web/app/coffee/Features/Templates/TemplatesWebController.coffee index 5e21270d12..22c5e9b83d 100644 --- a/services/web/app/coffee/Features/Templates/TemplatesWebController.coffee +++ b/services/web/app/coffee/Features/Templates/TemplatesWebController.coffee @@ -1,6 +1,7 @@ request = require("request") settings = require("settings-sharelatex") logger = require("logger-sharelatex") +ErrorController = require("../Errors/ErrorController") module.exports = TemplatesWebController = @@ -17,6 +18,8 @@ module.exports = TemplatesWebController = {user_id, tag_name, template_name} = req.params logger.log user_id:user_id, tag_name:tag_name, template_name:template_name, "rendering latex template page" TemplatesWebController._getDataFromTemplatesApi "/user/#{user_id}/tag/#{tag_name}/template/#{template_name}", (err, data)-> + if err? and err == 404 + return ErrorController.notFound req, res if err? or !data? logger.err err:err, user_id:user_id, tag_name:tag_name, template_name:template_name, "something went wrong in renerTemplateInTag" return res.send 500 @@ -56,6 +59,8 @@ module.exports = TemplatesWebController = {user_id, template_id} = req.params logger.log user_id:user_id, template_id:template_id, "rendering template page" TemplatesWebController._getDataFromTemplatesApi "/user/#{user_id}/template/#{template_id}", (err, data)-> + if err? and err == 404 + return ErrorController.notFound req, res if err? logger.err err:err, user_id:user_id, template_id:template_id, "something went wrong in _renderCanonicalPage" return res.send 500 @@ -67,6 +72,8 @@ module.exports = TemplatesWebController = {user_id} = req.params logger.log user_id:user_id, "rendering all templates page" TemplatesWebController._getDataFromTemplatesApi "/user/#{user_id}/all", (err, data)-> + if err? and err == 404 + return ErrorController.notFound req, res if err? logger.err err:err, user_id:user_id, "something went wrong in _renderCanonicalPage" return res.send 500 @@ -77,6 +84,8 @@ module.exports = TemplatesWebController = {user_id, tag_name} = req.params logger.log user_id:user_id, tag_name:tag_name, "rendinging tag page for templates" TemplatesWebController._getDataFromTemplatesApi "/user/#{user_id}/tag/#{tag_name}", (err, data)-> + if err? and err == 404 + return ErrorController.notFound req, res if err? logger.err err:err, user_id:user_id, tag_name:tag_name, "something went wrong in _renderCanonicalPage" return res.send 500 @@ -88,4 +97,6 @@ module.exports = TemplatesWebController = url: "#{settings.apis.templates.url}#{path}" json:true request.get opts, (err, response, data)-> + if response.statusCode == 404 + return callback 404 callback err, data \ No newline at end of file