fix build errors after merge

zitadel · Oct 12, 2023 · 2fa8747 · 2fa8747
1 parent d1d8099
commit 2fa8747
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 18 deletions.
diff --git a/example/server/exampleop/login.go b/example/server/exampleop/login.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 
 	"github.com/go-chi/chi"
-	"github.com/zitadel/oidc/v2/pkg/op"
+	"github.com/zitadel/oidc/v3/pkg/op"
 )
 
 type login struct {
@@ -26,8 +26,8 @@ func NewLogin(authenticate authenticate, callback func(context.Context, string)
 
 func (l *login) createRouter(issuerInterceptor *op.IssuerInterceptor) {
 	l.router = chi.NewRouter()
-	l.router.Path("/username").Methods("GET").HandlerFunc(l.loginHandler)
-	l.router.Path("/username").Methods("POST").HandlerFunc(issuerInterceptor.HandlerFunc(l.checkLoginHandler))
+	l.router.Get("/username", l.loginHandler)
+	l.router.Post("/username", issuerInterceptor.HandlerFunc(l.checkLoginHandler))
 }
 
 type authenticate interface {

diff --git a/pkg/client/client_test.go b/pkg/client/client_test.go
@@ -1,6 +1,7 @@
 package client
 
 import (
+	"context"
 	"net/http"
 	"testing"
 
@@ -36,7 +37,7 @@ func TestDiscover(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := Discover(tt.args.issuer, http.DefaultClient, tt.args.wellKnownUrl...)
+			got, err := Discover(context.Background(), tt.args.issuer, http.DefaultClient, tt.args.wellKnownUrl...)
 			if tt.wantErr {
 				assert.Error(t, err)
 				return

diff --git a/pkg/client/integration_test.go b/pkg/client/integration_test.go
@@ -29,6 +29,7 @@ import (
 	"github.com/zitadel/oidc/v3/pkg/client/tokenexchange"
 	httphelper "github.com/zitadel/oidc/v3/pkg/http"
 	"github.com/zitadel/oidc/v3/pkg/oidc"
+	"github.com/zitadel/oidc/v3/pkg/op"
 )
 
 var Logger = slog.New(
@@ -340,7 +341,7 @@ func TestErrorFromPromptNone(t *testing.T) {
 	opServer := httptest.NewServer(&dh)
 	defer opServer.Close()
 	t.Logf("auth server at %s", opServer.URL)
-	dh.Handler = exampleop.SetupServer(opServer.URL, exampleStorage, op.WithHttpInterceptors(
+	dh.Handler = exampleop.SetupServer(opServer.URL, exampleStorage, Logger, false, op.WithHttpInterceptors(
 		func(next http.Handler) http.Handler {
 			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				t.Logf("request to %s", r.URL)
@@ -358,6 +359,7 @@ func TestErrorFromPromptNone(t *testing.T) {
 	key := []byte("test1234test1234")
 	cookieHandler := httphelper.NewCookieHandler(key, key, httphelper.WithUnsecure())
 	provider, err := rp.NewRelyingPartyOIDC(
+		CTX,
 		opServer.URL,
 		clientID,
 		clientSecret,

diff --git a/pkg/client/rs/resource_server.go b/pkg/client/rs/resource_server.go
@@ -124,7 +124,7 @@ func WithStaticEndpoints(tokenURL, introspectURL string) Option {
 // [RFC7662]: https://www.rfc-editor.org/rfc/rfc7662
 func Introspect[R any](ctx context.Context, rp ResourceServer, token string) (resp R, err error) {
 	if rp.IntrospectionURL() == "" {
-		return nil, errors.New("resource server: introspection URL is empty")
+		return resp, errors.New("resource server: introspection URL is empty")
 	}
 	authFn, err := rp.AuthFn()
 	if err != nil {

diff --git a/pkg/client/rs/resource_server_test.go b/pkg/client/rs/resource_server_test.go
@@ -6,6 +6,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/zitadel/oidc/v3/pkg/oidc"
 )
 
 func TestNewResourceServer(t *testing.T) {
@@ -164,7 +165,7 @@ func TestNewResourceServer(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := newResourceServer(tt.args.issuer, tt.args.authorizer, tt.args.options...)
+			got, err := newResourceServer(context.Background(), tt.args.issuer, tt.args.authorizer, tt.args.options...)
 			if tt.wantErr {
 				assert.Error(t, err)
 				return
@@ -187,6 +188,7 @@ func TestIntrospect(t *testing.T) {
 		token string
 	}
 	rp, err := newResourceServer(
+		context.Background(),
 		"https://accounts.spotify.com",
 		nil,
 	)
@@ -208,7 +210,7 @@ func TestIntrospect(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			_, err := Introspect(tt.args.ctx, tt.args.rp, tt.args.token)
+			_, err := Introspect[*oidc.IntrospectionResponse](tt.args.ctx, tt.args.rp, tt.args.token)
 			if tt.wantErr {
 				assert.Error(t, err)
 				return

diff --git a/pkg/op/auth_request_test.go b/pkg/op/auth_request_test.go
@@ -13,6 +13,7 @@ import (
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/zitadel/oidc/v3/example/server/storage"
 	tu "github.com/zitadel/oidc/v3/internal/testutil"
 	httphelper "github.com/zitadel/oidc/v3/pkg/http"
 	"github.com/zitadel/oidc/v3/pkg/oidc"
@@ -1098,16 +1099,6 @@ func Test_parseAuthorizeCallbackRequest(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			r := httptest.NewRequest(http.MethodPost, "/auth/callback/", nil)
-			w := httptest.NewRecorder()
-			op.AuthResponseCode(w, r, tt.args.authReq, tt.args.authorizer(t))
-			resp := w.Result()
-			defer resp.Body.Close()
-			assert.Equal(t, tt.res.wantCode, resp.StatusCode)
-			assert.Equal(t, tt.res.wantLocationHeader, resp.Header.Get("Location"))
-			body, err := io.ReadAll(resp.Body)
-			require.NoError(t, err)
-			assert.Equal(t, tt.res.wantBody, string(body))
 			r := httptest.NewRequest(http.MethodGet, tt.url, nil)
 			gotId, err := op.ParseAuthorizeCallbackRequest(r)
 			if tt.wantErr {