cim/zitadel-oidc
5
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: add missing saveKeyPair

Browse source
This commit is contained in:
Livio Amstutz 2020-01-28 08:50:54 +01:00
parent fb9ac4765c
commit c1f4d01965
3 changed files with 27 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
example/internal/mock/storage.go
View file

@ -142,6 +142,9 @@ func (s *AuthStorage) GetSigningKey(_ context.Context) (*jose.SigningKey, error)
func (s *AuthStorage) GetKey(_ context.Context) (*rsa.PrivateKey, error) { func (s *AuthStorage) GetKey(_ context.Context) (*rsa.PrivateKey, error) {
return s.key, nil return s.key, nil
} }
func (s *AuthStorage) SaveKeyPair(ctx context.Context) (*jose.SigningKey, error) {
return s.GetSigningKey(ctx)
}
func (s *AuthStorage) GetKeySet(_ context.Context) (*jose.JSONWebKeySet, error) { func (s *AuthStorage) GetKeySet(_ context.Context) (*jose.JSONWebKeySet, error) {
pubkey := s.key.Public() pubkey := s.key.Public()
return &jose.JSONWebKeySet{ return &jose.JSONWebKeySet{

15
pkg/op/mock/storage.mock.go
View file

@ -153,3 +153,18 @@ func (mr *MockStorageMockRecorder) GetUserinfoFromScopes(arg0, arg1 interface{})
mr.mock.ctrl.T.Helper() mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserinfoFromScopes", reflect.TypeOf((*MockStorage)(nil).GetUserinfoFromScopes), arg0, arg1) return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetUserinfoFromScopes", reflect.TypeOf((*MockStorage)(nil).GetUserinfoFromScopes), arg0, arg1)
} }
// SaveKeyPair mocks base method
func (m *MockStorage) SaveKeyPair(arg0 context.Context) (*go_jose_v2.SigningKey, error) {
m.ctrl.T.Helper()
ret := m.ctrl.Call(m, "SaveKeyPair", arg0)
ret0, _ := ret[0].(*go_jose_v2.SigningKey)
ret1, _ := ret[1].(error)
return ret0, ret1
}
// SaveKeyPair indicates an expected call of SaveKeyPair
func (mr *MockStorageMockRecorder) SaveKeyPair(arg0 interface{}) *gomock.Call {
mr.mock.ctrl.T.Helper()
return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveKeyPair", reflect.TypeOf((*MockStorage)(nil).SaveKeyPair), arg0)
}

17
pkg/op/mock/storage.mock.impl.go
View file

@ -1,6 +1,7 @@
package mock package mock
import ( import (
"context"
"errors" "errors"
"testing" "testing"
@ -30,8 +31,8 @@ func NewMockStorageExpectInvalidClientID(t *testing.T) op.Storage {
func NewMockStorageAny(t *testing.T) op.Storage { func NewMockStorageAny(t *testing.T) op.Storage {
m := NewStorage(t) m := NewStorage(t)
mockS := m.(*MockStorage) mockS := m.(*MockStorage)
mockS.EXPECT().GetClientByClientID(gomock.Any()).AnyTimes().Return(&ConfClient{}, nil) mockS.EXPECT().GetClientByClientID(gomock.Any(), gomock.Any()).AnyTimes().Return(&ConfClient{}, nil)
mockS.EXPECT().AuthorizeClientIDSecret(gomock.Any(), gomock.Any()).AnyTimes().Return(nil) mockS.EXPECT().AuthorizeClientIDSecret(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
return m return m
} }
@ -54,13 +55,13 @@ func NewMockStorageSigningKey(t *testing.T) op.Storage {
func ExpectInvalidClientID(s op.Storage) { func ExpectInvalidClientID(s op.Storage) {
mockS := s.(*MockStorage) mockS := s.(*MockStorage)
mockS.EXPECT().GetClientByClientID(gomock.Any()).Return(nil, errors.New("client not found")) mockS.EXPECT().GetClientByClientID(gomock.Any(), gomock.Any()).Return(nil, errors.New("client not found"))
} }
func ExpectValidClientID(s op.Storage) { func ExpectValidClientID(s op.Storage) {
mockS := s.(*MockStorage) mockS := s.(*MockStorage)
mockS.EXPECT().GetClientByClientID(gomock.Any()).DoAndReturn( mockS.EXPECT().GetClientByClientID(gomock.Any(), gomock.Any()).DoAndReturn(
func(id string) (op.Client, error) { func(_ context.Context, id string) (op.Client, error) {
var appType op.ApplicationType var appType op.ApplicationType
var authMethod op.AuthMethod var authMethod op.AuthMethod
switch id { switch id {
@ -80,17 +81,17 @@ func ExpectValidClientID(s op.Storage) {
func ExpectSigningKeyError(s op.Storage) { func ExpectSigningKeyError(s op.Storage) {
mockS := s.(*MockStorage) mockS := s.(*MockStorage)
mockS.EXPECT().GetSigningKey().Return(nil, errors.New("error")) mockS.EXPECT().GetSigningKey(gomock.Any()).Return(nil, errors.New("error"))
} }
func ExpectSigningKeyInvalid(s op.Storage) { func ExpectSigningKeyInvalid(s op.Storage) {
mockS := s.(*MockStorage) mockS := s.(*MockStorage)
mockS.EXPECT().GetSigningKey().Return(&jose.SigningKey{}, nil) mockS.EXPECT().GetSigningKey(gomock.Any()).Return(&jose.SigningKey{}, nil)
} }
func ExpectSigningKey(s op.Storage) { func ExpectSigningKey(s op.Storage) {
mockS := s.(*MockStorage) mockS := s.(*MockStorage)
mockS.EXPECT().GetSigningKey().Return(&jose.SigningKey{Algorithm: jose.HS256, Key: []byte("key")}, nil) mockS.EXPECT().GetSigningKey(gomock.Any()).Return(&jose.SigningKey{Algorithm: jose.HS256, Key: []byte("key")}, nil)
} }
type ConfClient struct { type ConfClient struct {