Browse Source

Avoid suggesting blacklisted emails as university domains.

Paulo Reis 8 năm trước cách đây
mục cha
commit
3e0ad47873

+ 1 - 2
services/web/public/coffee/main/affiliations/controllers/UserAffiliationsController.coffee

@@ -26,7 +26,6 @@ define [
 			$scope.ui.showManualUniversitySelectionUI = false
 			if userInputLocalAndDomain.domain?
 				$scope.ui.isBlacklistedEmail = UserAffiliationsDataService.isDomainBlacklisted userInputLocalAndDomain.domain
-
 				UserAffiliationsDataService.getUniversityDomainFromPartialDomainInput(userInputLocalAndDomain.domain)
 					.then (universityDomain) ->
 						currentUserInputLocalAndDomain = _matchLocalAndDomain $scope.newAffiliation.email
@@ -44,7 +43,7 @@ define [
 			else
 				$scope.newAffiliation.university = null
 				$scope.newAffiliation.department = null
-				$q.resolve null
+				$q.reject null
 
 		$scope.handleEmailInputBlur = () ->
 			# if $scope.newAffiliation.autoDetectMode and !$scope.newAffiliation.university and $scope.newAffiliation.email?.match EMAIL_REGEX

+ 1 - 1
services/web/public/coffee/main/affiliations/factories/UserAffiliationsDataService.coffee

@@ -39,7 +39,7 @@ define [
 				$http.get "/institutions/domains" , { params: { hostname: partialDomainInput, limit: 1 } }
 					.then (response) ->
 						university = response.data[0]
-						if university?
+						if university? and !isDomainBlacklisted university.hostname
 							universitiesByDomain[university.hostname] = university
 							$q.resolve university
 						else