chore: replace interface{} with any (#448)

This PR replaces all occurances of interface{} with any to be consistent and improve readability.

* example: Replace `interface{}` with `any`

Signed-off-by: Thomas Hipp <thomashipp@gmail.com>

* pkg/client: Replace `interface{}` with `any`

Signed-off-by: Thomas Hipp <thomashipp@gmail.com>

* pkg/crypto: Replace `interface{}` with `any`

Signed-off-by: Thomas Hipp <thomashipp@gmail.com>

* pkg/http: Replace `interface{}` with `any`

Signed-off-by: Thomas Hipp <thomashipp@gmail.com>

* pkg/oidc: Replace `interface{}` with `any`

Signed-off-by: Thomas Hipp <thomashipp@gmail.com>

* pkg/op: Replace `interface{}` with `any`

Signed-off-by: Thomas Hipp <thomashipp@gmail.com>

---------

Signed-off-by: Thomas Hipp <thomashipp@gmail.com>

example/client/service/service.go

@@ -125,7 +125,7 @@ func main() {
 		testURL := r.Form.Get("url")
 		var data struct {
 			URL      string
-			Response interface{}
+			Response any
 		}
 		if testURL != "" {
 			data.URL = testURL
@@ -149,7 +149,7 @@ func main() {
 	logrus.Fatal(http.ListenAndServe("127.0.0.1:"+port, nil))
 }
 
-func callExampleEndpoint(client *http.Client, testURL string) (interface{}, error) {
+func callExampleEndpoint(client *http.Client, testURL string) (any, error) {
 	req, err := http.NewRequest("GET", testURL, nil)
 	if err != nil {
 		return nil, err

example/server/storage/storage.go

@@ -61,7 +61,7 @@ func (s *signingKey) SignatureAlgorithm() jose.SignatureAlgorithm {
 	return s.algorithm
 }
 
-func (s *signingKey) Key() interface{} {
+func (s *signingKey) Key() any {
 	return s.key
 }
 
@@ -85,7 +85,7 @@ func (s *publicKey) Use() string {
 	return "sig"
 }
 
-func (s *publicKey) Key() interface{} {
+func (s *publicKey) Key() any {
 	return &s.key.PublicKey
 }
 
@@ -525,11 +525,11 @@ func (s *Storage) SetIntrospectionFromToken(ctx context.Context, introspection *
 
 // GetPrivateClaimsFromScopes implements the op.Storage interface
 // it will be called for the creation of a JWT access token to assert claims for custom scopes
-func (s *Storage) GetPrivateClaimsFromScopes(ctx context.Context, userID, clientID string, scopes []string) (claims map[string]interface{}, err error) {
+func (s *Storage) GetPrivateClaimsFromScopes(ctx context.Context, userID, clientID string, scopes []string) (claims map[string]any, err error) {
 	return s.getPrivateClaimsFromScopes(ctx, userID, clientID, scopes)
 }
 
-func (s *Storage) getPrivateClaimsFromScopes(ctx context.Context, userID, clientID string, scopes []string) (claims map[string]interface{}, err error) {
+func (s *Storage) getPrivateClaimsFromScopes(ctx context.Context, userID, clientID string, scopes []string) (claims map[string]any, err error) {
 	for _, scope := range scopes {
 		switch scope {
 		case CustomScope:
@@ -713,7 +713,7 @@ func (s *Storage) CreateTokenExchangeRequest(ctx context.Context, request op.Tok
 // GetPrivateClaimsFromScopesForTokenExchange implements the op.TokenExchangeStorage interface
 // it will be called for the creation of an exchanged JWT access token to assert claims for custom scopes
 // plus adding token exchange specific claims related to delegation or impersonation
-func (s *Storage) GetPrivateClaimsFromTokenExchangeRequest(ctx context.Context, request op.TokenExchangeRequest) (claims map[string]interface{}, err error) {
+func (s *Storage) GetPrivateClaimsFromTokenExchangeRequest(ctx context.Context, request op.TokenExchangeRequest) (claims map[string]any, err error) {
 	claims, err = s.getPrivateClaimsFromScopes(ctx, "", request.GetClientID(), request.GetScopes())
 	if err != nil {
 		return nil, err
@@ -742,20 +742,20 @@ func (s *Storage) SetUserinfoFromTokenExchangeRequest(ctx context.Context, useri
 	return nil
 }
 
-func (s *Storage) getTokenExchangeClaims(ctx context.Context, request op.TokenExchangeRequest) (claims map[string]interface{}) {
+func (s *Storage) getTokenExchangeClaims(ctx context.Context, request op.TokenExchangeRequest) (claims map[string]any) {
 	for _, scope := range request.GetScopes() {
 		switch {
 		case strings.HasPrefix(scope, CustomScopeImpersonatePrefix) && request.GetExchangeActor() == "":
 			// Set actor subject claim for impersonation flow
-			claims = appendClaim(claims, "act", map[string]interface{}{
+			claims = appendClaim(claims, "act", map[string]any{
 				"sub": request.GetExchangeSubject(),
 			})
 		}
 	}
 
 	// Set actor subject claim for delegation flow
 	// if request.GetExchangeActor() != "" {
-	// 	claims = appendClaim(claims, "act", map[string]interface{}{
+	// 	claims = appendClaim(claims, "act", map[string]any{
 	// 		"sub": request.GetExchangeActor(),
 	// 	})
 	// }
@@ -777,16 +777,16 @@ func getInfoFromRequest(req op.TokenRequest) (clientID string, authTime time.Tim
 }
 
 // customClaim demonstrates how to return custom claims based on provided information
-func customClaim(clientID string) map[string]interface{} {
-	return map[string]interface{}{
+func customClaim(clientID string) map[string]any {
+	return map[string]any{
 		"client": clientID,
 		"other":  "stuff",
 	}
 }
 
-func appendClaim(claims map[string]interface{}, claim string, value interface{}) map[string]interface{} {
+func appendClaim(claims map[string]any, claim string, value any) map[string]any {
 	if claims == nil {
-		claims = make(map[string]interface{})
+		claims = make(map[string]any)
 	}
 	claims[claim] = value
 	return claims

example/server/storage/storage_dynamic.go

@@ -239,7 +239,7 @@ func (s *multiStorage) SetIntrospectionFromToken(ctx context.Context, introspect
 
 // GetPrivateClaimsFromScopes implements the op.Storage interface
 // it will be called for the creation of a JWT access token to assert claims for custom scopes
-func (s *multiStorage) GetPrivateClaimsFromScopes(ctx context.Context, userID, clientID string, scopes []string) (claims map[string]interface{}, err error) {
+func (s *multiStorage) GetPrivateClaimsFromScopes(ctx context.Context, userID, clientID string, scopes []string) (claims map[string]any, err error) {
 	storage, err := s.storageFromContext(ctx)
 	if err != nil {
 		return nil, err

pkg/client/client.go

@@ -48,11 +48,11 @@ type TokenEndpointCaller interface {
 	HttpClient() *http.Client
 }
 
-func CallTokenEndpoint(request interface{}, caller TokenEndpointCaller) (newToken *oauth2.Token, err error) {
+func CallTokenEndpoint(request any, caller TokenEndpointCaller) (newToken *oauth2.Token, err error) {
 	return callTokenEndpoint(request, nil, caller)
 }
 
-func callTokenEndpoint(request interface{}, authFn interface{}, caller TokenEndpointCaller) (newToken *oauth2.Token, err error) {
+func callTokenEndpoint(request any, authFn any, caller TokenEndpointCaller) (newToken *oauth2.Token, err error) {
 	req, err := httphelper.FormRequest(caller.TokenEndpoint(), request, Encoder, authFn)
 	if err != nil {
 		return nil, err
@@ -80,7 +80,7 @@ type EndSessionCaller interface {
 	HttpClient() *http.Client
 }
 
-func CallEndSessionEndpoint(request interface{}, authFn interface{}, caller EndSessionCaller) (*url.URL, error) {
+func CallEndSessionEndpoint(request any, authFn any, caller EndSessionCaller) (*url.URL, error) {
 	req, err := httphelper.FormRequest(caller.GetEndSessionEndpoint(), request, Encoder, authFn)
 	if err != nil {
 		return nil, err
@@ -123,7 +123,7 @@ type RevokeRequest struct {
 	ClientSecret  string `schema:"client_secret"`
 }
 
-func CallRevokeEndpoint(request interface{}, authFn interface{}, caller RevokeCaller) error {
+func CallRevokeEndpoint(request any, authFn any, caller RevokeCaller) error {
 	req, err := httphelper.FormRequest(caller.GetRevokeEndpoint(), request, Encoder, authFn)
 	if err != nil {
 		return err
@@ -151,7 +151,7 @@ func CallRevokeEndpoint(request interface{}, authFn interface{}, caller RevokeCa
 	return nil
 }
 
-func CallTokenExchangeEndpoint(request interface{}, authFn interface{}, caller TokenEndpointCaller) (resp *oidc.TokenExchangeResponse, err error) {
+func CallTokenExchangeEndpoint(request any, authFn any, caller TokenEndpointCaller) (resp *oidc.TokenExchangeResponse, err error) {
 	req, err := httphelper.FormRequest(caller.TokenEndpoint(), request, Encoder, authFn)
 	if err != nil {
 		return nil, err

pkg/client/rs/resource_server.go

@@ -15,15 +15,15 @@ type ResourceServer interface {
 	IntrospectionURL() string
 	TokenEndpoint() string
 	HttpClient() *http.Client
-	AuthFn() (interface{}, error)
+	AuthFn() (any, error)
 }
 
 type resourceServer struct {
 	issuer        string
 	tokenURL      string
 	introspectURL string
 	httpClient    *http.Client
-	authFn        func() (interface{}, error)
+	authFn        func() (any, error)
 }
 
 func (r *resourceServer) IntrospectionURL() string {
@@ -38,12 +38,12 @@ func (r *resourceServer) HttpClient() *http.Client {
 	return r.httpClient
 }
 
-func (r *resourceServer) AuthFn() (interface{}, error) {
+func (r *resourceServer) AuthFn() (any, error) {
 	return r.authFn()
 }
 
 func NewResourceServerClientCredentials(issuer, clientID, clientSecret string, option ...Option) (ResourceServer, error) {
-	authorizer := func() (interface{}, error) {
+	authorizer := func() (any, error) {
 		return httphelper.AuthorizeBasic(clientID, clientSecret), nil
 	}
 	return newResourceServer(issuer, authorizer, option...)
@@ -54,7 +54,7 @@ func NewResourceServerJWTProfile(issuer, clientID, keyID string, key []byte, opt
 	if err != nil {
 		return nil, err
 	}
-	authorizer := func() (interface{}, error) {
+	authorizer := func() (any, error) {
 		assertion, err := client.SignedJWTProfileAssertion(clientID, []string{issuer}, time.Hour, signer)
 		if err != nil {
 			return nil, err
@@ -64,7 +64,7 @@ func NewResourceServerJWTProfile(issuer, clientID, keyID string, key []byte, opt
 	return newResourceServer(issuer, authorizer, options...)
 }
 
-func newResourceServer(issuer string, authorizer func() (interface{}, error), options ...Option) (*resourceServer, error) {
+func newResourceServer(issuer string, authorizer func() (any, error), options ...Option) (*resourceServer, error) {
 	rs := &resourceServer{
 		issuer:     issuer,
 		httpClient: httphelper.DefaultHTTPClient,

pkg/client/rs/resource_server_test.go

@@ -11,14 +11,14 @@ import (
 func TestNewResourceServer(t *testing.T) {
 	type args struct {
 		issuer     string
-		authorizer func() (interface{}, error)
+		authorizer func() (any, error)
 		options    []Option
 	}
 	type wantFields struct {
 		issuer        string
 		tokenURL      string
 		introspectURL string
-		authFn        func() (interface{}, error)
+		authFn        func() (any, error)
 	}
 	tests := []struct {
 		name       string

pkg/client/tokenexchange/tokenexchange.go

@@ -12,27 +12,27 @@ import (
 type TokenExchanger interface {
 	TokenEndpoint() string
 	HttpClient() *http.Client
-	AuthFn() (interface{}, error)
+	AuthFn() (any, error)
 }
 
 type OAuthTokenExchange struct {
 	httpClient    *http.Client
 	tokenEndpoint string
-	authFn        func() (interface{}, error)
+	authFn        func() (any, error)
 }
 
 func NewTokenExchanger(issuer string, options ...func(source *OAuthTokenExchange)) (TokenExchanger, error) {
 	return newOAuthTokenExchange(issuer, nil, options...)
 }
 
 func NewTokenExchangerClientCredentials(issuer, clientID, clientSecret string, options ...func(source *OAuthTokenExchange)) (TokenExchanger, error) {
-	authorizer := func() (interface{}, error) {
+	authorizer := func() (any, error) {
 		return httphelper.AuthorizeBasic(clientID, clientSecret), nil
 	}
 	return newOAuthTokenExchange(issuer, authorizer, options...)
 }
 
-func newOAuthTokenExchange(issuer string, authorizer func() (interface{}, error), options ...func(source *OAuthTokenExchange)) (*OAuthTokenExchange, error) {
+func newOAuthTokenExchange(issuer string, authorizer func() (any, error), options ...func(source *OAuthTokenExchange)) (*OAuthTokenExchange, error) {
 	te := &OAuthTokenExchange{
 		httpClient: httphelper.DefaultHTTPClient,
 	}
@@ -78,7 +78,7 @@ func (te *OAuthTokenExchange) HttpClient() *http.Client {
 	return te.httpClient
 }
 
-func (te *OAuthTokenExchange) AuthFn() (interface{}, error) {
+func (te *OAuthTokenExchange) AuthFn() (any, error) {
 	if te.authFn != nil {
 		return te.authFn()
 	}

pkg/crypto/sign.go

@@ -7,7 +7,7 @@ import (
 	"gopkg.in/square/go-jose.v2"
 )
 
-func Sign(object interface{}, signer jose.Signer) (string, error) {
+func Sign(object any, signer jose.Signer) (string, error) {
 	payload, err := json.Marshal(object)
 	if err != nil {
 		return "", err

pkg/http/http.go

@@ -17,11 +17,11 @@ var DefaultHTTPClient = &http.Client{
 }
 
 type Decoder interface {
-	Decode(dst interface{}, src map[string][]string) error
+	Decode(dst any, src map[string][]string) error
 }
 
 type Encoder interface {
-	Encode(src interface{}, dst map[string][]string) error
+	Encode(src any, dst map[string][]string) error
 }
 
 type FormAuthorization func(url.Values)
@@ -33,7 +33,7 @@ func AuthorizeBasic(user, password string) RequestAuthorization {
 	}
 }
 
-func FormRequest(endpoint string, request interface{}, encoder Encoder, authFn interface{}) (*http.Request, error) {
+func FormRequest(endpoint string, request any, encoder Encoder, authFn any) (*http.Request, error) {
 	form := url.Values{}
 	if err := encoder.Encode(request, form); err != nil {
 		return nil, err
@@ -53,7 +53,7 @@ func FormRequest(endpoint string, request interface{}, encoder Encoder, authFn i
 	return req, nil
 }
 
-func HttpRequest(client *http.Client, req *http.Request, response interface{}) error {
+func HttpRequest(client *http.Client, req *http.Request, response any) error {
 	resp, err := client.Do(req)
 	if err != nil {
 		return err
@@ -76,7 +76,7 @@ func HttpRequest(client *http.Client, req *http.Request, response interface{}) e
 	return nil
 }
 
-func URLEncodeParams(resp interface{}, encoder Encoder) (url.Values, error) {
+func URLEncodeParams(resp any, encoder Encoder) (url.Values, error) {
 	values := make(map[string][]string)
 	err := encoder.Encode(resp, values)
 	if err != nil {

pkg/http/marshal.go

@@ -8,11 +8,11 @@ import (
 	"reflect"
 )
 
-func MarshalJSON(w http.ResponseWriter, i interface{}) {
+func MarshalJSON(w http.ResponseWriter, i any) {
 	MarshalJSONWithStatus(w, i, http.StatusOK)
 }
 
-func MarshalJSONWithStatus(w http.ResponseWriter, i interface{}, status int) {
+func MarshalJSONWithStatus(w http.ResponseWriter, i any, status int) {
 	w.Header().Set("content-type", "application/json")
 	w.WriteHeader(status)
 	if i == nil || (reflect.ValueOf(i).Kind() == reflect.Ptr && reflect.ValueOf(i).IsNil()) {

pkg/http/marshal_test.go

@@ -94,7 +94,7 @@ func TestConcatenateJSON(t *testing.T) {
 
 func TestMarshalJSONWithStatus(t *testing.T) {
 	type args struct {
-		i      interface{}
+		i      any
 		status int
 	}
 	type res struct {

pkg/oidc/error.go

@@ -151,7 +151,7 @@ func (e *Error) WithParent(err error) *Error {
 	return e
 }
 
-func (e *Error) WithDescription(desc string, args ...interface{}) *Error {
+func (e *Error) WithDescription(desc string, args ...any) *Error {
 	e.Description = fmt.Sprintf(desc, args...)
 	return e
 }

pkg/oidc/keyset.go

@@ -46,8 +46,8 @@ func GetKeyIDAndAlg(jws *jose.JSONWebSignature) (string, string) {
 //
 // will return false none or multiple match
 //
-//deprecated: use FindMatchingKey which will return an error (more specific) instead of just a bool
-//moved implementation already to FindMatchingKey
+// deprecated: use FindMatchingKey which will return an error (more specific) instead of just a bool
+// moved implementation already to FindMatchingKey
 func FindKey(keyID, use, expectedAlg string, keys ...jose.JSONWebKey) (jose.JSONWebKey, bool) {
 	key, err := FindMatchingKey(keyID, use, expectedAlg, keys...)
 	return key, err == nil
@@ -91,7 +91,7 @@ func FindMatchingKey(keyID, use, expectedAlg string, keys ...jose.JSONWebKey) (k
 	return key, ErrKeyNone
 }
 
-func algToKeyType(key interface{}, alg string) bool {
+func algToKeyType(key any, alg string) bool {
 	switch alg[0] {
 	case 'R', 'P':
 		_, ok := key.(*rsa.PublicKey)

pkg/oidc/regression_test.go

@@ -17,21 +17,21 @@ const dataDir = "regression_data"
 
 // jsonFilename builds a filename for the regression testdata.
 // dataDir/<type_name>.json
-func jsonFilename(obj interface{}) string {
+func jsonFilename(obj any) string {
 	name := fmt.Sprintf("%T.json", obj)
 	return path.Join(
 		dataDir,
 		strings.TrimPrefix(name, "*"),
 	)
 }
 
-func encodeJSON(t *testing.T, w io.Writer, obj interface{}) {
+func encodeJSON(t *testing.T, w io.Writer, obj any) {
 	enc := json.NewEncoder(w)
 	enc.SetIndent("", "\t")
 	require.NoError(t, enc.Encode(obj))
 }
 
-var regressionData = []interface{}{
+var regressionData = []any{
 	accessTokenData,
 	idTokenData,
 	introspectionResponseData,