Skip to content

Commit 0c3f707

Browse files
authored
Merge pull request #4473 from nickmango/feature/authorize-api
[#4472] Approval List search
2 parents 373849c + c40885f commit 0c3f707

File tree

2 files changed

+15
-3
lines changed

2 files changed

+15
-3
lines changed

cla-backend-go/signatures/service.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1316,9 +1316,11 @@ func (s service) UserIsApproved(ctx context.Context, user *models.User, cclaSign
13161316
if len(emailApprovalList) > 0 {
13171317
for _, email := range emails {
13181318
log.WithFields(f).Debugf("checking email: %s", email)
1319-
if utils.StringInSlice(email, emailApprovalList) {
1320-
log.WithFields(f).Debugf("found matching email: %s in the email approval list", email)
1321-
return true, nil
1319+
// case insensitive search
1320+
for _, emailApproval := range emailApprovalList {
1321+
if strings.EqualFold(email, emailApproval) {
1322+
return true, nil
1323+
}
13221324
}
13231325
}
13241326
} else {

cla-backend-go/signatures/service_test.go

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,16 @@ func TestUserIsApproved(t *testing.T) {
7070
},
7171
expectedIsApproved: true,
7272
},
73+
{
74+
name: "Test user email case - email approval",
75+
user: &v1Models.User{
76+
Emails: []string{"[email protected]"},
77+
},
78+
cclaSignature: &v1Models.Signature{
79+
EmailApprovalList: []string{"[email protected]"},
80+
},
81+
expectedIsApproved: true,
82+
},
7383
}
7484

7585
for _, tc := range testCases {

0 commit comments

Comments
 (0)