Rename variable for clarity and make expected auds check more specific

Author: hdonCr

parser_option.go

@@ -89,7 +89,7 @@ func WithAudience(aud string) ParserOption {
 func WithAudiences(auds []string, matchAll bool) ParserOption {
 	return func(p *Parser) {
 		p.validator.expectedAuds = auds
-		p.validator.expectedAudsMatchAll = matchAll
+		p.validator.matchAllAud = matchAll
 	}
 }
 

validator.go

@@ -59,8 +59,8 @@ type Validator struct {
 	// []string will disable auds checking.
 	expectedAuds []string
 
-	// expectedAudsMatchAll specifies whether all expected audiences must match all auds from claim
-	expectedAudsMatchAll bool
+	// matchAllAud specifies whether all expected audiences must match all auds from claim
+	matchAllAud bool
 
 	// expectedIss contains the issuer this token expects. Supplying an empty
 	// string will disable iss checking.
@@ -134,10 +134,10 @@ func (v *Validator) Validate(claims Claims) error {
 	}
 
 	// If we have expected audiences, we also require the audiences claim
-	if len(v.expectedAuds) != 0 {
-			if err := v.verifyAudiences(claims, v.expectedAuds, true, v.expectedAudsMatchAll); err != nil {
-				errs = append(errs, err)
-			}
+	if len(v.expectedAuds) > 0 {
+		if err := v.verifyAudiences(claims, v.expectedAuds, true, v.matchAllAud); err != nil {
+			errs = append(errs, err)
+		}
 	}
 
 	// If we have an expected issuer, we also require the issuer claim
@@ -331,7 +331,7 @@ func (v *Validator) verifyAudiences(claims Claims, cmps []string, required bool,
 
 		matchFound := false
 
-	// Label to break out of both loops if a match is found
+		// Label to break out of both loops if a match is found
 	outer:
 
 		// Check all aud values