Commit a0e70e4f authored by Simon M. Haller-Seeber's avatar Simon M. Haller-Seeber
Browse files

Adapted Contact Controller to work with Sharelatex 3.3.2

parent 682d15d6
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
FROM sharelatex/sharelatex:3.1.0
FROM sharelatex/sharelatex:3.3.2
# FROM sharelatex/sharelatex:latest
# latest might not be tested 
# e.g. the AuthenticationManager.js script had to be adapted after versions 2.3.1 
+19 −20
Original line number Diff line number Diff line
@@ -17,13 +17,12 @@ const AuthenticationController = require('../Authentication/AuthenticationContro
const SessionManager = require('../Authentication/SessionManager')
const ContactManager = require('./ContactManager')
const UserGetter = require('../User/UserGetter')
const logger = require('logger-sharelatex')
const logger = require('@overleaf/logger')
const Modules = require('../../infrastructure/Modules')
const { Client } = require('ldapts');

module.exports = ContactsController = {
  getContacts(req, res, next) {
    // const user_id = AuthenticationController.getLoggedInUserId(req)
    const user_id = SessionManager.getLoggedInUserId(req.session)
    return ContactManager.getContactIds(
      user_id,
@@ -51,7 +50,6 @@ module.exports = ContactsController = {
              const contact_id = contact_ids[i]
              positions[contact_id] = i
            }
	  
            contacts.sort(
              (a, b) =>
                positions[a._id != null ? a._id.toString() : undefined] -
@@ -63,6 +61,7 @@ module.exports = ContactsController = {
	    ContactsController.getLdapContacts(contacts).then((ldapcontacts) => { 
	      contacts.push(ldapcontacts)
              contacts = contacts.map(ContactsController._formatContact)
            
           return Modules.hooks.fire('getContacts', user_id, contacts, function(
              error,
              additional_contacts