github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2025-01-27 11:32:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

remove unused call to UserGetter.getUser

Browse source
This commit is contained in:
Tim Alby 2018-09-13 17:14:28 +01:00
parent 14b77a2060
commit 0051e59309
2 changed files with 11 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
services/web/app/coffee/Features/Editor/EditorHttpController.coffee
View file

@ -41,21 +41,19 @@ module.exports = EditorHttpController =
return callback(new Error("not found")) if !project? return callback(new Error("not found")) if !project?
CollaboratorsHandler.getInvitedMembersWithPrivilegeLevels project_id, (error, members) -> CollaboratorsHandler.getInvitedMembersWithPrivilegeLevels project_id, (error, members) ->
return callback(error) if error? return callback(error) if error?
UserGetter.getUser user_id, { isAdmin: true }, (error, user) -> token = TokenAccessHandler.getRequestToken(req, project_id)
AuthorizationManager.getPrivilegeLevelForProject user_id, project_id, token, (error, privilegeLevel) ->
return callback(error) if error? return callback(error) if error?
token = TokenAccessHandler.getRequestToken(req, project_id) if !privilegeLevel? or privilegeLevel == PrivilegeLevels.NONE
AuthorizationManager.getPrivilegeLevelForProject user_id, project_id, token, (error, privilegeLevel) -> logger.log {project_id, user_id, privilegeLevel}, "not an acceptable privilege level, returning null"
return callback null, null, false
CollaboratorsInviteHandler.getAllInvites project_id, (error, invites) ->
return callback(error) if error? return callback(error) if error?
if !privilegeLevel? or privilegeLevel == PrivilegeLevels.NONE logger.log {project_id, user_id, memberCount: members.length, inviteCount: invites.length, privilegeLevel}, "returning project model view"
logger.log {project_id, user_id, privilegeLevel}, "not an acceptable privilege level, returning null" callback(null,
return callback null, null, false ProjectEditorHandler.buildProjectModelView(project, members, invites),
CollaboratorsInviteHandler.getAllInvites project_id, (error, invites) -> privilegeLevel
return callback(error) if error? )
logger.log {project_id, user_id, memberCount: members.length, inviteCount: invites.length, privilegeLevel}, "returning project model view"
callback(null,
ProjectEditorHandler.buildProjectModelView(project, members, invites),
privilegeLevel
)
_nameIsAcceptableLength: (name)-> _nameIsAcceptableLength: (name)->
return name? and name.length < 150 and name.length != 0 return name? and name.length < 150 and name.length != 0

5
services/web/test/unit/coffee/Editor/EditorHttpControllerTests.coffee
View file

@ -137,11 +137,6 @@ describe "EditorHttpController", ->
.calledWith(@project_id) .calledWith(@project_id)
.should.equal true .should.equal true
it "should look up the user", ->
@UserGetter.getUser
.calledWith(@user_id, { isAdmin: true })
.should.equal true
it "should check the privilege level", -> it "should check the privilege level", ->
@AuthorizationManager.getPrivilegeLevelForProject @AuthorizationManager.getPrivilegeLevelForProject
.calledWith(@user_id, @project_id, @token) .calledWith(@user_id, @project_id, @token)