From 1661b40fbe21ea5679c6ae9545ad2363a48111e5 Mon Sep 17 00:00:00 2001
From: Livio Amstutz <livio.a@gmail.com>
Date: Mon, 28 Sep 2020 15:06:14 +0200
Subject: [PATCH] fix tests

---
 example/client/github/github.go   |  2 +-
 pkg/oidc/types_test.go            |  2 +-
 pkg/rp/mock/verifier.mock.impl.go | 37 -------------------------------
 3 files changed, 2 insertions(+), 39 deletions(-)
 delete mode 100644 pkg/rp/mock/verifier.mock.impl.go

diff --git a/example/client/github/github.go b/example/client/github/github.go
index 5489389..c136091 100644
--- a/example/client/github/github.go
+++ b/example/client/github/github.go
@@ -45,7 +45,7 @@ func main() {
 	}
 	token := cli.CodeFlow(relayingParty, callbackPath, port, state)
 
-	client := github.NewClient(relayingParty.Client(ctx, token.Token))
+	client := github.NewClient(relayingParty.OAuthConfig().Client(ctx, token.Token))
 
 	_, _, err = client.Users.Get(ctx, "")
 	if err != nil {
diff --git a/pkg/oidc/types_test.go b/pkg/oidc/types_test.go
index 830fb02..8138b4b 100644
--- a/pkg/oidc/types_test.go
+++ b/pkg/oidc/types_test.go
@@ -28,7 +28,7 @@ func TestAudience_UnmarshalText(t *testing.T) {
 				[]byte(`{"aud": {"a": }}}`),
 			},
 			res{},
-			false,
+			true,
 		},
 		{
 			"single audience",
diff --git a/pkg/rp/mock/verifier.mock.impl.go b/pkg/rp/mock/verifier.mock.impl.go
deleted file mode 100644
index 0b6dd1c..0000000
--- a/pkg/rp/mock/verifier.mock.impl.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package mock
-
-import (
-	"errors"
-	"testing"
-
-	"github.com/golang/mock/gomock"
-
-	"github.com/caos/oidc/pkg/oidc"
-	"github.com/caos/oidc/pkg/rp"
-)
-
-func NewVerifier(t *testing.T) rp.Verifier {
-	return NewMockVerifier(gomock.NewController(t))
-}
-
-func NewMockVerifierExpectInvalid(t *testing.T) rp.Verifier {
-	m := NewVerifier(t)
-	ExpectVerifyInvalid(m)
-	return m
-}
-
-func ExpectVerifyInvalid(v rp.Verifier) {
-	mock := v.(*MockVerifier)
-	mock.EXPECT().VerifyIDToken(gomock.Any(), gomock.Any()).Return(nil, errors.New("invalid"))
-}
-
-func NewMockVerifierExpectValid(t *testing.T) rp.Verifier {
-	m := NewVerifier(t)
-	ExpectVerifyValid(m)
-	return m
-}
-
-func ExpectVerifyValid(v rp.Verifier) {
-	mock := v.(*MockVerifier)
-	mock.EXPECT().VerifyIDToken(gomock.Any(), gomock.Any()).Return(&oidc.IDTokenClaims{Userinfo: oidc.userinfo{Subject: "id"}}, nil)
-}