[#2792] Bug/Domain Approval Removal (#2848)

- Invalidate icla/ecla resolved by searching email against domain Signed-off-by: nickmango <[email protected]>
communitybridge · Apr 2, 2021 · 54ab0cc · 54ab0cc
1 parent 7269605
commit 54ab0cc
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/cla-backend-go/signatures/repository.go b/cla-backend-go/signatures/repository.go
@@ -2518,7 +2518,9 @@ func (repo repository) verifyUserApprovals(ctx context.Context, userID, signatur
 
 	if approvalList.Criteria == utils.EmailDomainCriteria {
 		// Handle Domains
-		if utils.StringInSlice(getBestEmail(user), approvalList.DomainApprovals) {
+		email := getBestEmail(user)
+		domain := strings.Split(email, "@")[1]
+		if utils.StringInSlice(domain, approvalList.DomainApprovals) {
 			if !utils.StringInSlice(user.GithubUsername, approvalList.GitHubUsernameApprovals) && !utils.StringInSlice(getBestEmail(user), approvalList.EmailApprovals) {
 				//Invalidate record
 				note := fmt.Sprintf("Signature invalidated (approved set to false) by %s due to %s  removal", utils.GetBestUsername(claManager), utils.EmailDomainCriteria)