From 5a9e6e2c2a799e9d806546bec417e8878fb243ef Mon Sep 17 00:00:00 2001
From: Livio Amstutz <livio.a@gmail.com>
Date: Tue, 15 Sep 2020 08:06:43 +0200
Subject: [PATCH] let tests work

---
 pkg/op/authrequest_test.go          |  3 +--
 pkg/op/mock/authorizer.mock.go      | 15 +++++++--------
 pkg/op/mock/authorizer.mock.impl.go |  7 +++----
 pkg/op/mock/storage.mock.go         | 15 +++++++++++++++
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/pkg/op/authrequest_test.go b/pkg/op/authrequest_test.go
index 343924f..d74d365 100644
--- a/pkg/op/authrequest_test.go
+++ b/pkg/op/authrequest_test.go
@@ -13,7 +13,6 @@ import (
 	"github.com/caos/oidc/pkg/oidc"
 	"github.com/caos/oidc/pkg/op"
 	"github.com/caos/oidc/pkg/op/mock"
-	"github.com/caos/oidc/pkg/rp"
 	"github.com/caos/oidc/pkg/utils"
 )
 
@@ -145,7 +144,7 @@ func TestValidateAuthRequest(t *testing.T) {
 	type args struct {
 		authRequest *oidc.AuthRequest
 		storage     op.Storage
-		verifier    rp.Verifier
+		verifier    op.IDTokenHintVerifier
 	}
 	tests := []struct {
 		name    string
diff --git a/pkg/op/mock/authorizer.mock.go b/pkg/op/mock/authorizer.mock.go
index 5272997..5da2437 100644
--- a/pkg/op/mock/authorizer.mock.go
+++ b/pkg/op/mock/authorizer.mock.go
@@ -6,7 +6,6 @@ package mock
 
 import (
 	op "github.com/caos/oidc/pkg/op"
-	rp "github.com/caos/oidc/pkg/rp"
 	utils "github.com/caos/oidc/pkg/utils"
 	gomock "github.com/golang/mock/gomock"
 	reflect "reflect"
@@ -77,18 +76,18 @@ func (mr *MockAuthorizerMockRecorder) Encoder() *gomock.Call {
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Encoder", reflect.TypeOf((*MockAuthorizer)(nil).Encoder))
 }
 
-// IDTokenVerifier mocks base method
-func (m *MockAuthorizer) IDTokenVerifier() rp.Verifier {
+// IDTokenHintVerifier mocks base method
+func (m *MockAuthorizer) IDTokenHintVerifier() op.IDTokenHintVerifier {
 	m.ctrl.T.Helper()
-	ret := m.ctrl.Call(m, "IDTokenVerifier")
-	ret0, _ := ret[0].(rp.Verifier)
+	ret := m.ctrl.Call(m, "IDTokenHintVerifier")
+	ret0, _ := ret[0].(op.IDTokenHintVerifier)
 	return ret0
 }
 
-// IDTokenVerifier indicates an expected call of IDTokenVerifier
-func (mr *MockAuthorizerMockRecorder) IDTokenVerifier() *gomock.Call {
+// IDTokenHintVerifier indicates an expected call of IDTokenHintVerifier
+func (mr *MockAuthorizerMockRecorder) IDTokenHintVerifier() *gomock.Call {
 	mr.mock.ctrl.T.Helper()
-	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IDTokenVerifier", reflect.TypeOf((*MockAuthorizer)(nil).IDTokenVerifier))
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IDTokenHintVerifier", reflect.TypeOf((*MockAuthorizer)(nil).IDTokenHintVerifier))
 }
 
 // Issuer mocks base method
diff --git a/pkg/op/mock/authorizer.mock.impl.go b/pkg/op/mock/authorizer.mock.impl.go
index 202889c..0a6b6a5 100644
--- a/pkg/op/mock/authorizer.mock.impl.go
+++ b/pkg/op/mock/authorizer.mock.impl.go
@@ -10,7 +10,6 @@ import (
 
 	"github.com/caos/oidc/pkg/oidc"
 	"github.com/caos/oidc/pkg/op"
-	"github.com/caos/oidc/pkg/rp"
 )
 
 func NewAuthorizer(t *testing.T) op.Authorizer {
@@ -58,9 +57,9 @@ func ExpectSigner(a op.Authorizer, t *testing.T) {
 
 func ExpectVerifier(a op.Authorizer, t *testing.T) {
 	mockA := a.(*MockAuthorizer)
-	mockA.EXPECT().IDTokenVerifier().DoAndReturn(
-		func() rp.Verifier {
-			return &Verifier{}
+	mockA.EXPECT().IDTokenHintVerifier().DoAndReturn(
+		func() op.IDTokenHintVerifier {
+			return op.NewIDTokenHintVerifier("", nil)
 		})
 }
 
diff --git a/pkg/op/mock/storage.mock.go b/pkg/op/mock/storage.mock.go
index 83ef5ab..f71a996 100644
--- a/pkg/op/mock/storage.mock.go
+++ b/pkg/op/mock/storage.mock.go
@@ -141,6 +141,21 @@ func (mr *MockStorageMockRecorder) GetClientByClientID(arg0, arg1 interface{}) *
 	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetClientByClientID", reflect.TypeOf((*MockStorage)(nil).GetClientByClientID), arg0, arg1)
 }
 
+// GetKeyByID mocks base method
+func (m *MockStorage) GetKeyByID(arg0 context.Context, arg1 string) (*jose.JSONWebKeySet, error) {
+	m.ctrl.T.Helper()
+	ret := m.ctrl.Call(m, "GetKeyByID", arg0, arg1)
+	ret0, _ := ret[0].(*jose.JSONWebKeySet)
+	ret1, _ := ret[1].(error)
+	return ret0, ret1
+}
+
+// GetKeyByID indicates an expected call of GetKeyByID
+func (mr *MockStorageMockRecorder) GetKeyByID(arg0, arg1 interface{}) *gomock.Call {
+	mr.mock.ctrl.T.Helper()
+	return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetKeyByID", reflect.TypeOf((*MockStorage)(nil).GetKeyByID), arg0, arg1)
+}
+
 // GetKeySet mocks base method
 func (m *MockStorage) GetKeySet(arg0 context.Context) (*jose.JSONWebKeySet, error) {
 	m.ctrl.T.Helper()