Просмотр исходного кода

Merge pull request #921 from sharelatex/ta-remove-unused-call

Remove Unused Call to UserGetter.getUser
Timothée Alby 8 лет назад
Родитель
Сommit
b14fe82c1c

+ 11 - 13
services/web/app/coffee/Features/Editor/EditorHttpController.coffee

@@ -41,21 +41,19 @@ module.exports = EditorHttpController =
 			return callback(new Error("not found")) if !project?
 			CollaboratorsHandler.getInvitedMembersWithPrivilegeLevels project_id, (error, members) ->
 				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?
-					token = TokenAccessHandler.getRequestToken(req, project_id)
-					AuthorizationManager.getPrivilegeLevelForProject user_id, project_id, token, (error, privilegeLevel) ->
+					if !privilegeLevel? or privilegeLevel == PrivilegeLevels.NONE
+						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?
-						if !privilegeLevel? or privilegeLevel == PrivilegeLevels.NONE
-							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?
-							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
-							)
+						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)->
 		return name? and name.length < 150 and name.length != 0

+ 0 - 5
services/web/test/unit/coffee/Editor/EditorHttpControllerTests.coffee

@@ -137,11 +137,6 @@ describe "EditorHttpController", ->
 					.calledWith(@project_id)
 					.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", ->
 				@AuthorizationManager.getPrivilegeLevelForProject
 					.calledWith(@user_id, @project_id, @token)