mirror of
https://github.com/overleaf/overleaf.git
synced 2024-11-07 20:31:06 -05:00
Check for case where the source file is not found
This commit is contained in:
parent
2b99080ed3
commit
ee1b32eee1
2 changed files with 17 additions and 3 deletions
|
@ -32,6 +32,14 @@ BadDataError = (message) ->
|
|||
BadDataError.prototype.__proto__ = Error.prototype
|
||||
|
||||
|
||||
FileNotFoundError = (message) ->
|
||||
error = new Error(message)
|
||||
error.name = 'BadData'
|
||||
error.__proto__ = FileNotFoundError.prototype
|
||||
return error
|
||||
FileNotFoundError.prototype.__proto__ = Error.prototype
|
||||
|
||||
|
||||
module.exports = ProjectFileAgent =
|
||||
|
||||
sanitizeData: (data) ->
|
||||
|
@ -58,7 +66,11 @@ module.exports = ProjectFileAgent =
|
|||
project_id: source_project_id,
|
||||
path: source_entity_path
|
||||
}, (err, entity, type) ->
|
||||
return callback(err) if err? # also applies when file not found
|
||||
# return callback(err) if err? # also applies when file not found
|
||||
if err?
|
||||
if err.toString().match(/^not found.*/)
|
||||
err = new FileNotFoundError()
|
||||
return callback(err)
|
||||
ProjectFileAgent._writeEntityToDisk source_project_id, entity._id, type, callback
|
||||
|
||||
_writeEntityToDisk: (project_id, entity_id, type, callback=(err, location)->) ->
|
||||
|
@ -80,7 +92,9 @@ module.exports = ProjectFileAgent =
|
|||
else if error instanceof BadDataError
|
||||
res.status(400).send("The submitted data is not valid")
|
||||
else if error instanceof BadEntityTypeError
|
||||
res.status(404).send("The file is the wrong type")
|
||||
res.status(400).send("The file is the wrong type")
|
||||
else if error instanceof FileNotFoundError
|
||||
res.status(404).send("File not found")
|
||||
else
|
||||
next(error)
|
||||
next()
|
||||
|
|
|
@ -65,4 +65,4 @@ module.exports = UrlAgent = {
|
|||
if !Settings.apis?.linkedUrlProxy?.url?
|
||||
throw new Error('no linked url proxy configured')
|
||||
return "#{Settings.apis.linkedUrlProxy.url}?url=#{encodeURIComponent(url)}"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue