From 23fe66866809e1116e9712fb4d807d67b4209507 Mon Sep 17 00:00:00 2001 From: Livio Amstutz Date: Mon, 7 Sep 2020 12:27:14 +0200 Subject: [PATCH] fix capitalization --- pkg/op/authrequest.go | 2 +- pkg/op/error.go | 4 ++-- pkg/op/mock/authorizer.mock.impl.go | 2 +- pkg/op/session.go | 2 +- pkg/rp/default_verifier.go | 6 +++--- pkg/rp/mock/verifier.mock.go | 12 ++++++------ pkg/rp/mock/verifier.mock.impl.go | 4 ++-- pkg/rp/verifier.go | 4 ++-- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/pkg/op/authrequest.go b/pkg/op/authrequest.go index 017efdd..743da68 100644 --- a/pkg/op/authrequest.go +++ b/pkg/op/authrequest.go @@ -152,7 +152,7 @@ func ValidateAuthReqIDTokenHint(ctx context.Context, idTokenHint string, verifie if idTokenHint == "" { return "", nil } - claims, err := verifier.VerifyIdToken(ctx, idTokenHint) + claims, err := verifier.VerifyIDToken(ctx, idTokenHint) if err != nil { return "", ErrInvalidRequest("The id_token_hint is invalid. If you have any questions, you may contact the administrator of the application.") } diff --git a/pkg/op/error.go b/pkg/op/error.go index 29b476b..06935c9 100644 --- a/pkg/op/error.go +++ b/pkg/op/error.go @@ -10,7 +10,7 @@ import ( const ( InvalidRequest errorType = "invalid_request" - InvalidRequestUri errorType = "invalid_request_uri" + InvalidRequestURI errorType = "invalid_request_uri" InteractionRequired errorType = "interaction_required" ServerError errorType = "server_error" ) @@ -24,7 +24,7 @@ var ( } ErrInvalidRequestRedirectURI = func(description string) *OAuthError { return &OAuthError{ - ErrorType: InvalidRequestUri, + ErrorType: InvalidRequestURI, Description: description, redirectDisabled: true, } diff --git a/pkg/op/mock/authorizer.mock.impl.go b/pkg/op/mock/authorizer.mock.impl.go index 97aa08d..202889c 100644 --- a/pkg/op/mock/authorizer.mock.impl.go +++ b/pkg/op/mock/authorizer.mock.impl.go @@ -69,7 +69,7 @@ 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) { +func (v *Verifier) VerifyIDToken(ctx context.Context, idToken string) (*oidc.IDTokenClaims, error) { return nil, nil } diff --git a/pkg/op/session.go b/pkg/op/session.go index 3ae0227..e60f71b 100644 --- a/pkg/op/session.go +++ b/pkg/op/session.go @@ -57,7 +57,7 @@ func ValidateEndSessionRequest(ctx context.Context, req *oidc.EndSessionRequest, if req.IdTokenHint == "" { return session, nil } - claims, err := ender.IDTokenVerifier().VerifyIdToken(ctx, req.IdTokenHint) + claims, err := ender.IDTokenVerifier().VerifyIDToken(ctx, req.IdTokenHint) if err != nil { return nil, ErrInvalidRequest("id_token_hint invalid") } diff --git a/pkg/rp/default_verifier.go b/pkg/rp/default_verifier.go index c59bbdf..dfdf134 100644 --- a/pkg/rp/default_verifier.go +++ b/pkg/rp/default_verifier.go @@ -148,7 +148,7 @@ func DefaultACRVerifier(possibleValues []string) ACRVerifier { //and https://openid.net/specs/openid-connect-core-1_0.html#CodeFlowTokenValidation func (v *DefaultVerifier) Verify(ctx context.Context, accessToken, idTokenString string) (*oidc.IDTokenClaims, error) { v.config.now = time.Now().UTC() - idToken, err := v.VerifyIdToken(ctx, idTokenString) + idToken, err := v.VerifyIDToken(ctx, idTokenString) if err != nil { return nil, err } @@ -158,9 +158,9 @@ func (v *DefaultVerifier) Verify(ctx context.Context, accessToken, idTokenString return idToken, nil } -//Verify implements the `VerifyIdToken` method of the `Verifier` interface +//Verify implements the `VerifyIDToken` method of the `Verifier` interface //according to https://openid.net/specs/openid-connect-core-1_0.html#IDTokenValidation -func (v *DefaultVerifier) VerifyIdToken(ctx context.Context, idTokenString string) (*oidc.IDTokenClaims, error) { +func (v *DefaultVerifier) VerifyIDToken(ctx context.Context, idTokenString string) (*oidc.IDTokenClaims, error) { //1. if encrypted --> decrypt decrypted, err := v.decryptToken(idTokenString) if err != nil { diff --git a/pkg/rp/mock/verifier.mock.go b/pkg/rp/mock/verifier.mock.go index 13cda2a..acd7d77 100644 --- a/pkg/rp/mock/verifier.mock.go +++ b/pkg/rp/mock/verifier.mock.go @@ -49,17 +49,17 @@ func (mr *MockVerifierMockRecorder) Verify(arg0, arg1, arg2 interface{}) *gomock return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Verify", reflect.TypeOf((*MockVerifier)(nil).Verify), arg0, arg1, arg2) } -// VerifyIdToken mocks base method -func (m *MockVerifier) VerifyIdToken(arg0 context.Context, arg1 string) (*oidc.IDTokenClaims, error) { +// VerifyIDToken mocks base method +func (m *MockVerifier) VerifyIDToken(arg0 context.Context, arg1 string) (*oidc.IDTokenClaims, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "VerifyIdToken", arg0, arg1) + ret := m.ctrl.Call(m, "VerifyIDToken", arg0, arg1) ret0, _ := ret[0].(*oidc.IDTokenClaims) ret1, _ := ret[1].(error) return ret0, ret1 } -// VerifyIdToken indicates an expected call of VerifyIdToken -func (mr *MockVerifierMockRecorder) VerifyIdToken(arg0, arg1 interface{}) *gomock.Call { +// VerifyIDToken indicates an expected call of VerifyIDToken +func (mr *MockVerifierMockRecorder) VerifyIDToken(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VerifyIdToken", reflect.TypeOf((*MockVerifier)(nil).VerifyIdToken), arg0, arg1) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "VerifyIDToken", reflect.TypeOf((*MockVerifier)(nil).VerifyIDToken), arg0, arg1) } diff --git a/pkg/rp/mock/verifier.mock.impl.go b/pkg/rp/mock/verifier.mock.impl.go index 6d70620..53b2f03 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().VerifyIdToken(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().VerifyIdToken(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) } diff --git a/pkg/rp/verifier.go b/pkg/rp/verifier.go index 7fb9d6c..5add60f 100644 --- a/pkg/rp/verifier.go +++ b/pkg/rp/verifier.go @@ -13,6 +13,6 @@ type Verifier interface { //Verify checks the access_token and id_token and returns the `id token claims` Verify(ctx context.Context, accessToken, idTokenString string) (*oidc.IDTokenClaims, error) - //VerifyIdToken checks the id_token only and returns its `id token claims` - VerifyIdToken(ctx context.Context, idTokenString string) (*oidc.IDTokenClaims, error) + //VerifyIDToken checks the id_token only and returns its `id token claims` + VerifyIDToken(ctx context.Context, idTokenString string) (*oidc.IDTokenClaims, error) }