Merge pull request #2959 from overleaf/em-admin-only-texlive-images

Admin only TeX Live images

GitOrigin-RevId: 428896c4e5512053bd7fa6c618ff64efd1a6141a
This commit is contained in:
Eric Mc Sween
2020-06-30 08:04:59 -04:00
committed by Copybot
parent fdb79de3a6
commit 42c7fbf38c
4 changed files with 233 additions and 205 deletions
@@ -1,7 +1,3 @@
/* eslint-disable
camelcase
*/
const Path = require('path')
const fs = require('fs')
const crypto = require('crypto')
@@ -253,7 +249,7 @@ const ProjectController = {
return res.send({ redir: '/register' })
}
const currentUser = AuthenticationController.getSessionUser(req)
const { first_name, last_name, email } = currentUser
const { first_name: firstName, last_name: lastName, email } = currentUser
ProjectDuplicator.duplicate(
currentUser,
projectId,
@@ -270,7 +266,12 @@ const ProjectController = {
name: project.name,
project_id: project._id,
owner_ref: project.owner_ref,
owner: { first_name, last_name, email, _id: currentUser._id }
owner: {
first_name: firstName,
last_name: lastName,
email,
_id: currentUser._id
}
})
}
)
@@ -585,16 +586,18 @@ const ProjectController = {
},
loadEditor(req, res, next) {
let anonymous, userId
const timer = new metrics.Timer('load-editor')
if (!Settings.editorIsOpen) {
return res.render('general/closed', { title: 'updating_site' })
}
let anonymous, userId, sessionUser
if (AuthenticationController.isUserLoggedIn(req)) {
sessionUser = AuthenticationController.getSessionUser(req)
userId = AuthenticationController.getLoggedInUserId(req)
anonymous = false
} else {
sessionUser = null
anonymous = true
userId = null
}
@@ -694,6 +697,9 @@ const ProjectController = {
projectId
)
const { isTokenMember } = results
const allowedImageNames = ProjectHelper.getAllowedImagesForUser(
sessionUser
)
AuthorizationManager.getPrivilegeLevelForProject(
userId,
projectId,
@@ -797,7 +803,7 @@ const ProjectController = {
project.overleaf.history &&
Boolean(project.overleaf.history.display),
brandVariation,
allowedImageNames: Settings.allowedImageNames || [],
allowedImageNames,
gitBridgePublicBaseUrl: Settings.gitBridgePublicBaseUrl,
wsUrl,
showSupport: Features.hasFeature('support')