Move email parsing code to Helpers/EmailHelpers

services/web/app/coffee/Features/Collaborators/CollaboratorsController.coffee

@@ -4,7 +4,8 @@ ProjectEditorHandler = require "../Project/ProjectEditorHandler"
 EditorRealTimeController = require "../Editor/EditorRealTimeController"
 LimitationsManager = require "../Subscription/LimitationsManager"
 UserGetter = require "../User/UserGetter"
-mimelib = require("mimelib")
+EmailHelpers = require "../Helpers/EmailHelpers"
+
 
 module.exports = CollaboratorsController =
 	addUserToProject: (req, res, next) ->
@@ -17,7 +18,7 @@ module.exports = CollaboratorsController =
 			else
 				{email, privileges} = req.body
 
-				email = mimelib.parseAddresses(email or "")[0]?.address?.toLowerCase()
+				email = EmailHelpers.parseEmail(email)
 				if !email? or email == ""
 					return res.status(400).send("invalid email address")
 
@@ -49,4 +50,3 @@ module.exports = CollaboratorsController =
 			return callback(error) if error?
 			EditorRealTimeController.emitToRoom(project_id, 'userRemovedFromProject', user_id)
 			callback()
-

services/web/app/coffee/Features/Collaborators/CollaboratorsHandler.coffee

@@ -1,6 +1,5 @@
 UserCreator = require('../User/UserCreator')
 Project = require("../../models/Project").Project
-mimelib = require("mimelib")
 logger = require('logger-sharelatex')
 UserGetter = require "../User/UserGetter"
 ContactManager = require "../Contacts/ContactManager"
@@ -8,8 +7,11 @@ CollaboratorsEmailHandler = require "./CollaboratorsEmailHandler"
 async = require "async"
 PrivilegeLevels = require "../Authorization/PrivilegeLevels"
 Errors = require "../Errors/Errors"
+EmailHelpers = require "../Helpers/EmailHelpers"
+
 
 module.exports = CollaboratorsHandler =
+
 	getMemberIdsWithPrivilegeLevels: (project_id, callback = (error, members) ->) ->
 		Project.findOne { _id: project_id }, { owner_ref: 1, collaberator_refs: 1, readOnly_refs: 1 }, (error, project) ->
 			return callback(error) if error?
@@ -100,8 +102,7 @@ module.exports = CollaboratorsHandler =
 			async.series jobs, callback
 
 	addEmailToProject: (project_id, adding_user_id, unparsed_email, privilegeLevel, callback = (error, user) ->) ->
-		emails = mimelib.parseAddresses(unparsed_email)
-		email = emails[0]?.address?.toLowerCase()
+		email = EmailHelpers.parseEmail(unparsed_email)
 		if !email? or email == ""
 			return callback(new Error("no valid email provided: '#{unparsed_email}'"))
 		UserCreator.getUserOrCreateHoldingAccount email, (error, user) ->

services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee

@@ -3,8 +3,9 @@ LimitationsManager = require "../Subscription/LimitationsManager"
 UserGetter = require "../User/UserGetter"
 Project = require("../../models/Project").Project
 CollaboratorsInviteHandler = require('./CollaboratorsInviteHandler')
-mimelib = require("mimelib")
 logger = require('logger-sharelatex')
+EmailHelpers = require "../Helpers/EmailHelpers"
+
 
 module.exports = CollaboratorsInviteController =
 
@@ -28,7 +29,7 @@ module.exports = CollaboratorsInviteController =
 				logger.log {projectId, email, sendingUserId}, "not allowed to invite more users to project"
 				return res.json {invite: null}
 			{email, privileges} = req.body
-			email = mimelib.parseAddresses(email or "")[0]?.address?.toLowerCase()
+			email = EmailHelpers.parseEmail(email)
 			if !email? or email == ""
 				logger.log {projectId, email, sendingUserId}, "invalid email address"
 				return res.sendStatus(400)

services/web/app/coffee/Features/Collaborators/CollaboratorsInviteHandler.coffee

@@ -1,5 +1,4 @@
 ProjectInvite = require("../../models/ProjectInvite").ProjectInvite
-mimelib = require("mimelib")
 logger = require('logger-sharelatex')
 CollaboratorsEmailHandler = require "./CollaboratorsEmailHandler"
 CollaboratorsHandler = require "./CollaboratorsHandler"

services/web/app/coffee/Features/Helpers/EmailHelpers.coffee

@@ -0,0 +1,11 @@
+mimelib = require("mimelib")
+
+
+module.exports = EmailHelpers =
+
+	parseEmail: (email) ->
+			email = mimelib.parseAddresses(email or "")[0]?.address?.toLowerCase()
+			if !email? or email == ""
+				return null
+			else
+				return email