github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-02-18 19:14:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix validation of project-output-file, no build_id for imported v1 projects

Browse source
This commit is contained in:
Shane Kilkelly 2018-06-25 12:27:56 +01:00
parent f6424ada40
commit 04be842b30
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
services/web/app/coffee/Features/LinkedFiles/ProjectOutputFileAgent.coffee
View file

@ -93,11 +93,17 @@ module.exports = ProjectOutputFileAgent = {
_getSourceProject: LinkedFilesHandler.getSourceProject _getSourceProject: LinkedFilesHandler.getSourceProject
_validate: (data) -> _validate: (data) ->
return ( if data.v1_source_doc_id?
(data.source_project_id? || data.v1_source_doc_id?) && (
data.source_output_file_path? && data.v1_source_doc_id? &&
data.build_id? data.source_output_file_path?
) )
else
(
data.source_project_id? &&
data.source_output_file_path? &&
data.build_id?
)
_checkAuth: (project_id, data, current_user_id, callback = (err, allowed)->) -> _checkAuth: (project_id, data, current_user_id, callback = (err, allowed)->) ->
callback = _.once(callback) callback = _.once(callback)

3
services/web/test/acceptance/coffee/LinkedFilesTests.coffee
View file

@ -428,8 +428,7 @@ describe "LinkedFiles", ->
linkedFileData: { linkedFileData: {
provider: "project_output_file", provider: "project_output_file",
v1_source_doc_id: 9999999, # We won't find this id in the database v1_source_doc_id: 9999999, # We won't find this id in the database
source_output_file_path: "project.pdf", source_output_file_path: "project.pdf"
build_id: '123'
}, },
_id: "abcdef", _id: "abcdef",
rev: 0, rev: 0,