diff --git a/example/internal/mock/storage.go b/example/internal/mock/storage.go
index ca2849f..3581224 100644
--- a/example/internal/mock/storage.go
+++ b/example/internal/mock/storage.go
@@ -142,6 +142,9 @@ func (s *AuthStorage) GetSigningKey(_ context.Context) (*jose.SigningKey, error)
 func (s *AuthStorage) GetKey(_ context.Context) (*rsa.PrivateKey, error) {
 	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) {
 	pubkey := s.key.Public()
 	return &jose.JSONWebKeySet{
diff --git a/pkg/op/mock/storage.mock.go b/pkg/op/mock/storage.mock.go
index 35eaa39..3a36417 100644
--- a/pkg/op/mock/storage.mock.go
+++ b/pkg/op/mock/storage.mock.go
@@ -153,3 +153,18 @@ func (mr *MockStorageMockRecorder) GetUserinfoFromScopes(arg0, arg1 interface{})
 	mr.mock.ctrl.T.Helper()
 	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)
+}
diff --git a/pkg/op/mock/storage.mock.impl.go b/pkg/op/mock/storage.mock.impl.go
index c52ace0..74ded21 100644
--- a/pkg/op/mock/storage.mock.impl.go
+++ b/pkg/op/mock/storage.mock.impl.go
@@ -1,6 +1,7 @@
 package mock
 
 import (
+	"context"
 	"errors"
 	"testing"
 
@@ -30,8 +31,8 @@ func NewMockStorageExpectInvalidClientID(t *testing.T) op.Storage {
 func NewMockStorageAny(t *testing.T) op.Storage {
 	m := NewStorage(t)
 	mockS := m.(*MockStorage)
-	mockS.EXPECT().GetClientByClientID(gomock.Any()).AnyTimes().Return(&ConfClient{}, nil)
-	mockS.EXPECT().AuthorizeClientIDSecret(gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
+	mockS.EXPECT().GetClientByClientID(gomock.Any(), gomock.Any()).AnyTimes().Return(&ConfClient{}, nil)
+	mockS.EXPECT().AuthorizeClientIDSecret(gomock.Any(), gomock.Any(), gomock.Any()).AnyTimes().Return(nil)
 	return m
 }
 
@@ -54,13 +55,13 @@ func NewMockStorageSigningKey(t *testing.T) op.Storage {
 
 func ExpectInvalidClientID(s op.Storage) {
 	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) {
 	mockS := s.(*MockStorage)
-	mockS.EXPECT().GetClientByClientID(gomock.Any()).DoAndReturn(
-		func(id string) (op.Client, error) {
+	mockS.EXPECT().GetClientByClientID(gomock.Any(), gomock.Any()).DoAndReturn(
+		func(_ context.Context, id string) (op.Client, error) {
 			var appType op.ApplicationType
 			var authMethod op.AuthMethod
 			switch id {
@@ -80,17 +81,17 @@ func ExpectValidClientID(s op.Storage) {
 
 func ExpectSigningKeyError(s op.Storage) {
 	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) {
 	mockS := s.(*MockStorage)
-	mockS.EXPECT().GetSigningKey().Return(&jose.SigningKey{}, nil)
+	mockS.EXPECT().GetSigningKey(gomock.Any()).Return(&jose.SigningKey{}, nil)
 }
 
 func ExpectSigningKey(s op.Storage) {
 	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 {