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

Use null to represent anonymous user, as AuthorizationManager expects

James Allen 10 лет назад
Родитель
Сommit
2af2dd694e
1 измененных файлов с 3 добавлено и 3 удалено
  1. 3 3
      services/web/app/coffee/Features/Project/ProjectController.coffee

+ 3 - 3
services/web/app/coffee/Features/Project/ProjectController.coffee

@@ -188,7 +188,7 @@ module.exports = ProjectController =
 			anonymous = false
 			anonymous = false
 		else
 		else
 			anonymous = true
 			anonymous = true
-			user_id = 'openUser'
+			user_id = null
 
 
 		project_id = req.params.Project_id
 		project_id = req.params.Project_id
 		logger.log project_id:project_id, "loading editor"
 		logger.log project_id:project_id, "loading editor"
@@ -197,14 +197,14 @@ module.exports = ProjectController =
 			project: (cb)->
 			project: (cb)->
 				ProjectGetter.getProject project_id, { name: 1, lastUpdated: 1}, cb
 				ProjectGetter.getProject project_id, { name: 1, lastUpdated: 1}, cb
 			user: (cb)->
 			user: (cb)->
-				if user_id == 'openUser'
+				if !user_id?
 					cb null, defaultSettingsForAnonymousUser(user_id)
 					cb null, defaultSettingsForAnonymousUser(user_id)
 				else
 				else
 					User.findById user_id, (err, user)->
 					User.findById user_id, (err, user)->
 						logger.log project_id:project_id, user_id:user_id, "got user"
 						logger.log project_id:project_id, user_id:user_id, "got user"
 						cb err, user
 						cb err, user
 			subscription: (cb)->
 			subscription: (cb)->
-				if user_id == 'openUser'
+				if !user_id?
 					return cb()
 					return cb()
 				SubscriptionLocator.getUsersSubscription user_id, cb
 				SubscriptionLocator.getUsersSubscription user_id, cb
 			activate: (cb)->
 			activate: (cb)->