|
@@ -423,16 +423,13 @@ class User {
|
|
|
UserModel.findOneAndUpdate(
|
|
UserModel.findOneAndUpdate(
|
|
|
filter,
|
|
filter,
|
|
|
{ $set: { hashedPassword, emails: this.emails } },
|
|
{ $set: { hashedPassword, emails: this.emails } },
|
|
|
- options,
|
|
|
|
|
- (error, user) => {
|
|
|
|
|
- if (error != null) {
|
|
|
|
|
- return callback(error)
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
|
|
+ options
|
|
|
|
|
+ )
|
|
|
|
|
+ .then(user => {
|
|
|
this.setExtraAttributes(user)
|
|
this.setExtraAttributes(user)
|
|
|
callback(null, this.password)
|
|
callback(null, this.password)
|
|
|
- }
|
|
|
|
|
- )
|
|
|
|
|
|
|
+ })
|
|
|
|
|
+ .catch(callback)
|
|
|
}
|
|
}
|
|
|
)
|
|
)
|
|
|
}
|
|
}
|
|
@@ -443,28 +440,34 @@ class User {
|
|
|
const value = features[key]
|
|
const value = features[key]
|
|
|
update[`features.${key}`] = value
|
|
update[`features.${key}`] = value
|
|
|
}
|
|
}
|
|
|
- UserModel.updateOne({ _id: this.id }, update, callback)
|
|
|
|
|
|
|
+ UserModel.updateOne({ _id: this.id }, update)
|
|
|
|
|
+ .then((...args) => callback(null, ...args))
|
|
|
|
|
+ .catch(callback)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
setFeaturesOverride(featuresOverride, callback) {
|
|
setFeaturesOverride(featuresOverride, callback) {
|
|
|
const update = { $push: { featuresOverrides: featuresOverride } }
|
|
const update = { $push: { featuresOverrides: featuresOverride } }
|
|
|
- UserModel.updateOne({ _id: this.id }, update, callback)
|
|
|
|
|
|
|
+ UserModel.updateOne({ _id: this.id }, update)
|
|
|
|
|
+ .then((...args) => callback(null, ...args))
|
|
|
|
|
+ .catch(callback)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
setOverleafId(overleafId, callback) {
|
|
setOverleafId(overleafId, callback) {
|
|
|
- UserModel.updateOne(
|
|
|
|
|
- { _id: this.id },
|
|
|
|
|
- { 'overleaf.id': overleafId },
|
|
|
|
|
- callback
|
|
|
|
|
- )
|
|
|
|
|
|
|
+ UserModel.updateOne({ _id: this.id }, { 'overleaf.id': overleafId })
|
|
|
|
|
+ .then((...args) => callback(null, ...args))
|
|
|
|
|
+ .catch(callback)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
setEmails(emails, callback) {
|
|
setEmails(emails, callback) {
|
|
|
- UserModel.updateOne({ _id: this.id }, { emails }, callback)
|
|
|
|
|
|
|
+ UserModel.updateOne({ _id: this.id }, { emails })
|
|
|
|
|
+ .then((...args) => callback(null, ...args))
|
|
|
|
|
+ .catch(callback)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
setSuspended(suspended, callback) {
|
|
setSuspended(suspended, callback) {
|
|
|
- UserModel.updateOne({ _id: this.id }, { suspended }, callback)
|
|
|
|
|
|
|
+ UserModel.updateOne({ _id: this.id }, { suspended })
|
|
|
|
|
+ .then((...args) => callback(null, ...args))
|
|
|
|
|
+ .catch(callback)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
logout(callback) {
|
|
logout(callback) {
|
|
@@ -1215,9 +1218,10 @@ class User {
|
|
|
overleaf: {
|
|
overleaf: {
|
|
|
id: v1Id,
|
|
id: v1Id,
|
|
|
},
|
|
},
|
|
|
- },
|
|
|
|
|
- callback
|
|
|
|
|
|
|
+ }
|
|
|
)
|
|
)
|
|
|
|
|
+ .then((...args) => callback(null, ...args))
|
|
|
|
|
+ .catch(callback)
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
setCollaboratorInfo(projectId, userId, info, callback) {
|
|
setCollaboratorInfo(projectId, userId, info, callback) {
|