Update to version sharelatex version 3.0.1. Tested changes with our small experimental environment: Seems to work with the applied small fixes.

This commit is contained in:
Simon M. Haller-Seeber
2022-01-13 15:29:43 +01:00
parent 39ef130adc
commit 41c172b587
3 changed files with 41 additions and 38 deletions

View File

@@ -1,11 +1,11 @@
const Settings = require('settings-sharelatex')
const Settings = require('@overleaf/settings')
const { User } = require('../../models/User')
const { db, ObjectId } = require('../../infrastructure/mongodb')
const bcrypt = require('bcrypt')
const EmailHelper = require('../Helpers/EmailHelper')
const {
InvalidEmailError,
InvalidPasswordError
InvalidPasswordError,
} = require('./AuthenticationErrors')
const util = require('util')
@@ -127,7 +127,7 @@ const AuthenticationManager = {
if (password == null) {
return new InvalidPasswordError({
message: 'password not set',
info: { code: 'not_set' }
info: { code: 'not_set' },
})
}
@@ -151,13 +151,13 @@ const AuthenticationManager = {
if (password.length < min) {
return new InvalidPasswordError({
message: 'password is too short',
info: { code: 'too_short' }
info: { code: 'too_short' },
})
}
if (password.length > max) {
return new InvalidPasswordError({
message: 'password is too long',
info: { code: 'too_long' }
info: { code: 'too_long' },
})
}
if (
@@ -166,7 +166,7 @@ const AuthenticationManager = {
) {
return new InvalidPasswordError({
message: 'password contains an invalid character',
info: { code: 'invalid_character' }
info: { code: 'invalid_character' },
})
}
return null
@@ -192,7 +192,7 @@ const AuthenticationManager = {
},
hashPassword(password, callback) {
bcrypt.genSalt(BCRYPT_ROUNDS, BCRYPT_MINOR_VERSION, function(error, salt) {
bcrypt.genSalt(BCRYPT_ROUNDS, BCRYPT_MINOR_VERSION, function (error, salt) {
if (error) {
return callback(error)
}
@@ -210,23 +210,23 @@ const AuthenticationManager = {
if (validationError) {
return callback(validationError)
}
this.hashPassword(password, function(error, hash) {
this.hashPassword(password, function (error, hash) {
if (error) {
return callback(error)
}
db.users.updateOne(
{
_id: ObjectId(user._id.toString())
_id: ObjectId(user._id.toString()),
},
{
$set: {
hashedPassword: hash
hashedPassword: hash,
},
$unset: {
password: true
}
password: true,
},
},
function(updateError, result) {
function (updateError, result) {
if (updateError) {
return callback(updateError)
}
@@ -383,7 +383,7 @@ const AuthenticationManager = {
AuthenticationManager.promises = {
authenticate: util.promisify(AuthenticationManager.authenticate),
hashPassword: util.promisify(AuthenticationManager.hashPassword),
setUserPassword: util.promisify(AuthenticationManager.setUserPassword)
setUserPassword: util.promisify(AuthenticationManager.setUserPassword),
}
module.exports = AuthenticationManager