From 2a11a1979e804571a0c01b49d8ce5615ee04e222 Mon Sep 17 00:00:00 2001 From: Livio Amstutz Date: Tue, 11 May 2021 10:48:11 +0200 Subject: [PATCH] rename storage methods and fix mocks --- example/internal/mock/storage.go | 12 ++- pkg/op/mock/authorizer.mock.go | 39 ++++---- pkg/op/mock/client.mock.go | 73 +++++++-------- pkg/op/mock/configuration.mock.go | 59 ++++++------ pkg/op/mock/signer.mock.go | 23 ++--- pkg/op/mock/storage.mock.go | 145 ++++++++++++++++++------------ pkg/op/storage.go | 6 +- pkg/op/token.go | 4 +- pkg/op/token_jwt_profile.go | 2 +- pkg/op/token_refresh.go | 2 +- 10 files changed, 204 insertions(+), 161 deletions(-) diff --git a/example/internal/mock/storage.go b/example/internal/mock/storage.go index 247459e..3d7bb63 100644 --- a/example/internal/mock/storage.go +++ b/example/internal/mock/storage.go @@ -95,6 +95,8 @@ func (a *AuthRequest) GetScopes() []string { } } +func (a *AuthRequest) SetCurrentScopes(scopes oidc.Scopes) {} + func (a *AuthRequest) GetState() string { return "" } @@ -151,15 +153,19 @@ func (s *AuthStorage) AuthRequestByID(_ context.Context, id string) (op.AuthRequ } return a, nil } -func (s *AuthStorage) CreateToken(_ context.Context, authReq op.TokenRequest) (string, time.Time, error) { +func (s *AuthStorage) CreateAccessToken(ctx context.Context, request op.TokenRequest) (string, time.Time, error) { return "id", time.Now().UTC().Add(5 * time.Minute), nil } -func (s *AuthStorage) AuthRequestByRefreshToken(_ context.Context, token string) (op.AuthRequest, error) { - if token != c { +func (s *AuthStorage) CreateAccessAndRefreshTokens(ctx context.Context, request op.TokenRequest, currentRefreshToken string) (accessTokenID string, newRefreshToken string, expiration time.Time, err error) { + return "id", "refreshToken", time.Now().UTC().Add(5 * time.Minute), nil +} +func (s *AuthStorage) TokenRequestByRefreshToken(ctx context.Context, refreshToken string) (op.RefreshTokenRequest, error) { + if refreshToken != c { return nil, errors.New("invalid token") } return a, nil } + func (s *AuthStorage) TerminateSession(_ context.Context, userID, clientID string) error { return nil } diff --git a/pkg/op/mock/authorizer.mock.go b/pkg/op/mock/authorizer.mock.go index 5da2437..69f6927 100644 --- a/pkg/op/mock/authorizer.mock.go +++ b/pkg/op/mock/authorizer.mock.go @@ -5,36 +5,37 @@ package mock import ( + reflect "reflect" + op "github.com/caos/oidc/pkg/op" utils "github.com/caos/oidc/pkg/utils" gomock "github.com/golang/mock/gomock" - reflect "reflect" ) -// MockAuthorizer is a mock of Authorizer interface +// MockAuthorizer is a mock of Authorizer interface. type MockAuthorizer struct { ctrl *gomock.Controller recorder *MockAuthorizerMockRecorder } -// MockAuthorizerMockRecorder is the mock recorder for MockAuthorizer +// MockAuthorizerMockRecorder is the mock recorder for MockAuthorizer. type MockAuthorizerMockRecorder struct { mock *MockAuthorizer } -// NewMockAuthorizer creates a new mock instance +// NewMockAuthorizer creates a new mock instance. func NewMockAuthorizer(ctrl *gomock.Controller) *MockAuthorizer { mock := &MockAuthorizer{ctrl: ctrl} mock.recorder = &MockAuthorizerMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockAuthorizer) EXPECT() *MockAuthorizerMockRecorder { return m.recorder } -// Crypto mocks base method +// Crypto mocks base method. func (m *MockAuthorizer) Crypto() op.Crypto { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Crypto") @@ -42,13 +43,13 @@ func (m *MockAuthorizer) Crypto() op.Crypto { return ret0 } -// Crypto indicates an expected call of Crypto +// Crypto indicates an expected call of Crypto. func (mr *MockAuthorizerMockRecorder) Crypto() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Crypto", reflect.TypeOf((*MockAuthorizer)(nil).Crypto)) } -// Decoder mocks base method +// Decoder mocks base method. func (m *MockAuthorizer) Decoder() utils.Decoder { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Decoder") @@ -56,13 +57,13 @@ func (m *MockAuthorizer) Decoder() utils.Decoder { return ret0 } -// Decoder indicates an expected call of Decoder +// Decoder indicates an expected call of Decoder. func (mr *MockAuthorizerMockRecorder) Decoder() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Decoder", reflect.TypeOf((*MockAuthorizer)(nil).Decoder)) } -// Encoder mocks base method +// Encoder mocks base method. func (m *MockAuthorizer) Encoder() utils.Encoder { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Encoder") @@ -70,13 +71,13 @@ func (m *MockAuthorizer) Encoder() utils.Encoder { return ret0 } -// Encoder indicates an expected call of Encoder +// Encoder indicates an expected call of Encoder. func (mr *MockAuthorizerMockRecorder) Encoder() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Encoder", reflect.TypeOf((*MockAuthorizer)(nil).Encoder)) } -// IDTokenHintVerifier mocks base method +// IDTokenHintVerifier mocks base method. func (m *MockAuthorizer) IDTokenHintVerifier() op.IDTokenHintVerifier { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IDTokenHintVerifier") @@ -84,13 +85,13 @@ func (m *MockAuthorizer) IDTokenHintVerifier() op.IDTokenHintVerifier { return ret0 } -// IDTokenHintVerifier indicates an expected call of IDTokenHintVerifier +// 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, "IDTokenHintVerifier", reflect.TypeOf((*MockAuthorizer)(nil).IDTokenHintVerifier)) } -// Issuer mocks base method +// Issuer mocks base method. func (m *MockAuthorizer) Issuer() string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Issuer") @@ -98,13 +99,13 @@ func (m *MockAuthorizer) Issuer() string { return ret0 } -// Issuer indicates an expected call of Issuer +// Issuer indicates an expected call of Issuer. func (mr *MockAuthorizerMockRecorder) Issuer() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Issuer", reflect.TypeOf((*MockAuthorizer)(nil).Issuer)) } -// Signer mocks base method +// Signer mocks base method. func (m *MockAuthorizer) Signer() op.Signer { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Signer") @@ -112,13 +113,13 @@ func (m *MockAuthorizer) Signer() op.Signer { return ret0 } -// Signer indicates an expected call of Signer +// Signer indicates an expected call of Signer. func (mr *MockAuthorizerMockRecorder) Signer() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Signer", reflect.TypeOf((*MockAuthorizer)(nil).Signer)) } -// Storage mocks base method +// Storage mocks base method. func (m *MockAuthorizer) Storage() op.Storage { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Storage") @@ -126,7 +127,7 @@ func (m *MockAuthorizer) Storage() op.Storage { return ret0 } -// Storage indicates an expected call of Storage +// Storage indicates an expected call of Storage. func (mr *MockAuthorizerMockRecorder) Storage() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Storage", reflect.TypeOf((*MockAuthorizer)(nil).Storage)) diff --git a/pkg/op/mock/client.mock.go b/pkg/op/mock/client.mock.go index 9d5fe41..e03ae0c 100644 --- a/pkg/op/mock/client.mock.go +++ b/pkg/op/mock/client.mock.go @@ -5,37 +5,38 @@ package mock import ( + reflect "reflect" + time "time" + oidc "github.com/caos/oidc/pkg/oidc" op "github.com/caos/oidc/pkg/op" gomock "github.com/golang/mock/gomock" - reflect "reflect" - time "time" ) -// MockClient is a mock of Client interface +// MockClient is a mock of Client interface. type MockClient struct { ctrl *gomock.Controller recorder *MockClientMockRecorder } -// MockClientMockRecorder is the mock recorder for MockClient +// MockClientMockRecorder is the mock recorder for MockClient. type MockClientMockRecorder struct { mock *MockClient } -// NewMockClient creates a new mock instance +// NewMockClient creates a new mock instance. func NewMockClient(ctrl *gomock.Controller) *MockClient { mock := &MockClient{ctrl: ctrl} mock.recorder = &MockClientMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockClient) EXPECT() *MockClientMockRecorder { return m.recorder } -// AccessTokenType mocks base method +// AccessTokenType mocks base method. func (m *MockClient) AccessTokenType() op.AccessTokenType { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AccessTokenType") @@ -43,13 +44,13 @@ func (m *MockClient) AccessTokenType() op.AccessTokenType { return ret0 } -// AccessTokenType indicates an expected call of AccessTokenType +// AccessTokenType indicates an expected call of AccessTokenType. func (mr *MockClientMockRecorder) AccessTokenType() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AccessTokenType", reflect.TypeOf((*MockClient)(nil).AccessTokenType)) } -// ApplicationType mocks base method +// ApplicationType mocks base method. func (m *MockClient) ApplicationType() op.ApplicationType { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ApplicationType") @@ -57,13 +58,13 @@ func (m *MockClient) ApplicationType() op.ApplicationType { return ret0 } -// ApplicationType indicates an expected call of ApplicationType +// ApplicationType indicates an expected call of ApplicationType. func (mr *MockClientMockRecorder) ApplicationType() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ApplicationType", reflect.TypeOf((*MockClient)(nil).ApplicationType)) } -// AuthMethod mocks base method +// AuthMethod mocks base method. func (m *MockClient) AuthMethod() oidc.AuthMethod { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AuthMethod") @@ -71,13 +72,13 @@ func (m *MockClient) AuthMethod() oidc.AuthMethod { return ret0 } -// AuthMethod indicates an expected call of AuthMethod +// AuthMethod indicates an expected call of AuthMethod. func (mr *MockClientMockRecorder) AuthMethod() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AuthMethod", reflect.TypeOf((*MockClient)(nil).AuthMethod)) } -// ClockSkew mocks base method +// ClockSkew mocks base method. func (m *MockClient) ClockSkew() time.Duration { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ClockSkew") @@ -85,13 +86,13 @@ func (m *MockClient) ClockSkew() time.Duration { return ret0 } -// ClockSkew indicates an expected call of ClockSkew +// ClockSkew indicates an expected call of ClockSkew. func (mr *MockClientMockRecorder) ClockSkew() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClockSkew", reflect.TypeOf((*MockClient)(nil).ClockSkew)) } -// DevMode mocks base method +// DevMode mocks base method. func (m *MockClient) DevMode() bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DevMode") @@ -99,13 +100,13 @@ func (m *MockClient) DevMode() bool { return ret0 } -// DevMode indicates an expected call of DevMode +// DevMode indicates an expected call of DevMode. func (mr *MockClientMockRecorder) DevMode() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DevMode", reflect.TypeOf((*MockClient)(nil).DevMode)) } -// GetID mocks base method +// GetID mocks base method. func (m *MockClient) GetID() string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetID") @@ -113,13 +114,13 @@ func (m *MockClient) GetID() string { return ret0 } -// GetID indicates an expected call of GetID +// GetID indicates an expected call of GetID. func (mr *MockClientMockRecorder) GetID() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetID", reflect.TypeOf((*MockClient)(nil).GetID)) } -// IDTokenLifetime mocks base method +// IDTokenLifetime mocks base method. func (m *MockClient) IDTokenLifetime() time.Duration { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IDTokenLifetime") @@ -127,13 +128,13 @@ func (m *MockClient) IDTokenLifetime() time.Duration { return ret0 } -// IDTokenLifetime indicates an expected call of IDTokenLifetime +// IDTokenLifetime indicates an expected call of IDTokenLifetime. func (mr *MockClientMockRecorder) IDTokenLifetime() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IDTokenLifetime", reflect.TypeOf((*MockClient)(nil).IDTokenLifetime)) } -// IDTokenUserinfoClaimsAssertion mocks base method +// IDTokenUserinfoClaimsAssertion mocks base method. func (m *MockClient) IDTokenUserinfoClaimsAssertion() bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IDTokenUserinfoClaimsAssertion") @@ -141,13 +142,13 @@ func (m *MockClient) IDTokenUserinfoClaimsAssertion() bool { return ret0 } -// IDTokenUserinfoClaimsAssertion indicates an expected call of IDTokenUserinfoClaimsAssertion +// IDTokenUserinfoClaimsAssertion indicates an expected call of IDTokenUserinfoClaimsAssertion. func (mr *MockClientMockRecorder) IDTokenUserinfoClaimsAssertion() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IDTokenUserinfoClaimsAssertion", reflect.TypeOf((*MockClient)(nil).IDTokenUserinfoClaimsAssertion)) } -// IsScopeAllowed mocks base method +// IsScopeAllowed mocks base method. func (m *MockClient) IsScopeAllowed(arg0 string) bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IsScopeAllowed", arg0) @@ -155,13 +156,13 @@ func (m *MockClient) IsScopeAllowed(arg0 string) bool { return ret0 } -// IsScopeAllowed indicates an expected call of IsScopeAllowed +// IsScopeAllowed indicates an expected call of IsScopeAllowed. func (mr *MockClientMockRecorder) IsScopeAllowed(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsScopeAllowed", reflect.TypeOf((*MockClient)(nil).IsScopeAllowed), arg0) } -// LoginURL mocks base method +// LoginURL mocks base method. func (m *MockClient) LoginURL(arg0 string) string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "LoginURL", arg0) @@ -169,13 +170,13 @@ func (m *MockClient) LoginURL(arg0 string) string { return ret0 } -// LoginURL indicates an expected call of LoginURL +// LoginURL indicates an expected call of LoginURL. func (mr *MockClientMockRecorder) LoginURL(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "LoginURL", reflect.TypeOf((*MockClient)(nil).LoginURL), arg0) } -// PostLogoutRedirectURIs mocks base method +// PostLogoutRedirectURIs mocks base method. func (m *MockClient) PostLogoutRedirectURIs() []string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "PostLogoutRedirectURIs") @@ -183,13 +184,13 @@ func (m *MockClient) PostLogoutRedirectURIs() []string { return ret0 } -// PostLogoutRedirectURIs indicates an expected call of PostLogoutRedirectURIs +// PostLogoutRedirectURIs indicates an expected call of PostLogoutRedirectURIs. func (mr *MockClientMockRecorder) PostLogoutRedirectURIs() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PostLogoutRedirectURIs", reflect.TypeOf((*MockClient)(nil).PostLogoutRedirectURIs)) } -// RedirectURIs mocks base method +// RedirectURIs mocks base method. func (m *MockClient) RedirectURIs() []string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RedirectURIs") @@ -197,13 +198,13 @@ func (m *MockClient) RedirectURIs() []string { return ret0 } -// RedirectURIs indicates an expected call of RedirectURIs +// RedirectURIs indicates an expected call of RedirectURIs. func (mr *MockClientMockRecorder) RedirectURIs() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RedirectURIs", reflect.TypeOf((*MockClient)(nil).RedirectURIs)) } -// ResponseTypes mocks base method +// ResponseTypes mocks base method. func (m *MockClient) ResponseTypes() []oidc.ResponseType { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ResponseTypes") @@ -211,13 +212,13 @@ func (m *MockClient) ResponseTypes() []oidc.ResponseType { return ret0 } -// ResponseTypes indicates an expected call of ResponseTypes +// ResponseTypes indicates an expected call of ResponseTypes. func (mr *MockClientMockRecorder) ResponseTypes() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ResponseTypes", reflect.TypeOf((*MockClient)(nil).ResponseTypes)) } -// RestrictAdditionalAccessTokenScopes mocks base method +// RestrictAdditionalAccessTokenScopes mocks base method. func (m *MockClient) RestrictAdditionalAccessTokenScopes() func([]string) []string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RestrictAdditionalAccessTokenScopes") @@ -225,13 +226,13 @@ func (m *MockClient) RestrictAdditionalAccessTokenScopes() func([]string) []stri return ret0 } -// RestrictAdditionalAccessTokenScopes indicates an expected call of RestrictAdditionalAccessTokenScopes +// RestrictAdditionalAccessTokenScopes indicates an expected call of RestrictAdditionalAccessTokenScopes. func (mr *MockClientMockRecorder) RestrictAdditionalAccessTokenScopes() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RestrictAdditionalAccessTokenScopes", reflect.TypeOf((*MockClient)(nil).RestrictAdditionalAccessTokenScopes)) } -// RestrictAdditionalIdTokenScopes mocks base method +// RestrictAdditionalIdTokenScopes mocks base method. func (m *MockClient) RestrictAdditionalIdTokenScopes() func([]string) []string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "RestrictAdditionalIdTokenScopes") @@ -239,7 +240,7 @@ func (m *MockClient) RestrictAdditionalIdTokenScopes() func([]string) []string { return ret0 } -// RestrictAdditionalIdTokenScopes indicates an expected call of RestrictAdditionalIdTokenScopes +// RestrictAdditionalIdTokenScopes indicates an expected call of RestrictAdditionalIdTokenScopes. func (mr *MockClientMockRecorder) RestrictAdditionalIdTokenScopes() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RestrictAdditionalIdTokenScopes", reflect.TypeOf((*MockClient)(nil).RestrictAdditionalIdTokenScopes)) diff --git a/pkg/op/mock/configuration.mock.go b/pkg/op/mock/configuration.mock.go index 4f83f35..f9f297e 100644 --- a/pkg/op/mock/configuration.mock.go +++ b/pkg/op/mock/configuration.mock.go @@ -5,35 +5,36 @@ package mock import ( + reflect "reflect" + op "github.com/caos/oidc/pkg/op" gomock "github.com/golang/mock/gomock" - reflect "reflect" ) -// MockConfiguration is a mock of Configuration interface +// MockConfiguration is a mock of Configuration interface. type MockConfiguration struct { ctrl *gomock.Controller recorder *MockConfigurationMockRecorder } -// MockConfigurationMockRecorder is the mock recorder for MockConfiguration +// MockConfigurationMockRecorder is the mock recorder for MockConfiguration. type MockConfigurationMockRecorder struct { mock *MockConfiguration } -// NewMockConfiguration creates a new mock instance +// NewMockConfiguration creates a new mock instance. func NewMockConfiguration(ctrl *gomock.Controller) *MockConfiguration { mock := &MockConfiguration{ctrl: ctrl} mock.recorder = &MockConfigurationMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockConfiguration) EXPECT() *MockConfigurationMockRecorder { return m.recorder } -// AuthMethodPostSupported mocks base method +// AuthMethodPostSupported mocks base method. func (m *MockConfiguration) AuthMethodPostSupported() bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AuthMethodPostSupported") @@ -41,13 +42,13 @@ func (m *MockConfiguration) AuthMethodPostSupported() bool { return ret0 } -// AuthMethodPostSupported indicates an expected call of AuthMethodPostSupported +// AuthMethodPostSupported indicates an expected call of AuthMethodPostSupported. func (mr *MockConfigurationMockRecorder) AuthMethodPostSupported() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AuthMethodPostSupported", reflect.TypeOf((*MockConfiguration)(nil).AuthMethodPostSupported)) } -// AuthMethodPrivateKeyJWTSupported mocks base method +// AuthMethodPrivateKeyJWTSupported mocks base method. func (m *MockConfiguration) AuthMethodPrivateKeyJWTSupported() bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AuthMethodPrivateKeyJWTSupported") @@ -55,13 +56,13 @@ func (m *MockConfiguration) AuthMethodPrivateKeyJWTSupported() bool { return ret0 } -// AuthMethodPrivateKeyJWTSupported indicates an expected call of AuthMethodPrivateKeyJWTSupported +// AuthMethodPrivateKeyJWTSupported indicates an expected call of AuthMethodPrivateKeyJWTSupported. func (mr *MockConfigurationMockRecorder) AuthMethodPrivateKeyJWTSupported() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AuthMethodPrivateKeyJWTSupported", reflect.TypeOf((*MockConfiguration)(nil).AuthMethodPrivateKeyJWTSupported)) } -// AuthorizationEndpoint mocks base method +// AuthorizationEndpoint mocks base method. func (m *MockConfiguration) AuthorizationEndpoint() op.Endpoint { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AuthorizationEndpoint") @@ -69,13 +70,13 @@ func (m *MockConfiguration) AuthorizationEndpoint() op.Endpoint { return ret0 } -// AuthorizationEndpoint indicates an expected call of AuthorizationEndpoint +// AuthorizationEndpoint indicates an expected call of AuthorizationEndpoint. func (mr *MockConfigurationMockRecorder) AuthorizationEndpoint() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AuthorizationEndpoint", reflect.TypeOf((*MockConfiguration)(nil).AuthorizationEndpoint)) } -// CodeMethodS256Supported mocks base method +// CodeMethodS256Supported mocks base method. func (m *MockConfiguration) CodeMethodS256Supported() bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CodeMethodS256Supported") @@ -83,13 +84,13 @@ func (m *MockConfiguration) CodeMethodS256Supported() bool { return ret0 } -// CodeMethodS256Supported indicates an expected call of CodeMethodS256Supported +// CodeMethodS256Supported indicates an expected call of CodeMethodS256Supported. func (mr *MockConfigurationMockRecorder) CodeMethodS256Supported() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CodeMethodS256Supported", reflect.TypeOf((*MockConfiguration)(nil).CodeMethodS256Supported)) } -// EndSessionEndpoint mocks base method +// EndSessionEndpoint mocks base method. func (m *MockConfiguration) EndSessionEndpoint() op.Endpoint { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "EndSessionEndpoint") @@ -97,13 +98,13 @@ func (m *MockConfiguration) EndSessionEndpoint() op.Endpoint { return ret0 } -// EndSessionEndpoint indicates an expected call of EndSessionEndpoint +// EndSessionEndpoint indicates an expected call of EndSessionEndpoint. func (mr *MockConfigurationMockRecorder) EndSessionEndpoint() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "EndSessionEndpoint", reflect.TypeOf((*MockConfiguration)(nil).EndSessionEndpoint)) } -// GrantTypeJWTAuthorizationSupported mocks base method +// GrantTypeJWTAuthorizationSupported mocks base method. func (m *MockConfiguration) GrantTypeJWTAuthorizationSupported() bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GrantTypeJWTAuthorizationSupported") @@ -111,13 +112,13 @@ func (m *MockConfiguration) GrantTypeJWTAuthorizationSupported() bool { return ret0 } -// GrantTypeJWTAuthorizationSupported indicates an expected call of GrantTypeJWTAuthorizationSupported +// GrantTypeJWTAuthorizationSupported indicates an expected call of GrantTypeJWTAuthorizationSupported. func (mr *MockConfigurationMockRecorder) GrantTypeJWTAuthorizationSupported() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GrantTypeJWTAuthorizationSupported", reflect.TypeOf((*MockConfiguration)(nil).GrantTypeJWTAuthorizationSupported)) } -// GrantTypeTokenExchangeSupported mocks base method +// GrantTypeTokenExchangeSupported mocks base method. func (m *MockConfiguration) GrantTypeTokenExchangeSupported() bool { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GrantTypeTokenExchangeSupported") @@ -125,13 +126,13 @@ func (m *MockConfiguration) GrantTypeTokenExchangeSupported() bool { return ret0 } -// GrantTypeTokenExchangeSupported indicates an expected call of GrantTypeTokenExchangeSupported +// GrantTypeTokenExchangeSupported indicates an expected call of GrantTypeTokenExchangeSupported. func (mr *MockConfigurationMockRecorder) GrantTypeTokenExchangeSupported() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GrantTypeTokenExchangeSupported", reflect.TypeOf((*MockConfiguration)(nil).GrantTypeTokenExchangeSupported)) } -// IntrospectionEndpoint mocks base method +// IntrospectionEndpoint mocks base method. func (m *MockConfiguration) IntrospectionEndpoint() op.Endpoint { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "IntrospectionEndpoint") @@ -139,13 +140,13 @@ func (m *MockConfiguration) IntrospectionEndpoint() op.Endpoint { return ret0 } -// IntrospectionEndpoint indicates an expected call of IntrospectionEndpoint +// IntrospectionEndpoint indicates an expected call of IntrospectionEndpoint. func (mr *MockConfigurationMockRecorder) IntrospectionEndpoint() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IntrospectionEndpoint", reflect.TypeOf((*MockConfiguration)(nil).IntrospectionEndpoint)) } -// Issuer mocks base method +// Issuer mocks base method. func (m *MockConfiguration) Issuer() string { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Issuer") @@ -153,13 +154,13 @@ func (m *MockConfiguration) Issuer() string { return ret0 } -// Issuer indicates an expected call of Issuer +// Issuer indicates an expected call of Issuer. func (mr *MockConfigurationMockRecorder) Issuer() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Issuer", reflect.TypeOf((*MockConfiguration)(nil).Issuer)) } -// KeysEndpoint mocks base method +// KeysEndpoint mocks base method. func (m *MockConfiguration) KeysEndpoint() op.Endpoint { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "KeysEndpoint") @@ -167,13 +168,13 @@ func (m *MockConfiguration) KeysEndpoint() op.Endpoint { return ret0 } -// KeysEndpoint indicates an expected call of KeysEndpoint +// KeysEndpoint indicates an expected call of KeysEndpoint. func (mr *MockConfigurationMockRecorder) KeysEndpoint() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "KeysEndpoint", reflect.TypeOf((*MockConfiguration)(nil).KeysEndpoint)) } -// TokenEndpoint mocks base method +// TokenEndpoint mocks base method. func (m *MockConfiguration) TokenEndpoint() op.Endpoint { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "TokenEndpoint") @@ -181,13 +182,13 @@ func (m *MockConfiguration) TokenEndpoint() op.Endpoint { return ret0 } -// TokenEndpoint indicates an expected call of TokenEndpoint +// TokenEndpoint indicates an expected call of TokenEndpoint. func (mr *MockConfigurationMockRecorder) TokenEndpoint() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TokenEndpoint", reflect.TypeOf((*MockConfiguration)(nil).TokenEndpoint)) } -// UserinfoEndpoint mocks base method +// UserinfoEndpoint mocks base method. func (m *MockConfiguration) UserinfoEndpoint() op.Endpoint { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "UserinfoEndpoint") @@ -195,7 +196,7 @@ func (m *MockConfiguration) UserinfoEndpoint() op.Endpoint { return ret0 } -// UserinfoEndpoint indicates an expected call of UserinfoEndpoint +// UserinfoEndpoint indicates an expected call of UserinfoEndpoint. func (mr *MockConfigurationMockRecorder) UserinfoEndpoint() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UserinfoEndpoint", reflect.TypeOf((*MockConfiguration)(nil).UserinfoEndpoint)) diff --git a/pkg/op/mock/signer.mock.go b/pkg/op/mock/signer.mock.go index b52f9d4..0564aa1 100644 --- a/pkg/op/mock/signer.mock.go +++ b/pkg/op/mock/signer.mock.go @@ -6,35 +6,36 @@ package mock import ( context "context" + reflect "reflect" + gomock "github.com/golang/mock/gomock" jose "gopkg.in/square/go-jose.v2" - reflect "reflect" ) -// MockSigner is a mock of Signer interface +// MockSigner is a mock of Signer interface. type MockSigner struct { ctrl *gomock.Controller recorder *MockSignerMockRecorder } -// MockSignerMockRecorder is the mock recorder for MockSigner +// MockSignerMockRecorder is the mock recorder for MockSigner. type MockSignerMockRecorder struct { mock *MockSigner } -// NewMockSigner creates a new mock instance +// NewMockSigner creates a new mock instance. func NewMockSigner(ctrl *gomock.Controller) *MockSigner { mock := &MockSigner{ctrl: ctrl} mock.recorder = &MockSignerMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockSigner) EXPECT() *MockSignerMockRecorder { return m.recorder } -// Health mocks base method +// Health mocks base method. func (m *MockSigner) Health(arg0 context.Context) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Health", arg0) @@ -42,13 +43,13 @@ func (m *MockSigner) Health(arg0 context.Context) error { return ret0 } -// Health indicates an expected call of Health +// Health indicates an expected call of Health. func (mr *MockSignerMockRecorder) Health(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Health", reflect.TypeOf((*MockSigner)(nil).Health), arg0) } -// SignatureAlgorithm mocks base method +// SignatureAlgorithm mocks base method. func (m *MockSigner) SignatureAlgorithm() jose.SignatureAlgorithm { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SignatureAlgorithm") @@ -56,13 +57,13 @@ func (m *MockSigner) SignatureAlgorithm() jose.SignatureAlgorithm { return ret0 } -// SignatureAlgorithm indicates an expected call of SignatureAlgorithm +// SignatureAlgorithm indicates an expected call of SignatureAlgorithm. func (mr *MockSignerMockRecorder) SignatureAlgorithm() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SignatureAlgorithm", reflect.TypeOf((*MockSigner)(nil).SignatureAlgorithm)) } -// Signer mocks base method +// Signer mocks base method. func (m *MockSigner) Signer() jose.Signer { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Signer") @@ -70,7 +71,7 @@ func (m *MockSigner) Signer() jose.Signer { return ret0 } -// Signer indicates an expected call of Signer +// Signer indicates an expected call of Signer. func (mr *MockSignerMockRecorder) Signer() *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Signer", reflect.TypeOf((*MockSigner)(nil).Signer)) diff --git a/pkg/op/mock/storage.mock.go b/pkg/op/mock/storage.mock.go index 280e8e6..be261bb 100644 --- a/pkg/op/mock/storage.mock.go +++ b/pkg/op/mock/storage.mock.go @@ -6,38 +6,39 @@ package mock import ( context "context" + reflect "reflect" + time "time" + oidc "github.com/caos/oidc/pkg/oidc" op "github.com/caos/oidc/pkg/op" gomock "github.com/golang/mock/gomock" jose "gopkg.in/square/go-jose.v2" - reflect "reflect" - time "time" ) -// MockStorage is a mock of Storage interface +// MockStorage is a mock of Storage interface. type MockStorage struct { ctrl *gomock.Controller recorder *MockStorageMockRecorder } -// MockStorageMockRecorder is the mock recorder for MockStorage +// MockStorageMockRecorder is the mock recorder for MockStorage. type MockStorageMockRecorder struct { mock *MockStorage } -// NewMockStorage creates a new mock instance +// NewMockStorage creates a new mock instance. func NewMockStorage(ctrl *gomock.Controller) *MockStorage { mock := &MockStorage{ctrl: ctrl} mock.recorder = &MockStorageMockRecorder{mock} return mock } -// EXPECT returns an object that allows the caller to indicate expected use +// EXPECT returns an object that allows the caller to indicate expected use. func (m *MockStorage) EXPECT() *MockStorageMockRecorder { return m.recorder } -// AuthRequestByCode mocks base method +// AuthRequestByCode mocks base method. func (m *MockStorage) AuthRequestByCode(arg0 context.Context, arg1 string) (op.AuthRequest, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AuthRequestByCode", arg0, arg1) @@ -46,13 +47,13 @@ func (m *MockStorage) AuthRequestByCode(arg0 context.Context, arg1 string) (op.A return ret0, ret1 } -// AuthRequestByCode indicates an expected call of AuthRequestByCode +// AuthRequestByCode indicates an expected call of AuthRequestByCode. func (mr *MockStorageMockRecorder) AuthRequestByCode(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AuthRequestByCode", reflect.TypeOf((*MockStorage)(nil).AuthRequestByCode), arg0, arg1) } -// AuthRequestByID mocks base method +// AuthRequestByID mocks base method. func (m *MockStorage) AuthRequestByID(arg0 context.Context, arg1 string) (op.AuthRequest, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AuthRequestByID", arg0, arg1) @@ -61,13 +62,13 @@ func (m *MockStorage) AuthRequestByID(arg0 context.Context, arg1 string) (op.Aut return ret0, ret1 } -// AuthRequestByID indicates an expected call of AuthRequestByID +// AuthRequestByID indicates an expected call of AuthRequestByID. func (mr *MockStorageMockRecorder) AuthRequestByID(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AuthRequestByID", reflect.TypeOf((*MockStorage)(nil).AuthRequestByID), arg0, arg1) } -// AuthorizeClientIDSecret mocks base method +// AuthorizeClientIDSecret mocks base method. func (m *MockStorage) AuthorizeClientIDSecret(arg0 context.Context, arg1, arg2 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "AuthorizeClientIDSecret", arg0, arg1, arg2) @@ -75,13 +76,46 @@ func (m *MockStorage) AuthorizeClientIDSecret(arg0 context.Context, arg1, arg2 s return ret0 } -// AuthorizeClientIDSecret indicates an expected call of AuthorizeClientIDSecret +// AuthorizeClientIDSecret indicates an expected call of AuthorizeClientIDSecret. func (mr *MockStorageMockRecorder) AuthorizeClientIDSecret(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AuthorizeClientIDSecret", reflect.TypeOf((*MockStorage)(nil).AuthorizeClientIDSecret), arg0, arg1, arg2) } -// CreateAuthRequest mocks base method +// CreateAccessAndRefreshTokens mocks base method. +func (m *MockStorage) CreateAccessAndRefreshTokens(arg0 context.Context, arg1 op.TokenRequest, arg2 string) (string, string, time.Time, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "CreateAccessAndRefreshTokens", arg0, arg1, arg2) + ret0, _ := ret[0].(string) + ret1, _ := ret[1].(string) + ret2, _ := ret[2].(time.Time) + ret3, _ := ret[3].(error) + return ret0, ret1, ret2, ret3 +} + +// CreateAccessAndRefreshTokens indicates an expected call of CreateAccessAndRefreshTokens. +func (mr *MockStorageMockRecorder) CreateAccessAndRefreshTokens(arg0, arg1, arg2 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAccessAndRefreshTokens", reflect.TypeOf((*MockStorage)(nil).CreateAccessAndRefreshTokens), arg0, arg1, arg2) +} + +// CreateAccessToken mocks base method. +func (m *MockStorage) CreateAccessToken(arg0 context.Context, arg1 op.TokenRequest) (string, time.Time, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "CreateAccessToken", arg0, arg1) + ret0, _ := ret[0].(string) + ret1, _ := ret[1].(time.Time) + ret2, _ := ret[2].(error) + return ret0, ret1, ret2 +} + +// CreateAccessToken indicates an expected call of CreateAccessToken. +func (mr *MockStorageMockRecorder) CreateAccessToken(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAccessToken", reflect.TypeOf((*MockStorage)(nil).CreateAccessToken), arg0, arg1) +} + +// CreateAuthRequest mocks base method. func (m *MockStorage) CreateAuthRequest(arg0 context.Context, arg1 *oidc.AuthRequest, arg2 string) (op.AuthRequest, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "CreateAuthRequest", arg0, arg1, arg2) @@ -90,29 +124,13 @@ func (m *MockStorage) CreateAuthRequest(arg0 context.Context, arg1 *oidc.AuthReq return ret0, ret1 } -// CreateAuthRequest indicates an expected call of CreateAuthRequest +// CreateAuthRequest indicates an expected call of CreateAuthRequest. func (mr *MockStorageMockRecorder) CreateAuthRequest(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAuthRequest", reflect.TypeOf((*MockStorage)(nil).CreateAuthRequest), arg0, arg1, arg2) } -// CreateToken mocks base method -func (m *MockStorage) CreateToken(arg0 context.Context, arg1 op.TokenRequest) (string, time.Time, error) { - m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateToken", arg0, arg1) - ret0, _ := ret[0].(string) - ret1, _ := ret[1].(time.Time) - ret2, _ := ret[2].(error) - return ret0, ret1, ret2 -} - -// CreateToken indicates an expected call of CreateToken -func (mr *MockStorageMockRecorder) CreateToken(arg0, arg1 interface{}) *gomock.Call { - mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateToken", reflect.TypeOf((*MockStorage)(nil).CreateToken), arg0, arg1) -} - -// DeleteAuthRequest mocks base method +// DeleteAuthRequest mocks base method. func (m *MockStorage) DeleteAuthRequest(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "DeleteAuthRequest", arg0, arg1) @@ -120,13 +138,13 @@ func (m *MockStorage) DeleteAuthRequest(arg0 context.Context, arg1 string) error return ret0 } -// DeleteAuthRequest indicates an expected call of DeleteAuthRequest +// DeleteAuthRequest indicates an expected call of DeleteAuthRequest. func (mr *MockStorageMockRecorder) DeleteAuthRequest(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAuthRequest", reflect.TypeOf((*MockStorage)(nil).DeleteAuthRequest), arg0, arg1) } -// GetClientByClientID mocks base method +// GetClientByClientID mocks base method. func (m *MockStorage) GetClientByClientID(arg0 context.Context, arg1 string) (op.Client, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetClientByClientID", arg0, arg1) @@ -135,13 +153,13 @@ func (m *MockStorage) GetClientByClientID(arg0 context.Context, arg1 string) (op return ret0, ret1 } -// GetClientByClientID indicates an expected call of GetClientByClientID +// GetClientByClientID indicates an expected call of GetClientByClientID. func (mr *MockStorageMockRecorder) GetClientByClientID(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetClientByClientID", reflect.TypeOf((*MockStorage)(nil).GetClientByClientID), arg0, arg1) } -// GetKeyByIDAndUserID mocks base method +// GetKeyByIDAndUserID mocks base method. func (m *MockStorage) GetKeyByIDAndUserID(arg0 context.Context, arg1, arg2 string) (*jose.JSONWebKey, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetKeyByIDAndUserID", arg0, arg1, arg2) @@ -150,13 +168,13 @@ func (m *MockStorage) GetKeyByIDAndUserID(arg0 context.Context, arg1, arg2 strin return ret0, ret1 } -// GetKeyByIDAndUserID indicates an expected call of GetKeyByIDAndUserID +// GetKeyByIDAndUserID indicates an expected call of GetKeyByIDAndUserID. func (mr *MockStorageMockRecorder) GetKeyByIDAndUserID(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetKeyByIDAndUserID", reflect.TypeOf((*MockStorage)(nil).GetKeyByIDAndUserID), arg0, arg1, arg2) } -// GetKeySet mocks base method +// GetKeySet mocks base method. func (m *MockStorage) GetKeySet(arg0 context.Context) (*jose.JSONWebKeySet, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetKeySet", arg0) @@ -165,13 +183,13 @@ func (m *MockStorage) GetKeySet(arg0 context.Context) (*jose.JSONWebKeySet, erro return ret0, ret1 } -// GetKeySet indicates an expected call of GetKeySet +// GetKeySet indicates an expected call of GetKeySet. func (mr *MockStorageMockRecorder) GetKeySet(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetKeySet", reflect.TypeOf((*MockStorage)(nil).GetKeySet), arg0) } -// GetPrivateClaimsFromScopes mocks base method +// GetPrivateClaimsFromScopes mocks base method. func (m *MockStorage) GetPrivateClaimsFromScopes(arg0 context.Context, arg1, arg2 string, arg3 []string) (map[string]interface{}, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "GetPrivateClaimsFromScopes", arg0, arg1, arg2, arg3) @@ -180,25 +198,25 @@ func (m *MockStorage) GetPrivateClaimsFromScopes(arg0 context.Context, arg1, arg return ret0, ret1 } -// GetPrivateClaimsFromScopes indicates an expected call of GetPrivateClaimsFromScopes +// GetPrivateClaimsFromScopes indicates an expected call of GetPrivateClaimsFromScopes. func (mr *MockStorageMockRecorder) GetPrivateClaimsFromScopes(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPrivateClaimsFromScopes", reflect.TypeOf((*MockStorage)(nil).GetPrivateClaimsFromScopes), arg0, arg1, arg2, arg3) } -// GetSigningKey mocks base method +// GetSigningKey mocks base method. func (m *MockStorage) GetSigningKey(arg0 context.Context, arg1 chan<- jose.SigningKey) { m.ctrl.T.Helper() m.ctrl.Call(m, "GetSigningKey", arg0, arg1) } -// GetSigningKey indicates an expected call of GetSigningKey +// GetSigningKey indicates an expected call of GetSigningKey. func (mr *MockStorageMockRecorder) GetSigningKey(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetSigningKey", reflect.TypeOf((*MockStorage)(nil).GetSigningKey), arg0, arg1) } -// Health mocks base method +// Health mocks base method. func (m *MockStorage) Health(arg0 context.Context) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "Health", arg0) @@ -206,13 +224,13 @@ func (m *MockStorage) Health(arg0 context.Context) error { return ret0 } -// Health indicates an expected call of Health +// Health indicates an expected call of Health. func (mr *MockStorageMockRecorder) Health(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Health", reflect.TypeOf((*MockStorage)(nil).Health), arg0) } -// SaveAuthCode mocks base method +// SaveAuthCode mocks base method. func (m *MockStorage) SaveAuthCode(arg0 context.Context, arg1, arg2 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SaveAuthCode", arg0, arg1, arg2) @@ -220,13 +238,13 @@ func (m *MockStorage) SaveAuthCode(arg0 context.Context, arg1, arg2 string) erro return ret0 } -// SaveAuthCode indicates an expected call of SaveAuthCode +// SaveAuthCode indicates an expected call of SaveAuthCode. func (mr *MockStorageMockRecorder) SaveAuthCode(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SaveAuthCode", reflect.TypeOf((*MockStorage)(nil).SaveAuthCode), arg0, arg1, arg2) } -// SetIntrospectionFromToken mocks base method +// SetIntrospectionFromToken mocks base method. func (m *MockStorage) SetIntrospectionFromToken(arg0 context.Context, arg1 oidc.IntrospectionResponse, arg2, arg3, arg4 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SetIntrospectionFromToken", arg0, arg1, arg2, arg3, arg4) @@ -234,13 +252,13 @@ func (m *MockStorage) SetIntrospectionFromToken(arg0 context.Context, arg1 oidc. return ret0 } -// SetIntrospectionFromToken indicates an expected call of SetIntrospectionFromToken +// SetIntrospectionFromToken indicates an expected call of SetIntrospectionFromToken. func (mr *MockStorageMockRecorder) SetIntrospectionFromToken(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetIntrospectionFromToken", reflect.TypeOf((*MockStorage)(nil).SetIntrospectionFromToken), arg0, arg1, arg2, arg3, arg4) } -// SetUserinfoFromScopes mocks base method +// SetUserinfoFromScopes mocks base method. func (m *MockStorage) SetUserinfoFromScopes(arg0 context.Context, arg1 oidc.UserInfoSetter, arg2, arg3 string, arg4 []string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SetUserinfoFromScopes", arg0, arg1, arg2, arg3, arg4) @@ -248,13 +266,13 @@ func (m *MockStorage) SetUserinfoFromScopes(arg0 context.Context, arg1 oidc.User return ret0 } -// SetUserinfoFromScopes indicates an expected call of SetUserinfoFromScopes +// SetUserinfoFromScopes indicates an expected call of SetUserinfoFromScopes. func (mr *MockStorageMockRecorder) SetUserinfoFromScopes(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetUserinfoFromScopes", reflect.TypeOf((*MockStorage)(nil).SetUserinfoFromScopes), arg0, arg1, arg2, arg3, arg4) } -// SetUserinfoFromToken mocks base method +// SetUserinfoFromToken mocks base method. func (m *MockStorage) SetUserinfoFromToken(arg0 context.Context, arg1 oidc.UserInfoSetter, arg2, arg3, arg4 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "SetUserinfoFromToken", arg0, arg1, arg2, arg3, arg4) @@ -262,13 +280,13 @@ func (m *MockStorage) SetUserinfoFromToken(arg0 context.Context, arg1 oidc.UserI return ret0 } -// SetUserinfoFromToken indicates an expected call of SetUserinfoFromToken +// SetUserinfoFromToken indicates an expected call of SetUserinfoFromToken. func (mr *MockStorageMockRecorder) SetUserinfoFromToken(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetUserinfoFromToken", reflect.TypeOf((*MockStorage)(nil).SetUserinfoFromToken), arg0, arg1, arg2, arg3, arg4) } -// TerminateSession mocks base method +// TerminateSession mocks base method. func (m *MockStorage) TerminateSession(arg0 context.Context, arg1, arg2 string) error { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "TerminateSession", arg0, arg1, arg2) @@ -276,13 +294,28 @@ func (m *MockStorage) TerminateSession(arg0 context.Context, arg1, arg2 string) return ret0 } -// TerminateSession indicates an expected call of TerminateSession +// TerminateSession indicates an expected call of TerminateSession. func (mr *MockStorageMockRecorder) TerminateSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TerminateSession", reflect.TypeOf((*MockStorage)(nil).TerminateSession), arg0, arg1, arg2) } -// ValidateJWTProfileScopes mocks base method +// TokenRequestByRefreshToken mocks base method. +func (m *MockStorage) TokenRequestByRefreshToken(arg0 context.Context, arg1 string) (op.RefreshTokenRequest, error) { + m.ctrl.T.Helper() + ret := m.ctrl.Call(m, "TokenRequestByRefreshToken", arg0, arg1) + ret0, _ := ret[0].(op.RefreshTokenRequest) + ret1, _ := ret[1].(error) + return ret0, ret1 +} + +// TokenRequestByRefreshToken indicates an expected call of TokenRequestByRefreshToken. +func (mr *MockStorageMockRecorder) TokenRequestByRefreshToken(arg0, arg1 interface{}) *gomock.Call { + mr.mock.ctrl.T.Helper() + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "TokenRequestByRefreshToken", reflect.TypeOf((*MockStorage)(nil).TokenRequestByRefreshToken), arg0, arg1) +} + +// ValidateJWTProfileScopes mocks base method. func (m *MockStorage) ValidateJWTProfileScopes(arg0 context.Context, arg1 string, arg2 oidc.Scopes) (oidc.Scopes, error) { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ValidateJWTProfileScopes", arg0, arg1, arg2) @@ -291,7 +324,7 @@ func (m *MockStorage) ValidateJWTProfileScopes(arg0 context.Context, arg1 string return ret0, ret1 } -// ValidateJWTProfileScopes indicates an expected call of ValidateJWTProfileScopes +// ValidateJWTProfileScopes indicates an expected call of ValidateJWTProfileScopes. func (mr *MockStorageMockRecorder) ValidateJWTProfileScopes(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateJWTProfileScopes", reflect.TypeOf((*MockStorage)(nil).ValidateJWTProfileScopes), arg0, arg1, arg2) diff --git a/pkg/op/storage.go b/pkg/op/storage.go index adba5cf..0e0794e 100644 --- a/pkg/op/storage.go +++ b/pkg/op/storage.go @@ -16,9 +16,9 @@ type AuthStorage interface { SaveAuthCode(context.Context, string, string) error DeleteAuthRequest(context.Context, string) error - CreateToken(context.Context, TokenRequest) (string, time.Time, error) - CreateTokens(ctx context.Context, request TokenRequest, currentRefreshToken string) (accessTokenID string, newRefreshToken string, expiration time.Time, err error) - RefreshTokenRequestByRefreshToken(context.Context, string) (RefreshTokenRequest, error) + CreateAccessToken(context.Context, TokenRequest) (string, time.Time, error) + CreateAccessAndRefreshTokens(ctx context.Context, request TokenRequest, currentRefreshToken string) (accessTokenID string, newRefreshToken string, expiration time.Time, err error) + TokenRequestByRefreshToken(ctx context.Context, refreshToken string) (RefreshTokenRequest, error) TerminateSession(context.Context, string, string) error diff --git a/pkg/op/token.go b/pkg/op/token.go index c18aa30..28bc011 100644 --- a/pkg/op/token.go +++ b/pkg/op/token.go @@ -55,9 +55,9 @@ func CreateTokenResponse(ctx context.Context, request IDTokenRequest, client Cli func createTokens(ctx context.Context, tokenRequest TokenRequest, storage Storage, refreshToken string) (id, newRefreshToken string, exp time.Time, err error) { if needsRefreshToken(tokenRequest) { - return storage.CreateTokens(ctx, tokenRequest, refreshToken) + return storage.CreateAccessAndRefreshTokens(ctx, tokenRequest, refreshToken) } - id, exp, err = storage.CreateToken(ctx, tokenRequest) + id, exp, err = storage.CreateAccessToken(ctx, tokenRequest) return } diff --git a/pkg/op/token_jwt_profile.go b/pkg/op/token_jwt_profile.go index c96d4b2..ac3e2a1 100644 --- a/pkg/op/token_jwt_profile.go +++ b/pkg/op/token_jwt_profile.go @@ -55,7 +55,7 @@ func ParseJWTProfileGrantRequest(r *http.Request, decoder utils.Decoder) (*oidc. //CreateJWTTokenResponse creates func CreateJWTTokenResponse(ctx context.Context, tokenRequest TokenRequest, creator TokenCreator) (*oidc.AccessTokenResponse, error) { - id, exp, err := creator.Storage().CreateToken(ctx, tokenRequest) + id, exp, err := creator.Storage().CreateAccessToken(ctx, tokenRequest) if err != nil { return nil, err } diff --git a/pkg/op/token_refresh.go b/pkg/op/token_refresh.go index 7a8632a..6d61099 100644 --- a/pkg/op/token_refresh.go +++ b/pkg/op/token_refresh.go @@ -122,7 +122,7 @@ func AuthorizeRefreshClient(ctx context.Context, tokenReq *oidc.RefreshTokenRequ //RefreshTokenRequestByRefreshToken returns the RefreshTokenRequest (data representing the original auth request) //corresponding to the refresh_token from Storage or an error func RefreshTokenRequestByRefreshToken(ctx context.Context, storage Storage, refreshToken string) (RefreshTokenRequest, error) { - request, err := storage.RefreshTokenRequestByRefreshToken(ctx, refreshToken) + request, err := storage.TokenRequestByRefreshToken(ctx, refreshToken) if err != nil { return nil, ErrInvalidRequest("invalid refreshToken") }