From 63fda45cfd5f793e17c68616c9d8e41e47168977 Mon Sep 17 00:00:00 2001 From: Livio Amstutz Date: Mon, 3 Aug 2020 15:46:20 +0200 Subject: [PATCH] fix tests with VerifyIdToken --- example/internal/mock/storage.go | 2 +- pkg/op/mock/authorizer.mock.impl.go | 3 +++ pkg/rp/mock/verifier.mock.impl.go | 4 ++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/example/internal/mock/storage.go b/example/internal/mock/storage.go index 5fb823b..289402b 100644 --- a/example/internal/mock/storage.go +++ b/example/internal/mock/storage.go @@ -170,7 +170,7 @@ func (s *AuthStorage) GetKeySet(_ context.Context) (*jose.JSONWebKeySet, error) pubkey := s.key.Public() return &jose.JSONWebKeySet{ Keys: []jose.JSONWebKey{ - jose.JSONWebKey{Key: pubkey, Use: "sig", Algorithm: "RS256", KeyID: "1"}, + {Key: pubkey, Use: "sig", Algorithm: "RS256", KeyID: "1"}, }, }, nil } diff --git a/pkg/op/mock/authorizer.mock.impl.go b/pkg/op/mock/authorizer.mock.impl.go index 29c9354..97aa08d 100644 --- a/pkg/op/mock/authorizer.mock.impl.go +++ b/pkg/op/mock/authorizer.mock.impl.go @@ -69,6 +69,9 @@ type Verifier struct{} func (v *Verifier) Verify(ctx context.Context, accessToken, idToken string) (*oidc.IDTokenClaims, error) { return nil, nil } +func (v *Verifier) VerifyIdToken(ctx context.Context, idToken string) (*oidc.IDTokenClaims, error) { + return nil, nil +} type Sig struct{} diff --git a/pkg/rp/mock/verifier.mock.impl.go b/pkg/rp/mock/verifier.mock.impl.go index 8a94809..6d70620 100644 --- a/pkg/rp/mock/verifier.mock.impl.go +++ b/pkg/rp/mock/verifier.mock.impl.go @@ -22,7 +22,7 @@ func NewMockVerifierExpectInvalid(t *testing.T) rp.Verifier { func ExpectVerifyInvalid(v rp.Verifier) { mock := v.(*MockVerifier) - mock.EXPECT().Verify(gomock.Any(), gomock.Any(), gomock.Any()).Return(nil, errors.New("invalid")) + mock.EXPECT().VerifyIdToken(gomock.Any(), gomock.Any()).Return(nil, errors.New("invalid")) } func NewMockVerifierExpectValid(t *testing.T) rp.Verifier { @@ -33,5 +33,5 @@ func NewMockVerifierExpectValid(t *testing.T) rp.Verifier { func ExpectVerifyValid(v rp.Verifier) { mock := v.(*MockVerifier) - mock.EXPECT().Verify(gomock.Any(), gomock.Any(), gomock.Any()).Return(&oidc.IDTokenClaims{Userinfo: oidc.Userinfo{Subject: "id"}}, nil) + mock.EXPECT().VerifyIdToken(gomock.Any(), gomock.Any()).Return(&oidc.IDTokenClaims{Userinfo: oidc.Userinfo{Subject: "id"}}, nil) }