fix: option interface honor interface{} instead of startegy for more …

…flexibility
shaj13 · Aug 14, 2020 · 091444e · 091444e
1 parent c31102b
commit 091444e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/auth/strategies/basic/basic.go b/auth/strategies/basic/basic.go
@@ -144,8 +144,8 @@ func NewWithOptions(f AuthenticateFunc, cache store.Cache, opts ...auth.Option)
 
 // SetHash set the hashing algorithm to hash the user password.
 func SetHash(h crypto.Hash) auth.Option {
-	return auth.OptionFunc(func(s auth.Strategy) {
-		if v, ok := s.(*cachedBasic); ok {
+	return auth.OptionFunc(func(v interface{}) {
+		if v, ok := v.(*cachedBasic); ok {
 			v.hash = h
 		}
 	})

diff --git a/auth/strategies/token/token.go b/auth/strategies/token/token.go
@@ -29,8 +29,8 @@ const (
 // SetType sets the authentication token type or scheme,
 // used for HTTP WWW-Authenticate header.
 func SetType(t Type) auth.Option {
-	return auth.OptionFunc(func(s auth.Strategy) {
-		switch v := s.(type) {
+	return auth.OptionFunc(func(v interface{}) {
+		switch v := v.(type) {
 		case *Static:
 			v.Type = t
 		case *cachedToken:
@@ -41,8 +41,8 @@ func SetType(t Type) auth.Option {
 
 // SetParser sets the strategy token parser.
 func SetParser(p Parser) auth.Option {
-	return auth.OptionFunc(func(s auth.Strategy) {
-		switch v := s.(type) {
+	return auth.OptionFunc(func(v interface{}) {
+		switch v := v.(type) {
 		case *Static:
 			v.Parser = p
 		case *cachedToken:

diff --git a/auth/strategy.go b/auth/strategy.go
@@ -24,15 +24,15 @@ type Strategy interface {
 // see https://commandcenter.blogspot.com/2014/01/self-referential-functions-and-design.html and
 // https://dave.cheney.net/2014/10/17/functional-options-for-friendly-apis.
 type Option interface {
-	Apply(s Strategy)
+	Apply(v interface{})
 }
 
 // OptionFunc implements Option interface.
-type OptionFunc func(s Strategy)
+type OptionFunc func(v interface{})
 
 // Apply the configuration to the provided strategy.
-func (fn OptionFunc) Apply(s Strategy) {
-	fn(s)
+func (fn OptionFunc) Apply(v interface{}) {
+	fn(v)
 }
 
 // Append new Info to a strategy store.