address comments

Signed-off-by: Dave Lee <[email protected]>

Author: dave-gray101

docs/api/middleware/keyauth.md

@@ -219,7 +219,7 @@ curl --header "Authorization: Bearer my-super-secret-key"  http://localhost:3000
 | SuccessHandler | `fiber.Handler`                          | SuccessHandler defines a function which is executed for a valid key.                                 | `nil`                         |
 | ErrorHandler   | `fiber.ErrorHandler`                     | ErrorHandler defines a function which is executed for an invalid key.                                | `401 Invalid or expired key`  |
 | KeyLookup      | `string`                                 | KeyLookup is a string in the form of "`<source>:<name>`" that is used to extract key from the request. | "header:Authorization"        |
-| AdditionalKeyLookups | `[]string` | If additional fallback sources of keys are required, they can be specified here in order of precedence | []string{} (empty) |
+| FallbackKeyLookups | `[]string` | If additional fallback sources of keys are required, they can be specified here in order of precedence | []string{} (empty) |
 | AuthScheme     | `string`                                 | AuthScheme to be used in the Authorization header.                                                   | "Bearer"                      |
 | Validator      | `func(*fiber.Ctx, string) (bool, error)` | Validator is a function to validate the key.                                                         | A function for key validation |
 | ContextKey     | `interface{}`                            | Context key to store the bearer token from the token into context.                                   | "token"                       |
@@ -238,6 +238,7 @@ var ConfigDefault = Config{
 		return c.Status(fiber.StatusUnauthorized).SendString("Invalid or expired API Key")
 	},
 	KeyLookup:  "header:" + fiber.HeaderAuthorization,
+	FallbackKeyLookups: []string{},
 	AuthScheme: "Bearer",
 	ContextKey: "token",
 }

middleware/keyauth/config.go

@@ -32,9 +32,9 @@ type Config struct {
 	// - "cookie:<name>"
 	KeyLookup string
 
-	// AdditionalKeyLookups is a slice of strings, containing secondary sources of keys if KeyLookup does not find one
+	// FallbackKeyLookups is a slice of strings, containing secondary sources of keys if KeyLookup does not find one
 	// Each element should be a value used in KeyLookup
-	AdditionalKeyLookups []string
+	FallbackKeyLookups []string
 
 	// AuthScheme to be used in the Authorization header.
 	// Optional. Default value "Bearer".
@@ -88,8 +88,8 @@ func configDefault(config ...Config) Config {
 			cfg.AuthScheme = ConfigDefault.AuthScheme
 		}
 	}
-	if cfg.AdditionalKeyLookups == nil {
-		cfg.AdditionalKeyLookups = []string{}
+	if cfg.FallbackKeyLookups == nil {
+		cfg.FallbackKeyLookups = []string{}
 	}
 	if cfg.Validator == nil {
 		panic("fiber: keyauth middleware requires a validator function")

middleware/keyauth/keyauth.go

@@ -34,12 +34,12 @@ func New(config ...Config) fiber.Handler {
 	if err != nil {
 		panic(fmt.Errorf("error creating middleware: invalid keyauth Config.KeyLookup: %w", err))
 	}
-	if len(cfg.AdditionalKeyLookups) > 0 {
+	if len(cfg.FallbackKeyLookups) > 0 {
 		subExtractors := map[string]extractorFunc{cfg.KeyLookup: extractor}
-		for _, keyLookup := range cfg.AdditionalKeyLookups {
+		for _, keyLookup := range cfg.FallbackKeyLookups {
 			subExtractors[keyLookup], err = parseSingleExtractor(keyLookup, cfg.AuthScheme)
 			if err != nil {
-				panic(fmt.Errorf("error creating middleware: invalid keyauth Config.AdditionalKeyLookups[%s]: %w", keyLookup, err))
+				panic(fmt.Errorf("error creating middleware: invalid keyauth Config.FallbackKeyLookups[%s]: %w", keyLookup, err))
 			}
 		}
 		extractor = func(c *fiber.Ctx) (string, error) {

middleware/keyauth/keyauth_test.go

@@ -140,8 +140,8 @@ func TestMultipleKeyLookup(t *testing.T) {
 	// setup the fiber endpoint
 	app := fiber.New()
 	authMiddleware := New(Config{
-		KeyLookup:            "header:key",
-		AdditionalKeyLookups: []string{"cookie:key", "query:key"},
+		KeyLookup:          "header:key",
+		FallbackKeyLookups: []string{"cookie:key", "query:key"},
 		Validator: func(c *fiber.Ctx, key string) (bool, error) {
 			if key == CorrectKey {
 				return true, nil