From 2494026b85218d95812c7e82f437eda4d4f9ebbf Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Tue, 2 Aug 2016 15:42:26 +0100
Subject: [PATCH] Move Helpers/EmailHelpers to Helpers/EmailHelper

---
 .../Features/Collaborators/CollaboratorsController.coffee     | 4 ++--
 .../coffee/Features/Collaborators/CollaboratorsHandler.coffee | 4 ++--
 .../Collaborators/CollaboratorsInviteController.coffee        | 4 ++--
 .../Helpers/{EmailHelpers.coffee => EmailHelper.coffee}       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename services/web/app/coffee/Features/Helpers/{EmailHelpers.coffee => EmailHelper.coffee} (86%)

diff --git a/services/web/app/coffee/Features/Collaborators/CollaboratorsController.coffee b/services/web/app/coffee/Features/Collaborators/CollaboratorsController.coffee
index 662e3109e3..9e04b5e990 100644
--- a/services/web/app/coffee/Features/Collaborators/CollaboratorsController.coffee
+++ b/services/web/app/coffee/Features/Collaborators/CollaboratorsController.coffee
@@ -4,7 +4,7 @@ ProjectEditorHandler = require "../Project/ProjectEditorHandler"
 EditorRealTimeController = require "../Editor/EditorRealTimeController"
 LimitationsManager = require "../Subscription/LimitationsManager"
 UserGetter = require "../User/UserGetter"
-EmailHelpers = require "../Helpers/EmailHelpers"
+EmailHelper = require "../Helpers/EmailHelper"
 
 
 module.exports = CollaboratorsController =
@@ -18,7 +18,7 @@ module.exports = CollaboratorsController =
 			else
 				{email, privileges} = req.body
 
-				email = EmailHelpers.parseEmail(email)
+				email = EmailHelper.parseEmail(email)
 				if !email? or email == ""
 					return res.status(400).send("invalid email address")
 
diff --git a/services/web/app/coffee/Features/Collaborators/CollaboratorsHandler.coffee b/services/web/app/coffee/Features/Collaborators/CollaboratorsHandler.coffee
index 4b48f97304..58ad246b60 100644
--- a/services/web/app/coffee/Features/Collaborators/CollaboratorsHandler.coffee
+++ b/services/web/app/coffee/Features/Collaborators/CollaboratorsHandler.coffee
@@ -7,7 +7,7 @@ CollaboratorsEmailHandler = require "./CollaboratorsEmailHandler"
 async = require "async"
 PrivilegeLevels = require "../Authorization/PrivilegeLevels"
 Errors = require "../Errors/Errors"
-EmailHelpers = require "../Helpers/EmailHelpers"
+EmailHelper = require "../Helpers/EmailHelper"
 
 
 module.exports = CollaboratorsHandler =
@@ -102,7 +102,7 @@ module.exports = CollaboratorsHandler =
 			async.series jobs, callback
 
 	addEmailToProject: (project_id, adding_user_id, unparsed_email, privilegeLevel, callback = (error, user) ->) ->
-		email = EmailHelpers.parseEmail(unparsed_email)
+		email = EmailHelper.parseEmail(unparsed_email)
 		if !email? or email == ""
 			return callback(new Error("no valid email provided: '#{unparsed_email}'"))
 		UserCreator.getUserOrCreateHoldingAccount email, (error, user) ->
diff --git a/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee b/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee
index e91dd308a0..11d8230059 100644
--- a/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee
+++ b/services/web/app/coffee/Features/Collaborators/CollaboratorsInviteController.coffee
@@ -4,7 +4,7 @@ UserGetter = require "../User/UserGetter"
 Project = require("../../models/Project").Project
 CollaboratorsInviteHandler = require('./CollaboratorsInviteHandler')
 logger = require('logger-sharelatex')
-EmailHelpers = require "../Helpers/EmailHelpers"
+EmailHelper = require "../Helpers/EmailHelper"
 
 
 module.exports = CollaboratorsInviteController =
@@ -29,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 = EmailHelpers.parseEmail(email)
+			email = EmailHelper.parseEmail(email)
 			if !email? or email == ""
 				logger.log {projectId, email, sendingUserId}, "invalid email address"
 				return res.sendStatus(400)
diff --git a/services/web/app/coffee/Features/Helpers/EmailHelpers.coffee b/services/web/app/coffee/Features/Helpers/EmailHelper.coffee
similarity index 86%
rename from services/web/app/coffee/Features/Helpers/EmailHelpers.coffee
rename to services/web/app/coffee/Features/Helpers/EmailHelper.coffee
index 6c2644875e..7bc93888fd 100644
--- a/services/web/app/coffee/Features/Helpers/EmailHelpers.coffee
+++ b/services/web/app/coffee/Features/Helpers/EmailHelper.coffee
@@ -1,7 +1,7 @@
 mimelib = require("mimelib")
 
 
-module.exports = EmailHelpers =
+module.exports = EmailHelper =
 
 	parseEmail: (email) ->
 			email = mimelib.parseAddresses(email or "")[0]?.address?.toLowerCase()