agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-06-02 21:59:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12848 from overleaf/bg-fix-path-exception

Browse Source 
add exception handling for  path.join in ProjectEntityHandler

GitOrigin-RevId: dad305057fd6b2821525ca5b6d1933824989e241
This commit is contained in:
Brian Gough
2023-05-02 09:18:57 +01:00
committed by Copybot
parent 6ef9be0d0c
commit 1da76f0a8d
7 changed files with 291 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/src/Features/Project/ProjectEntityHandler.js
+43 -20
View File
@@ -30,12 +30,16 @@ const ProjectEntityHandler = {
for (const doc of iterablePaths(folder, 'docs')) {
const content = docContents[doc._id.toString()]
if (content != null) {
docs[path.join(folderPath, doc.name)] = {
_id: doc._id,
name: doc.name,
lines: content.lines,
rev: content.rev,
folder,
try {
docs[path.join(folderPath, doc.name)] = {
_id: doc._id,
name: doc.name,
lines: content.lines,
rev: content.rev,
folder,
}
} catch (err) {
return callback(err)
}
}
}
@@ -55,7 +59,11 @@ const ProjectEntityHandler = {
for (const { path: folderPath, folder } of folders) {
for (const file of iterablePaths(folder, 'fileRefs')) {
if (file != null) {
files[path.join(folderPath, file.name)] = { ...file, folder }
try {
files[path.join(folderPath, file.name)] = { ...file, folder }
} catch (err) {
return callback(err)
}
}
}
}
@@ -71,9 +79,12 @@ const ProjectEntityHandler = {
if (project == null) {
return callback(new Errors.NotFoundError('project not found'))
}
const entities = ProjectEntityHandler.getAllEntitiesFromProject(project)
callback(null, entities)
try {
const entities = ProjectEntityHandler.getAllEntitiesFromProject(project)
callback(null, entities)
} catch (err) {
callback(err)
}
})
},
@@ -104,8 +115,12 @@ const ProjectEntityHandler = {
if (project == null) {
return callback(Errors.NotFoundError('no project'))
}
const docPaths = ProjectEntityHandler.getAllDocPathsFromProject(project)
callback(null, docPaths)
try {
const docPaths = ProjectEntityHandler.getAllDocPathsFromProject(project)
callback(null, docPaths)
} catch (err) {
callback(err)
}
})
},
@@ -186,12 +201,16 @@ const ProjectEntityHandler = {
return null
}
}
const docPath = recursivelyFindDocInFolder(
'/',
docId,
project.rootFolder[0]
)
callback(null, docPath)
try {
const docPath = recursivelyFindDocInFolder(
'/',
docId,
project.rootFolder[0]
)
callback(null, docPath)
} catch (err) {
callback(err)
}
},
_getAllFolders(projectId, callback) {
@@ -202,8 +221,12 @@ const ProjectEntityHandler = {
if (project == null) {
return callback(new Errors.NotFoundError('no project'))
}
const folders = ProjectEntityHandler._getAllFoldersFromProject(project)
callback(null, folders)
try {
const folders = ProjectEntityHandler._getAllFoldersFromProject(project)
callback(null, folders)
} catch (err) {
callback(err)
}
})
},