Merge pull request #4051 from nickmango/bug/approval-regex

[#4006] Bug/Approval List handles
communitybridge · Jul 18, 2023 · 5cbc48f · 5cbc48f
2 parents 7822ba7 + 4e06eba
commit 5cbc48f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/cla-backend-go/github/github_repository.go b/cla-backend-go/github/github_repository.go
@@ -140,21 +140,32 @@ func (u UserCommitSummary) GetDisplayText(tagUser bool) string {
 }
 
 func (u UserCommitSummary) getUserInfo(tagUser bool) string {
+
+	f := logrus.Fields{
+		"functionName": "github.github_repository.getUserInfo",
+		"tagUser":      tagUser,
+	}
+
 	userInfo := ""
 	tagValue := ""
 	var sb strings.Builder
 	sb.WriteString(userInfo)
 
+	log.WithFields(f).Debugf("author: %+v", u.CommitAuthor)
+
 	if tagUser {
 		tagValue = "@"
 	}
-	if *u.CommitAuthor.Login != "" {
-		sb.WriteString(fmt.Sprintf("login: %s%s / ", tagValue, *u.CommitAuthor.Login))
-	}
+	if u.CommitAuthor != nil {
+		if *u.CommitAuthor.Login != "" {
+			sb.WriteString(fmt.Sprintf("login: %s%s / ", tagValue, *u.CommitAuthor.Login))
+		}
 
-	if u.CommitAuthor.Name != nil {
-		sb.WriteString(fmt.Sprintf("%sname: %s / ", userInfo, utils.StringValue(u.CommitAuthor.Name)))
+		if u.CommitAuthor.Name != nil {
+			sb.WriteString(fmt.Sprintf("%sname: %s / ", userInfo, utils.StringValue(u.CommitAuthor.Name)))
+		}
 	}
+
 	return strings.Replace(sb.String(), "/ $", "", -1)
 }
 

diff --git a/cla-backend-go/utils/validators.go b/cla-backend-go/utils/validators.go
@@ -96,7 +96,7 @@ func ValidGitHubUsername(githubUsername string) (string, bool) {
 	}
 
 	// For now, we only allow alphanumeric values
-	re := regexp.MustCompile("^[a-zA-Z0-9_-]*$")
+	re := regexp.MustCompile("^[a-zA-Z0-9._-]*$")
 	valid := re.MatchString(strings.TrimSpace(githubUsername))
 	if !valid {
 		return fmt.Sprintf("invalid GitHub username: %s", githubUsername), false
@@ -113,7 +113,7 @@ func ValidGitlabUsername(gitlabUsername string) (string, bool) {
 	}
 
 	// For now, we only allow alphanumeric values
-	re := regexp.MustCompile("^[a-zA-Z0-9_-]*$")
+	re := regexp.MustCompile("^[a-zA-Z0-9._-]*$")
 	valid := re.MatchString(strings.TrimSpace(gitlabUsername))
 	if !valid {
 		return fmt.Sprintf("invalid Gitlab username: %s", gitlabUsername), false