Move default email checking logic into the data service.

services/web/public/coffee/main/account-settings.coffee

@@ -25,9 +25,8 @@ define [
 				resolve:
 					userDefaultEmail: () ->
 						UserAffiliationsDataService
-							.getUserEmails()
-							.then (userEmails) ->
-								defaultEmailDetails = _.find userEmails, (userEmail) -> userEmail.default
+							.getUserDefaultEmail()
+							.then (defaultEmailDetails) ->
 								return defaultEmailDetails?.email or null
 							.catch () -> null
 			)

services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee

@@ -31,6 +31,10 @@ define [
 			$http.get "/user/emails"
 				.then (response) -> response.data
 
+		getUserDefaultEmail = () ->
+			getUserEmails().then (userEmails) ->
+				_.find userEmails, (userEmail) -> userEmail.default
+
 		getUniversitiesFromCountry = (country) ->
 			if universities[country.code]?
 				universitiesFromCountry = universities[country.code]
@@ -118,6 +122,7 @@ define [
 			getDefaultRoleHints
 			getDefaultDepartmentHints
 			getUserEmails
+			getUserDefaultEmail
 			getUniversitiesFromCountry
 			getUniversityDomainFromPartialDomainInput
 			getUniversityDetails