From bb266aac4b2e84418e60ef167bbb792f1f269d5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20M=C3=B6hlmann?= Date: Tue, 7 Mar 2023 17:44:10 +0200 Subject: [PATCH] cleanup unused code --- pkg/client/rp/mock/generate.go | 3 - pkg/client/rp/mock/verifier.mock.go | 163 ---------------------------- pkg/oidc/introspection.go | 12 -- pkg/oidc/introspection_test.go | 5 - 4 files changed, 183 deletions(-) delete mode 100644 pkg/client/rp/mock/generate.go delete mode 100644 pkg/client/rp/mock/verifier.mock.go diff --git a/pkg/client/rp/mock/generate.go b/pkg/client/rp/mock/generate.go deleted file mode 100644 index 7db81ea..0000000 --- a/pkg/client/rp/mock/generate.go +++ /dev/null @@ -1,3 +0,0 @@ -package mock - -//go:generate mockgen -package mock -destination ./verifier.mock.go github.com/zitadel/oidc/v2/pkg/client/rp IDTokenVerifier diff --git a/pkg/client/rp/mock/verifier.mock.go b/pkg/client/rp/mock/verifier.mock.go deleted file mode 100644 index eac6a79..0000000 --- a/pkg/client/rp/mock/verifier.mock.go +++ /dev/null @@ -1,163 +0,0 @@ -// Code generated by MockGen. DO NOT EDIT. -// Source: github.com/zitadel/oidc/v2/pkg/client/rp (interfaces: IDTokenVerifier) - -// Package mock is a generated GoMock package. -package mock - -import ( - context "context" - reflect "reflect" - time "time" - - gomock "github.com/golang/mock/gomock" - oidc "github.com/zitadel/oidc/v2/pkg/oidc" -) - -// MockIDTokenVerifier is a mock of IDTokenVerifier interface. -type MockIDTokenVerifier struct { - ctrl *gomock.Controller - recorder *MockIDTokenVerifierMockRecorder -} - -// MockIDTokenVerifierMockRecorder is the mock recorder for MockIDTokenVerifier. -type MockIDTokenVerifierMockRecorder struct { - mock *MockIDTokenVerifier -} - -// NewMockIDTokenVerifier creates a new mock instance. -func NewMockIDTokenVerifier(ctrl *gomock.Controller) *MockIDTokenVerifier { - mock := &MockIDTokenVerifier{ctrl: ctrl} - mock.recorder = &MockIDTokenVerifierMockRecorder{mock} - return mock -} - -// EXPECT returns an object that allows the caller to indicate expected use. -func (m *MockIDTokenVerifier) EXPECT() *MockIDTokenVerifierMockRecorder { - return m.recorder -} - -// ACR mocks base method. -func (m *MockIDTokenVerifier) ACR() oidc.ACRVerifier { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ACR") - ret0, _ := ret[0].(oidc.ACRVerifier) - return ret0 -} - -// ACR indicates an expected call of ACR. -func (mr *MockIDTokenVerifierMockRecorder) ACR() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ACR", reflect.TypeOf((*MockIDTokenVerifier)(nil).ACR)) -} - -// ClientID mocks base method. -func (m *MockIDTokenVerifier) ClientID() string { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ClientID") - ret0, _ := ret[0].(string) - return ret0 -} - -// ClientID indicates an expected call of ClientID. -func (mr *MockIDTokenVerifierMockRecorder) ClientID() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClientID", reflect.TypeOf((*MockIDTokenVerifier)(nil).ClientID)) -} - -// Issuer mocks base method. -func (m *MockIDTokenVerifier) Issuer() string { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Issuer") - ret0, _ := ret[0].(string) - return ret0 -} - -// Issuer indicates an expected call of Issuer. -func (mr *MockIDTokenVerifierMockRecorder) Issuer() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Issuer", reflect.TypeOf((*MockIDTokenVerifier)(nil).Issuer)) -} - -// KeySet mocks base method. -func (m *MockIDTokenVerifier) KeySet() oidc.KeySet { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "KeySet") - ret0, _ := ret[0].(oidc.KeySet) - return ret0 -} - -// KeySet indicates an expected call of KeySet. -func (mr *MockIDTokenVerifierMockRecorder) KeySet() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "KeySet", reflect.TypeOf((*MockIDTokenVerifier)(nil).KeySet)) -} - -// MaxAge mocks base method. -func (m *MockIDTokenVerifier) MaxAge() time.Duration { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "MaxAge") - ret0, _ := ret[0].(time.Duration) - return ret0 -} - -// MaxAge indicates an expected call of MaxAge. -func (mr *MockIDTokenVerifierMockRecorder) MaxAge() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MaxAge", reflect.TypeOf((*MockIDTokenVerifier)(nil).MaxAge)) -} - -// MaxAgeIAT mocks base method. -func (m *MockIDTokenVerifier) MaxAgeIAT() time.Duration { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "MaxAgeIAT") - ret0, _ := ret[0].(time.Duration) - return ret0 -} - -// MaxAgeIAT indicates an expected call of MaxAgeIAT. -func (mr *MockIDTokenVerifierMockRecorder) MaxAgeIAT() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MaxAgeIAT", reflect.TypeOf((*MockIDTokenVerifier)(nil).MaxAgeIAT)) -} - -// Nonce mocks base method. -func (m *MockIDTokenVerifier) Nonce(arg0 context.Context) string { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Nonce", arg0) - ret0, _ := ret[0].(string) - return ret0 -} - -// Nonce indicates an expected call of Nonce. -func (mr *MockIDTokenVerifierMockRecorder) Nonce(arg0 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Nonce", reflect.TypeOf((*MockIDTokenVerifier)(nil).Nonce), arg0) -} - -// Offset mocks base method. -func (m *MockIDTokenVerifier) Offset() time.Duration { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Offset") - ret0, _ := ret[0].(time.Duration) - return ret0 -} - -// Offset indicates an expected call of Offset. -func (mr *MockIDTokenVerifierMockRecorder) Offset() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Offset", reflect.TypeOf((*MockIDTokenVerifier)(nil).Offset)) -} - -// SupportedSignAlgs mocks base method. -func (m *MockIDTokenVerifier) SupportedSignAlgs() []string { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SupportedSignAlgs") - ret0, _ := ret[0].([]string) - return ret0 -} - -// SupportedSignAlgs indicates an expected call of SupportedSignAlgs. -func (mr *MockIDTokenVerifierMockRecorder) SupportedSignAlgs() *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SupportedSignAlgs", reflect.TypeOf((*MockIDTokenVerifier)(nil).SupportedSignAlgs)) -} diff --git a/pkg/oidc/introspection.go b/pkg/oidc/introspection.go index 60cea22..8313dc4 100644 --- a/pkg/oidc/introspection.go +++ b/pkg/oidc/introspection.go @@ -36,18 +36,6 @@ type IntrospectionResponse struct { Claims map[string]any `json:"-"` } -// GetUserInfo copies all user related fields into a new UserInfo. -func (i *IntrospectionResponse) GetUserInfo() *UserInfo { - return &UserInfo{ - Address: gu.PtrCopy(i.Address), - Subject: i.Subject, - UserInfoProfile: i.UserInfoProfile, - UserInfoEmail: i.UserInfoEmail, - UserInfoPhone: i.UserInfoPhone, - Claims: gu.MapCopy(i.Claims), - } -} - // SetUserInfo copies all relevant fields from UserInfo // into the IntroSpectionResponse. func (i *IntrospectionResponse) SetUserInfo(u *UserInfo) { diff --git a/pkg/oidc/introspection_test.go b/pkg/oidc/introspection_test.go index 6289a2c..bd49894 100644 --- a/pkg/oidc/introspection_test.go +++ b/pkg/oidc/introspection_test.go @@ -8,11 +8,6 @@ import ( "github.com/stretchr/testify/require" ) -func TestIntrospectionResponse_GetUserInfo(t *testing.T) { - got := introspectionResponseData.GetUserInfo() - assert.Equal(t, userInfoData, got) -} - func TestIntrospectionResponse_SetUserInfo(t *testing.T) { tests := []struct { name string