alois/Verso
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #16186 from overleaf/mj-mongo-object-id

Browse Source 
[web] Use constructor for ObjectId

GitOrigin-RevId: 9eb8b377ea599605b72af237d1ab12f4d8287162
This commit is contained in:
Mathias Jakobsen
2023-12-19 09:04:02 +00:00
committed by Copybot
parent 0ac514f81b
commit c371732e6e
100 changed files with 423 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/web/app/src/Features/Project/FolderStructureBuilder.js
+1 -1
View File
@@ -63,7 +63,7 @@ class FolderStructureBuilder {
createFolder(name) {
return {
_id: ObjectId(),
_id: new ObjectId(),
name,
folders: [],
docs: [],
services/web/app/src/Features/Project/ProjectCollabratecDetailsHandler.js
+10 -10
View File
@@ -43,8 +43,8 @@ module.exports = ProjectCollabratecDetailsHandler = {
callback = function () {}
}
try {
projectId = ObjectId(projectId)
userId = ObjectId(userId)
projectId = new ObjectId(projectId)
userId = new ObjectId(userId)
} catch (error) {
const err = error
return callback(err)
@@ -75,8 +75,8 @@ module.exports = ProjectCollabratecDetailsHandler = {
callback = function () {}
}
try {
projectId = ObjectId(projectId)
userId = ObjectId(userId)
projectId = new ObjectId(projectId)
userId = new ObjectId(userId)
} catch (error) {
const err = error
return callback(err)
@@ -109,7 +109,7 @@ module.exports = ProjectCollabratecDetailsHandler = {
callback = function () {}
}
try {
projectId = ObjectId(projectId)
projectId = new ObjectId(projectId)
} catch (error) {
err = error
return callback(err)
@@ -119,7 +119,7 @@ module.exports = ProjectCollabratecDetailsHandler = {
}
for (const collabratecUser of Array.from(collabratecUsers)) {
try {
collabratecUser.user_id = ObjectId(collabratecUser.user_id)
collabratecUser.user_id = new ObjectId(collabratecUser.user_id)
} catch (error1) {
err = error1
return callback(err)
@@ -134,8 +134,8 @@ module.exports = ProjectCollabratecDetailsHandler = {
callback = function () {}
}
try {
projectId = ObjectId(projectId)
userId = ObjectId(userId)
projectId = new ObjectId(projectId)
userId = new ObjectId(userId)
} catch (error) {
const err = error
return callback(err)
@@ -156,8 +156,8 @@ module.exports = ProjectCollabratecDetailsHandler = {
callback = function () {}
}
try {
oldUserId = ObjectId(oldUserId)
newUserId = ObjectId(newUserId)
oldUserId = new ObjectId(oldUserId)
newUserId = new ObjectId(newUserId)
} catch (error) {
const err = error
return callback(err)
services/web/app/src/Features/Project/ProjectController.js
+2 -2
View File
@@ -435,7 +435,7 @@ const ProjectController = {
cb(null, defaultSettingsForAnonymousUser(userId))
} else {
User.updateOne(
{ _id: ObjectId(userId) },
{ _id: new ObjectId(userId) },
{ $set: { lastActive: new Date() } },
{},
() => {}
@@ -753,7 +753,7 @@ const ProjectController = {
} else if (
Settings.wsUrlV2 &&
Settings.wsUrlV2Percentage > 0 &&
(ObjectId(projectId).getTimestamp() / 1000) % 100 <
(new ObjectId(projectId).getTimestamp() / 1000) % 100 <
Settings.wsUrlV2Percentage
) {
wsUrl = Settings.wsUrlV2
services/web/app/src/Features/Project/ProjectDeleter.js
+4 -4
View File
@@ -128,7 +128,7 @@ async function archiveProject(projectId, userId) {
await Project.updateOne(
{ _id: projectId },
{ $set: { archived }, $pull: { trashed: ObjectId(userId) } }
{ $set: { archived }, $pull: { trashed: new ObjectId(userId) } }
)
} catch (err) {
logger.warn({ err }, 'problem archiving project')
@@ -172,7 +172,7 @@ async function trashProject(projectId, userId) {
await Project.updateOne(
{ _id: projectId },
{
$addToSet: { trashed: ObjectId(userId) },
$addToSet: { trashed: new ObjectId(userId) },
$set: { archived },
}
)
@@ -191,7 +191,7 @@ async function untrashProject(projectId, userId) {
await Project.updateOne(
{ _id: projectId },
{ $pull: { trashed: ObjectId(userId) } }
{ $pull: { trashed: new ObjectId(userId) } }
)
} catch (err) {
logger.warn({ err }, 'problem untrashing project')
@@ -280,7 +280,7 @@ async function deleteProject(projectId, options = {}) {
}
async function undeleteProject(projectId, options = {}) {
projectId = ObjectId(projectId)
projectId = new ObjectId(projectId)
const deletedProject = await DeletedProject.findOne({
'deleterData.deletedProjectId': projectId,
}).exec()
services/web/app/src/Features/Project/ProjectEntityHandler.js
+3 -3
View File
@@ -148,8 +148,8 @@ const ProjectEntityHandler = {
},
/**
* @param {ObjectID | string} projectId
* @param {ObjectID | string} docId
* @param {ObjectId | string} projectId
* @param {ObjectId | string} docId
* @param {Function} callback
*/
getDocPathByProjectIdAndDocId(projectId, docId, callback) {
@@ -176,7 +176,7 @@ const ProjectEntityHandler = {
/**
* @param {Project} project
* @param {ObjectID | string} docId
* @param {ObjectId | string} docId
* @param {Function} callback
*/
getDocPathFromProjectByDocId(project, docId, callback) {
services/web/app/src/Features/Project/ProjectEntityMongoUpdateHandler.js
+1 -1
View File
@@ -568,7 +568,7 @@ async function _putElement(project, folderId, element, type) {
throw new Errors.InvalidNameError('blocked element name')
}
_checkValidElementName(folder, element.name)
element._id = ObjectId(element._id.toString())
element._id = new ObjectId(element._id.toString())
const mongoPath = `${path.mongo}.${pathSegment}`
const newProject = await Project.findOneAndUpdate(
{ _id: project._id, [path.mongo]: { $exists: true } },
services/web/app/src/Features/Project/ProjectHelper.js
+3 -3
View File
@@ -37,7 +37,7 @@ function compilerFromV1Engine(engine) {
* @returns {boolean}
*/
function isArchived(project, userId) {
userId = ObjectId(userId)
userId = new ObjectId(userId)
return (project.archived || []).some(id => id.equals(userId))
}
@@ -48,7 +48,7 @@ function isArchived(project, userId) {
* @returns {boolean}
*/
function isTrashed(project, userId) {
userId = ObjectId(userId)
userId = new ObjectId(userId)
return (project.trashed || []).some(id => id.equals(userId))
}
@@ -75,7 +75,7 @@ function _allCollaborators(project) {
function calculateArchivedArray(project, userId, action) {
let archived = project.archived
userId = ObjectId(userId)
userId = new ObjectId(userId)
if (archived === true) {
archived = _allCollaborators(project)