Przeglądaj źródła

Add "[TokenAccess]" context to log lines

Shane Kilkelly 9 lat temu
rodzic
commit
a212fb1a05

+ 19 - 19
services/web/app/coffee/Features/TokenAccess/TokenAccessController.coffee

@@ -14,53 +14,53 @@ module.exports = TokenAccessController =
 	readAndWriteToken: (req, res, next) ->
 		userId = AuthenticationController.getLoggedInUserId(req)
 		token = req.params['read_and_write_token']
-		logger.log {userId, token}, "requesting read-and-write token access"
+		logger.log {userId, token}, "[TokenAccess] requesting read-and-write token access"
 		TokenAccessHandler.findProjectWithReadAndWriteToken token, (err, project) ->
 			if err?
 				logger.err {err, token, userId},
-					"error getting project by readAndWrite token"
+					"[TokenAccess] error getting project by readAndWrite token"
 				return next(err)
 			if !project?
 				logger.log {token, userId},
-					"no project found for readAndWrite token"
+					"[TokenAccess] no project found for readAndWrite token"
 				if !userId?
 					logger.log {token},
-						"No project found with read-write token, anonymous user"
+						"[TokenAccess] No project found with read-write token, anonymous user"
 					return next(new Errors.NotFoundError())
 				TokenAccessHandler
 					.findPrivateOverleafProjectWithReadAndWriteToken token, (err, project) ->
 						if err?
 							logger.err {err, token, userId},
-								"error getting project by readAndWrite token"
+								"[TokenAccess] error getting project by readAndWrite token"
 							return next(err)
 						if !project?
 							logger.log {token, userId},
-								"no private-overleaf project found with readAndWriteToken"
+								"[TokenAccess] no private-overleaf project found with readAndWriteToken"
 							return next(new Errors.NotFoundError())
-						logger.log {token, projectId: project._id}, "redirecting user to project"
+						logger.log {token, projectId: project._id}, "[TokenAccess] redirecting user to project"
 						res.redirect(302, "/project/#{project._id}")
 			else
 				if !userId?
 					if TokenAccessHandler.ANONYMOUS_READ_AND_WRITE_ENABLED
 						logger.log {token, projectId: project._id},
-							"allow anonymous read-and-write token access"
+							"[TokenAccess] allow anonymous read-and-write token access"
 						TokenAccessHandler.grantSessionTokenAccess(req, project._id, token)
 						req._anonymousAccessToken = token
 						return TokenAccessController._loadEditor(project._id, req, res, next)
 					else
 						logger.log {token, projectId: project._id},
-							"deny anonymous read-and-write token access"
+							"[TokenAccess] deny anonymous read-and-write token access"
 						return next(new Errors.NotFoundError())
 				if project.owner_ref.toString() == userId
 					logger.log {userId, projectId: project._id},
-						"user is already project owner"
+						"[TokenAccess] user is already project owner"
 					return TokenAccessController._loadEditor(project._id, req, res, next)
 				logger.log {userId, projectId: project._id},
-					"adding user to project with readAndWrite token"
+					"[TokenAccess] adding user to project with readAndWrite token"
 				TokenAccessHandler.addReadAndWriteUserToProject userId, project._id, (err) ->
 					if err?
 						logger.err {err, token, userId, projectId: project._id},
-							"error adding user to project with readAndWrite token"
+							"[TokenAccess] error adding user to project with readAndWrite token"
 						return next(err)
 					# TODO: check if this is still needed by the client
 					setTimeout( () ->
@@ -74,33 +74,33 @@ module.exports = TokenAccessController =
 	readOnlyToken: (req, res, next) ->
 		userId = AuthenticationController.getLoggedInUserId(req)
 		token = req.params['read_only_token']
-		logger.log {userId, token}, "requesting read-only token access"
+		logger.log {userId, token}, "[TokenAccess] requesting read-only token access"
 		TokenAccessHandler.findProjectWithReadOnlyToken token, (err, project) ->
 			if err?
 				logger.err {err, token, userId},
-					"error getting project by readOnly token"
+					"[TokenAccess] error getting project by readOnly token"
 				return next(err)
 			if !project?
 				logger.log {token, userId},
-					"no project found for readAndWrite token"
+					"[TokenAccess] no project found for readAndWrite token"
 				return next(new Errors.NotFoundError())
 			if !userId?
 				logger.log {userId, projectId: project._id},
-					"adding anonymous user to project with readOnly token"
+					"[TokenAccess] adding anonymous user to project with readOnly token"
 				TokenAccessHandler.grantSessionTokenAccess(req, project._id, token)
 				req._anonymousAccessToken = token
 				return TokenAccessController._loadEditor(project._id, req, res, next)
 			else
 				if project.owner_ref.toString() == userId
 					logger.log {userId, projectId: project._id},
-						"user is already project owner"
+						"[TokenAccess] user is already project owner"
 					return TokenAccessController._loadEditor(project._id, req, res, next)
 				logger.log {userId, projectId: project._id},
-					"adding user to project with readOnly token"
+					"[TokenAccess] adding user to project with readOnly token"
 				TokenAccessHandler.addReadOnlyUserToProject userId, project._id, (err) ->
 					if err?
 						logger.err {err, token, userId, projectId: project._id},
-							"error adding user to project with readAndWrite token"
+							"[TokenAccess] error adding user to project with readAndWrite token"
 						return next(err)
 					return TokenAccessController._loadEditor(project._id, req, res, next)