From 9e1df41c7a1ed9e9c09df18661d01cfeb9445290 Mon Sep 17 00:00:00 2001 From: aeneasr <3372410+aeneasr@users.noreply.github.com> Date: Fri, 25 Jul 2025 12:47:38 +0200 Subject: [PATCH 1/2] feat: pass new expiry to refresh rotation BREAKING CHANGE: ```patch type RefreshTokenStorage interface { - RotateRefreshToken(ctx context.Context, requestID string, refreshTokenSignature string) (err error) + RotateRefreshToken(ctx context.Context, requestID string, refreshTokenSignature string, nextExpiry time.Time) (err error) } ``` --- handler/oauth2/flow_refresh.go | 7 ++++++- handler/oauth2/storage.go | 3 ++- storage/memory.go | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/handler/oauth2/flow_refresh.go b/handler/oauth2/flow_refresh.go index b575eabd9..92c091022 100644 --- a/handler/oauth2/flow_refresh.go +++ b/handler/oauth2/flow_refresh.go @@ -140,7 +140,12 @@ func (c *RefreshTokenGrantHandler) PopulateTokenEndpointResponse(ctx context.Con storeReq := requester.Sanitize([]string{}) storeReq.SetID(requester.GetID()) - if err = c.TokenRevocationStorage.RotateRefreshToken(ctx, requester.GetID(), signature); err != nil { + farthestExpiry := requester.GetSession().GetExpiresAt(fosite.RefreshToken) + if requester.GetSession().GetExpiresAt(fosite.AccessToken).After(farthestExpiry) { + farthestExpiry = requester.GetSession().GetExpiresAt(fosite.AccessToken) + } + + if err = c.TokenRevocationStorage.RotateRefreshToken(ctx, requester.GetID(), signature, farthestExpiry); err != nil { return c.handleRefreshTokenEndpointStorageError(ctx, err) } diff --git a/handler/oauth2/storage.go b/handler/oauth2/storage.go index 3ee56bbef..447c6aaaa 100644 --- a/handler/oauth2/storage.go +++ b/handler/oauth2/storage.go @@ -5,6 +5,7 @@ package oauth2 import ( "context" + "time" "github.com/ory/fosite" ) @@ -48,5 +49,5 @@ type RefreshTokenStorage interface { DeleteRefreshTokenSession(ctx context.Context, signature string) (err error) - RotateRefreshToken(ctx context.Context, requestID string, refreshTokenSignature string) (err error) + RotateRefreshToken(ctx context.Context, requestID string, refreshTokenSignature string, nextExpiry time.Time) (err error) } diff --git a/storage/memory.go b/storage/memory.go index 0b1cbfebe..6287b46ab 100644 --- a/storage/memory.go +++ b/storage/memory.go @@ -518,7 +518,7 @@ func (s *MemoryStore) DeletePARSession(ctx context.Context, requestURI string) ( return nil } -func (s *MemoryStore) RotateRefreshToken(ctx context.Context, requestID string, refreshTokenSignature string) (err error) { +func (s *MemoryStore) RotateRefreshToken(ctx context.Context, requestID string, refreshTokenSignature string, expiresAt time.Time) (err error) { // Graceful token rotation can be implemented here but it's beyond the scope of this example. Check // the Ory Hydra implementation for reference. if err := s.RevokeRefreshToken(ctx, requestID); err != nil { From b252c87be3214e5b3c73fe5f2429f7495b9dc942 Mon Sep 17 00:00:00 2001 From: aeneasr <3372410+aeneasr@users.noreply.github.com> Date: Fri, 25 Jul 2025 12:48:32 +0200 Subject: [PATCH 2/2] chore: revert gomock from uber --- access_error_test.go | 2 +- access_request_handler_test.go | 2 +- access_response_writer_test.go | 2 +- access_write_test.go | 2 +- authorize_error_test.go | 2 +- authorize_request_handler_test.go | 2 +- authorize_response_writer_test.go | 2 +- authorize_write_test.go | 2 +- device_request_handler_test.go | 2 +- go.mod | 1 + go.sum | 9 ++ .../oauth2/flow_authorize_code_token_test.go | 2 +- .../oauth2/flow_authorize_implicit_test.go | 2 +- .../oauth2/flow_client_credentials_test.go | 2 +- handler/oauth2/flow_refresh_test.go | 26 ++--- handler/oauth2/flow_resource_owner_test.go | 2 +- handler/oauth2/helper_test.go | 2 +- handler/oauth2/introspector_test.go | 2 +- handler/oauth2/revocation_test.go | 2 +- handler/openid/flow_device_auth_test.go | 2 +- handler/openid/flow_device_token_test.go | 2 +- handler/openid/flow_explicit_auth_test.go | 2 +- handler/openid/flow_explicit_token_test.go | 2 +- handler/openid/flow_hybrid_test.go | 2 +- handler/openid/flow_implicit_test.go | 2 +- handler/openid/helper_test.go | 2 +- handler/rfc7523/handler_test.go | 2 +- handler/rfc8628/auth_handler_test.go | 2 +- handler/rfc8628/token_handler_test.go | 2 +- handler/verifiable/handler_test.go | 2 +- internal/access_request.go | 80 +++++++--------- internal/access_response.go | 56 +++++------ internal/access_token_storage.go | 32 +++---- internal/access_token_strategy.go | 32 +++---- internal/authorize_code_storage.go | 32 +++---- internal/authorize_code_strategy.go | 32 +++---- internal/authorize_handler.go | 16 +--- internal/authorize_request.go | 96 +++++++++---------- internal/authorize_response.go | 24 ++--- internal/client.go | 8 +- internal/device_code_rate_limit_strategy.go | 16 +--- internal/hash.go | 24 ++--- internal/id_token_strategy.go | 16 +--- internal/introspector.go | 16 +--- internal/oauth2_auth_jwt_storage.go | 48 ++++------ internal/oauth2_client_storage.go | 32 +++---- internal/oauth2_explicit_storage.go | 2 +- internal/oauth2_owner_storage.go | 73 +++++++------- internal/oauth2_refresh_storage.go | 2 +- internal/oauth2_revoke_storage.go | 81 ++++++++-------- internal/oauth2_storage.go | 89 ++++++++--------- internal/oauth2_strategy.go | 80 +++++++--------- internal/openid_id_token_storage.go | 32 +++---- internal/pkce_storage_strategy.go | 32 +++---- internal/pushed_authorize_handler.go | 2 +- internal/refresh_token_strategy.go | 32 +++---- internal/request.go | 80 +++++++--------- internal/revoke_handler.go | 16 +--- internal/rfc8628_code_strategy.go | 64 ++++++------- internal/rfc8628_core_storage.go | 89 ++++++++--------- internal/rw.go | 2 +- internal/storage.go | 32 +++---- internal/token_handler.go | 40 ++++---- internal/transactional.go | 32 +++---- introspect_test.go | 2 +- introspection_request_handler_test.go | 2 +- introspection_response_writer_test.go | 2 +- pushed_authorize_request_handler_test.go | 2 +- pushed_authorize_response_writer_test.go | 2 +- revoke_handler_test.go | 2 +- 70 files changed, 638 insertions(+), 804 deletions(-) diff --git a/access_error_test.go b/access_error_test.go index 32987e17c..3cb2c038a 100644 --- a/access_error_test.go +++ b/access_error_test.go @@ -11,9 +11,9 @@ import ( "net/http/httptest" "testing" + gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" . "github.com/ory/fosite" . "github.com/ory/fosite/internal" diff --git a/access_request_handler_test.go b/access_request_handler_test.go index f185c2ddd..56f9eea03 100644 --- a/access_request_handler_test.go +++ b/access_request_handler_test.go @@ -10,10 +10,10 @@ import ( "net/url" "testing" + "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" . "github.com/ory/fosite" "github.com/ory/fosite/internal" diff --git a/access_response_writer_test.go b/access_response_writer_test.go index d6f6bd8d7..4e3924b7b 100644 --- a/access_response_writer_test.go +++ b/access_response_writer_test.go @@ -8,9 +8,9 @@ import ( "fmt" "testing" + gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" . "github.com/ory/fosite" "github.com/ory/fosite/internal" diff --git a/access_write_test.go b/access_write_test.go index 46219eecd..2895d8d95 100644 --- a/access_write_test.go +++ b/access_write_test.go @@ -8,8 +8,8 @@ import ( "net/http" "testing" + gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - gomock "go.uber.org/mock/gomock" . "github.com/ory/fosite" . "github.com/ory/fosite/internal" diff --git a/authorize_error_test.go b/authorize_error_test.go index 0ca2265bd..b2d9884c4 100644 --- a/authorize_error_test.go +++ b/authorize_error_test.go @@ -10,8 +10,8 @@ import ( "net/url" "testing" + gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - gomock "go.uber.org/mock/gomock" . "github.com/ory/fosite" . "github.com/ory/fosite/internal" diff --git a/authorize_request_handler_test.go b/authorize_request_handler_test.go index 84921ac4d..323b49c66 100644 --- a/authorize_request_handler_test.go +++ b/authorize_request_handler_test.go @@ -10,10 +10,10 @@ import ( "net/url" "testing" + gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" . "github.com/ory/fosite" . "github.com/ory/fosite/internal" diff --git a/authorize_response_writer_test.go b/authorize_response_writer_test.go index caa0d996c..3ad26bcf5 100644 --- a/authorize_response_writer_test.go +++ b/authorize_response_writer_test.go @@ -7,9 +7,9 @@ import ( "context" "testing" + gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/stretchr/testify/assert" - gomock "go.uber.org/mock/gomock" "github.com/ory/fosite" . "github.com/ory/fosite" diff --git a/authorize_write_test.go b/authorize_write_test.go index 2174c52d2..40fd41e83 100644 --- a/authorize_write_test.go +++ b/authorize_write_test.go @@ -9,8 +9,8 @@ import ( "net/url" "testing" + gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - gomock "go.uber.org/mock/gomock" . "github.com/ory/fosite" . "github.com/ory/fosite/internal" diff --git a/device_request_handler_test.go b/device_request_handler_test.go index b9ec7e5a6..e7c5b8bd0 100644 --- a/device_request_handler_test.go +++ b/device_request_handler_test.go @@ -10,10 +10,10 @@ import ( "net/url" "testing" + gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" . "github.com/ory/fosite" "github.com/ory/fosite/internal" diff --git a/go.mod b/go.mod index 39519fea3..cf6542505 100644 --- a/go.mod +++ b/go.mod @@ -5,6 +5,7 @@ require ( github.com/cristalhq/jwt/v4 v4.0.2 github.com/dgraph-io/ristretto v1.0.0 github.com/go-jose/go-jose/v3 v3.0.3 + github.com/golang/mock v1.6.0 github.com/google/uuid v1.6.0 github.com/gorilla/mux v1.8.0 github.com/gorilla/websocket v1.5.0 diff --git a/go.sum b/go.sum index af36927c0..ec152cb9e 100644 --- a/go.sum +++ b/go.sum @@ -136,6 +136,8 @@ github.com/golang/mock v1.4.0/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt github.com/golang/mock v1.4.1/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/golang/mock v1.4.4/go.mod h1:l3mdAwkq5BuhzHwde/uurv3sEJeZMXNpwsxVWU71h+4= +github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc= +github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= @@ -415,6 +417,7 @@ github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9de github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= +github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU= @@ -513,6 +516,7 @@ golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.4.1/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= +golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= @@ -550,6 +554,7 @@ golang.org/x/net v0.0.0-20201031054903-ff519b6c9102/go.mod h1:sp8m0HH+o8qH0wwXwY golang.org/x/net v0.0.0-20201209123823-ac852fbbde11/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= @@ -580,6 +585,7 @@ golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -624,8 +630,10 @@ golang.org/x/sys v0.0.0-20201201145000-ef89a241ccb3/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -718,6 +726,7 @@ golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4f golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= +golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/tools v0.8.0/go.mod h1:JxBZ99ISMI5ViVkT1tr6tdNmXeTrcpVSD3vZ1RsRdN4= diff --git a/handler/oauth2/flow_authorize_code_token_test.go b/handler/oauth2/flow_authorize_code_token_test.go index 906cb946e..429fc0609 100644 --- a/handler/oauth2/flow_authorize_code_token_test.go +++ b/handler/oauth2/flow_authorize_code_token_test.go @@ -11,7 +11,7 @@ import ( "time" - gomock "go.uber.org/mock/gomock" + gomock "github.com/golang/mock/gomock" "github.com/ory/fosite/internal" diff --git a/handler/oauth2/flow_authorize_implicit_test.go b/handler/oauth2/flow_authorize_implicit_test.go index ede6709f8..aa4fbe9ab 100644 --- a/handler/oauth2/flow_authorize_implicit_test.go +++ b/handler/oauth2/flow_authorize_implicit_test.go @@ -11,9 +11,9 @@ import ( "github.com/stretchr/testify/assert" + gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" "github.com/ory/fosite" "github.com/ory/fosite/internal" diff --git a/handler/oauth2/flow_client_credentials_test.go b/handler/oauth2/flow_client_credentials_test.go index 46117a6c7..a2542c68e 100644 --- a/handler/oauth2/flow_client_credentials_test.go +++ b/handler/oauth2/flow_client_credentials_test.go @@ -10,8 +10,8 @@ import ( "testing" "time" + gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" "github.com/ory/fosite" "github.com/ory/fosite/internal" diff --git a/handler/oauth2/flow_refresh_test.go b/handler/oauth2/flow_refresh_test.go index 43e8f49c8..b00f2a7ff 100644 --- a/handler/oauth2/flow_refresh_test.go +++ b/handler/oauth2/flow_refresh_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - gomock "go.uber.org/mock/gomock" + gomock "github.com/golang/mock/gomock" "github.com/ory/fosite/internal" @@ -551,7 +551,7 @@ func TestRefreshFlowTransactional_PopulateTokenEndpointResponse(t *testing.T) { Times(1) mockRevocationStore. EXPECT(). - RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any()). + RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any(), gomock.Any()). Return(nil). Times(1) mockRevocationStore. @@ -582,7 +582,7 @@ func TestRefreshFlowTransactional_PopulateTokenEndpointResponse(t *testing.T) { Times(1) mockRevocationStore. EXPECT(). - RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any()). + RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any(), gomock.Any()). Return(errors.New("Whoops, a nasty database error occurred!")). Times(1) mockTransactional. @@ -605,7 +605,7 @@ func TestRefreshFlowTransactional_PopulateTokenEndpointResponse(t *testing.T) { Times(1) mockRevocationStore. EXPECT(). - RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any()). + RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any(), gomock.Any()). Return(fosite.ErrSerializationFailure). Times(1) mockTransactional. @@ -627,7 +627,7 @@ func TestRefreshFlowTransactional_PopulateTokenEndpointResponse(t *testing.T) { Times(1) mockRevocationStore. EXPECT(). - RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any()). + RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any(), gomock.Any()). Return(errors.New("Whoops, a nasty database error occurred!")). Times(1) mockTransactional. @@ -650,7 +650,7 @@ func TestRefreshFlowTransactional_PopulateTokenEndpointResponse(t *testing.T) { Times(1) mockRevocationStore. EXPECT(). - RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any()). + RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any(), gomock.Any()). Return(fosite.ErrSerializationFailure). Times(1) mockTransactional. @@ -672,7 +672,7 @@ func TestRefreshFlowTransactional_PopulateTokenEndpointResponse(t *testing.T) { Times(1) mockRevocationStore. EXPECT(). - RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any()). + RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any(), gomock.Any()). Return(nil). Times(1) mockRevocationStore. @@ -698,7 +698,7 @@ func TestRefreshFlowTransactional_PopulateTokenEndpointResponse(t *testing.T) { Times(1) mockRevocationStore. EXPECT(). - RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any()). + RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any(), gomock.Any()). Return(nil). Times(1) mockRevocationStore. @@ -725,7 +725,7 @@ func TestRefreshFlowTransactional_PopulateTokenEndpointResponse(t *testing.T) { Times(1) mockRevocationStore. EXPECT(). - RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any()). + RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any(), gomock.Any()). Return(nil). Times(1) mockRevocationStore. @@ -758,7 +758,7 @@ func TestRefreshFlowTransactional_PopulateTokenEndpointResponse(t *testing.T) { Times(1) mockRevocationStore. EXPECT(). - RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any()). + RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any(), gomock.Any()). Return(nil). Times(1) mockRevocationStore. @@ -802,7 +802,7 @@ func TestRefreshFlowTransactional_PopulateTokenEndpointResponse(t *testing.T) { Times(1) mockRevocationStore. EXPECT(). - RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any()). + RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any(), gomock.Any()). Return(fosite.ErrNotFound). Times(1) mockTransactional. @@ -824,7 +824,7 @@ func TestRefreshFlowTransactional_PopulateTokenEndpointResponse(t *testing.T) { Times(1) mockRevocationStore. EXPECT(). - RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any()). + RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any(), gomock.Any()). Return(nil). Times(1) mockRevocationStore. @@ -862,7 +862,7 @@ func TestRefreshFlowTransactional_PopulateTokenEndpointResponse(t *testing.T) { Times(1) mockRevocationStore. EXPECT(). - RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any()). + RotateRefreshToken(propagatedContext, gomock.Any(), gomock.Any(), gomock.Any()). Return(nil). Times(1) mockRevocationStore. diff --git a/handler/oauth2/flow_resource_owner_test.go b/handler/oauth2/flow_resource_owner_test.go index f39069a3d..844917d36 100644 --- a/handler/oauth2/flow_resource_owner_test.go +++ b/handler/oauth2/flow_resource_owner_test.go @@ -10,10 +10,10 @@ import ( "testing" "time" + gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" "github.com/ory/fosite" "github.com/ory/fosite/internal" diff --git a/handler/oauth2/helper_test.go b/handler/oauth2/helper_test.go index f963459e6..d8eb2da02 100644 --- a/handler/oauth2/helper_test.go +++ b/handler/oauth2/helper_test.go @@ -8,10 +8,10 @@ import ( "testing" "time" + gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" "github.com/ory/fosite" "github.com/ory/fosite/internal" diff --git a/handler/oauth2/introspector_test.go b/handler/oauth2/introspector_test.go index 924a3a3ec..3919f669a 100644 --- a/handler/oauth2/introspector_test.go +++ b/handler/oauth2/introspector_test.go @@ -11,10 +11,10 @@ import ( "github.com/ory/x/errorsx" + gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" "github.com/ory/fosite" "github.com/ory/fosite/internal" diff --git a/handler/oauth2/revocation_test.go b/handler/oauth2/revocation_test.go index 41f7a3e5d..03356ff6f 100644 --- a/handler/oauth2/revocation_test.go +++ b/handler/oauth2/revocation_test.go @@ -8,8 +8,8 @@ import ( "fmt" "testing" + gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" "github.com/ory/fosite" "github.com/ory/fosite/internal" diff --git a/handler/openid/flow_device_auth_test.go b/handler/openid/flow_device_auth_test.go index b5adf2202..d9d275abd 100644 --- a/handler/openid/flow_device_auth_test.go +++ b/handler/openid/flow_device_auth_test.go @@ -9,8 +9,8 @@ import ( "testing" "time" + gomock "github.com/golang/mock/gomock" "github.com/ory/fosite/internal" - gomock "go.uber.org/mock/gomock" "github.com/stretchr/testify/require" diff --git a/handler/openid/flow_device_token_test.go b/handler/openid/flow_device_token_test.go index f73617806..96da842e3 100644 --- a/handler/openid/flow_device_token_test.go +++ b/handler/openid/flow_device_token_test.go @@ -14,11 +14,11 @@ import ( "github.com/stretchr/testify/require" + gomock "github.com/golang/mock/gomock" "github.com/ory/fosite/handler/rfc8628" "github.com/ory/fosite/internal" "github.com/ory/fosite/token/hmac" "github.com/ory/fosite/token/jwt" - gomock "go.uber.org/mock/gomock" "github.com/stretchr/testify/assert" diff --git a/handler/openid/flow_explicit_auth_test.go b/handler/openid/flow_explicit_auth_test.go index 8781d6969..0b4362009 100644 --- a/handler/openid/flow_explicit_auth_test.go +++ b/handler/openid/flow_explicit_auth_test.go @@ -11,9 +11,9 @@ import ( "github.com/ory/fosite/internal/gen" + gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" "github.com/ory/fosite" "github.com/ory/fosite/internal" diff --git a/handler/openid/flow_explicit_token_test.go b/handler/openid/flow_explicit_token_test.go index 775702f90..88958b206 100644 --- a/handler/openid/flow_explicit_token_test.go +++ b/handler/openid/flow_explicit_token_test.go @@ -9,10 +9,10 @@ import ( "testing" "time" + gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" "github.com/ory/fosite" "github.com/ory/fosite/internal" diff --git a/handler/openid/flow_hybrid_test.go b/handler/openid/flow_hybrid_test.go index 24df90a11..1f5ce53b8 100644 --- a/handler/openid/flow_hybrid_test.go +++ b/handler/openid/flow_hybrid_test.go @@ -15,9 +15,9 @@ import ( "github.com/ory/fosite/internal/gen" cristaljwt "github.com/cristalhq/jwt/v4" + gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" "github.com/ory/fosite" "github.com/ory/fosite/handler/oauth2" diff --git a/handler/openid/flow_implicit_test.go b/handler/openid/flow_implicit_test.go index f5003c219..cb0bb8531 100644 --- a/handler/openid/flow_implicit_test.go +++ b/handler/openid/flow_implicit_test.go @@ -13,8 +13,8 @@ import ( "github.com/ory/fosite/internal" "github.com/ory/fosite/internal/gen" + gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - gomock "go.uber.org/mock/gomock" "github.com/ory/fosite" "github.com/ory/fosite/handler/oauth2" diff --git a/handler/openid/helper_test.go b/handler/openid/helper_test.go index b09a5e317..b4886e0b3 100644 --- a/handler/openid/helper_test.go +++ b/handler/openid/helper_test.go @@ -11,9 +11,9 @@ import ( "github.com/ory/fosite/internal/gen" + gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/stretchr/testify/assert" - gomock "go.uber.org/mock/gomock" "github.com/ory/fosite" "github.com/ory/fosite/internal" diff --git a/handler/rfc7523/handler_test.go b/handler/rfc7523/handler_test.go index af5578e2e..4715a11fe 100644 --- a/handler/rfc7523/handler_test.go +++ b/handler/rfc7523/handler_test.go @@ -20,8 +20,8 @@ import ( "github.com/go-jose/go-jose/v3" "github.com/go-jose/go-jose/v3/jwt" + gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/suite" - gomock "go.uber.org/mock/gomock" "github.com/ory/fosite" "github.com/ory/fosite/internal" diff --git a/handler/rfc8628/auth_handler_test.go b/handler/rfc8628/auth_handler_test.go index 10748cd83..1664e0a0a 100644 --- a/handler/rfc8628/auth_handler_test.go +++ b/handler/rfc8628/auth_handler_test.go @@ -10,7 +10,7 @@ import ( "testing" "time" - gomock "go.uber.org/mock/gomock" + gomock "github.com/golang/mock/gomock" "github.com/ory/fosite/internal" diff --git a/handler/rfc8628/token_handler_test.go b/handler/rfc8628/token_handler_test.go index 6173251f7..e034ffb17 100644 --- a/handler/rfc8628/token_handler_test.go +++ b/handler/rfc8628/token_handler_test.go @@ -12,8 +12,8 @@ import ( "github.com/pkg/errors" + gomock "github.com/golang/mock/gomock" "github.com/ory/fosite/internal" - gomock "go.uber.org/mock/gomock" "github.com/ory/fosite/handler/oauth2" "github.com/ory/fosite/token/hmac" diff --git a/handler/verifiable/handler_test.go b/handler/verifiable/handler_test.go index a23adaa78..6c6e966f8 100644 --- a/handler/verifiable/handler_test.go +++ b/handler/verifiable/handler_test.go @@ -8,8 +8,8 @@ import ( "testing" "time" + gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" - gomock "go.uber.org/mock/gomock" "github.com/ory/fosite" "github.com/ory/fosite/internal" diff --git a/internal/access_request.go b/internal/access_request.go index 56694216b..f8b37002c 100644 --- a/internal/access_request.go +++ b/internal/access_request.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite (interfaces: AccessRequester) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/access_request.go github.com/ory/fosite AccessRequester -// // Package internal is a generated GoMock package. package internal @@ -17,15 +12,14 @@ import ( reflect "reflect" time "time" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockAccessRequester is a mock of AccessRequester interface. type MockAccessRequester struct { ctrl *gomock.Controller recorder *MockAccessRequesterMockRecorder - isgomock struct{} } // MockAccessRequesterMockRecorder is the mock recorder for MockAccessRequester. @@ -46,15 +40,15 @@ func (m *MockAccessRequester) EXPECT() *MockAccessRequesterMockRecorder { } // AppendRequestedScope mocks base method. -func (m *MockAccessRequester) AppendRequestedScope(scope string) { +func (m *MockAccessRequester) AppendRequestedScope(arg0 string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "AppendRequestedScope", scope) + m.ctrl.Call(m, "AppendRequestedScope", arg0) } // AppendRequestedScope indicates an expected call of AppendRequestedScope. -func (mr *MockAccessRequesterMockRecorder) AppendRequestedScope(scope any) *gomock.Call { +func (mr *MockAccessRequesterMockRecorder) AppendRequestedScope(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AppendRequestedScope", reflect.TypeOf((*MockAccessRequester)(nil).AppendRequestedScope), scope) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AppendRequestedScope", reflect.TypeOf((*MockAccessRequester)(nil).AppendRequestedScope), arg0) } // GetClient mocks base method. @@ -198,99 +192,99 @@ func (mr *MockAccessRequesterMockRecorder) GetSession() *gomock.Call { } // GrantAudience mocks base method. -func (m *MockAccessRequester) GrantAudience(audience string) { +func (m *MockAccessRequester) GrantAudience(arg0 string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "GrantAudience", audience) + m.ctrl.Call(m, "GrantAudience", arg0) } // GrantAudience indicates an expected call of GrantAudience. -func (mr *MockAccessRequesterMockRecorder) GrantAudience(audience any) *gomock.Call { +func (mr *MockAccessRequesterMockRecorder) GrantAudience(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GrantAudience", reflect.TypeOf((*MockAccessRequester)(nil).GrantAudience), audience) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GrantAudience", reflect.TypeOf((*MockAccessRequester)(nil).GrantAudience), arg0) } // GrantScope mocks base method. -func (m *MockAccessRequester) GrantScope(scope string) { +func (m *MockAccessRequester) GrantScope(arg0 string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "GrantScope", scope) + m.ctrl.Call(m, "GrantScope", arg0) } // GrantScope indicates an expected call of GrantScope. -func (mr *MockAccessRequesterMockRecorder) GrantScope(scope any) *gomock.Call { +func (mr *MockAccessRequesterMockRecorder) GrantScope(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GrantScope", reflect.TypeOf((*MockAccessRequester)(nil).GrantScope), scope) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GrantScope", reflect.TypeOf((*MockAccessRequester)(nil).GrantScope), arg0) } // Merge mocks base method. -func (m *MockAccessRequester) Merge(requester fosite.Requester) { +func (m *MockAccessRequester) Merge(arg0 fosite.Requester) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Merge", requester) + m.ctrl.Call(m, "Merge", arg0) } // Merge indicates an expected call of Merge. -func (mr *MockAccessRequesterMockRecorder) Merge(requester any) *gomock.Call { +func (mr *MockAccessRequesterMockRecorder) Merge(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Merge", reflect.TypeOf((*MockAccessRequester)(nil).Merge), requester) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Merge", reflect.TypeOf((*MockAccessRequester)(nil).Merge), arg0) } // Sanitize mocks base method. -func (m *MockAccessRequester) Sanitize(allowedParameters []string) fosite.Requester { +func (m *MockAccessRequester) Sanitize(arg0 []string) fosite.Requester { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Sanitize", allowedParameters) + ret := m.ctrl.Call(m, "Sanitize", arg0) ret0, _ := ret[0].(fosite.Requester) return ret0 } // Sanitize indicates an expected call of Sanitize. -func (mr *MockAccessRequesterMockRecorder) Sanitize(allowedParameters any) *gomock.Call { +func (mr *MockAccessRequesterMockRecorder) Sanitize(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sanitize", reflect.TypeOf((*MockAccessRequester)(nil).Sanitize), allowedParameters) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sanitize", reflect.TypeOf((*MockAccessRequester)(nil).Sanitize), arg0) } // SetID mocks base method. -func (m *MockAccessRequester) SetID(id string) { +func (m *MockAccessRequester) SetID(arg0 string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetID", id) + m.ctrl.Call(m, "SetID", arg0) } // SetID indicates an expected call of SetID. -func (mr *MockAccessRequesterMockRecorder) SetID(id any) *gomock.Call { +func (mr *MockAccessRequesterMockRecorder) SetID(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetID", reflect.TypeOf((*MockAccessRequester)(nil).SetID), id) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetID", reflect.TypeOf((*MockAccessRequester)(nil).SetID), arg0) } // SetRequestedAudience mocks base method. -func (m *MockAccessRequester) SetRequestedAudience(audience fosite.Arguments) { +func (m *MockAccessRequester) SetRequestedAudience(arg0 fosite.Arguments) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetRequestedAudience", audience) + m.ctrl.Call(m, "SetRequestedAudience", arg0) } // SetRequestedAudience indicates an expected call of SetRequestedAudience. -func (mr *MockAccessRequesterMockRecorder) SetRequestedAudience(audience any) *gomock.Call { +func (mr *MockAccessRequesterMockRecorder) SetRequestedAudience(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetRequestedAudience", reflect.TypeOf((*MockAccessRequester)(nil).SetRequestedAudience), audience) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetRequestedAudience", reflect.TypeOf((*MockAccessRequester)(nil).SetRequestedAudience), arg0) } // SetRequestedScopes mocks base method. -func (m *MockAccessRequester) SetRequestedScopes(scopes fosite.Arguments) { +func (m *MockAccessRequester) SetRequestedScopes(arg0 fosite.Arguments) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetRequestedScopes", scopes) + m.ctrl.Call(m, "SetRequestedScopes", arg0) } // SetRequestedScopes indicates an expected call of SetRequestedScopes. -func (mr *MockAccessRequesterMockRecorder) SetRequestedScopes(scopes any) *gomock.Call { +func (mr *MockAccessRequesterMockRecorder) SetRequestedScopes(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetRequestedScopes", reflect.TypeOf((*MockAccessRequester)(nil).SetRequestedScopes), scopes) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetRequestedScopes", reflect.TypeOf((*MockAccessRequester)(nil).SetRequestedScopes), arg0) } // SetSession mocks base method. -func (m *MockAccessRequester) SetSession(session fosite.Session) { +func (m *MockAccessRequester) SetSession(arg0 fosite.Session) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetSession", session) + m.ctrl.Call(m, "SetSession", arg0) } // SetSession indicates an expected call of SetSession. -func (mr *MockAccessRequesterMockRecorder) SetSession(session any) *gomock.Call { +func (mr *MockAccessRequesterMockRecorder) SetSession(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetSession", reflect.TypeOf((*MockAccessRequester)(nil).SetSession), session) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetSession", reflect.TypeOf((*MockAccessRequester)(nil).SetSession), arg0) } diff --git a/internal/access_response.go b/internal/access_response.go index 4ba937883..e7d3b7840 100644 --- a/internal/access_response.go +++ b/internal/access_response.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite (interfaces: AccessResponder) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/access_response.go github.com/ory/fosite AccessResponder -// // Package internal is a generated GoMock package. package internal @@ -16,15 +11,14 @@ import ( reflect "reflect" time "time" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockAccessResponder is a mock of AccessResponder interface. type MockAccessResponder struct { ctrl *gomock.Controller recorder *MockAccessResponderMockRecorder - isgomock struct{} } // MockAccessResponderMockRecorder is the mock recorder for MockAccessResponder. @@ -59,17 +53,17 @@ func (mr *MockAccessResponderMockRecorder) GetAccessToken() *gomock.Call { } // GetExtra mocks base method. -func (m *MockAccessResponder) GetExtra(key string) any { +func (m *MockAccessResponder) GetExtra(arg0 string) interface{} { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetExtra", key) - ret0, _ := ret[0].(any) + ret := m.ctrl.Call(m, "GetExtra", arg0) + ret0, _ := ret[0].(interface{}) return ret0 } // GetExtra indicates an expected call of GetExtra. -func (mr *MockAccessResponderMockRecorder) GetExtra(key any) *gomock.Call { +func (mr *MockAccessResponderMockRecorder) GetExtra(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetExtra", reflect.TypeOf((*MockAccessResponder)(nil).GetExtra), key) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetExtra", reflect.TypeOf((*MockAccessResponder)(nil).GetExtra), arg0) } // GetTokenType mocks base method. @@ -87,15 +81,15 @@ func (mr *MockAccessResponderMockRecorder) GetTokenType() *gomock.Call { } // SetAccessToken mocks base method. -func (m *MockAccessResponder) SetAccessToken(token string) { +func (m *MockAccessResponder) SetAccessToken(arg0 string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetAccessToken", token) + m.ctrl.Call(m, "SetAccessToken", arg0) } // SetAccessToken indicates an expected call of SetAccessToken. -func (mr *MockAccessResponderMockRecorder) SetAccessToken(token any) *gomock.Call { +func (mr *MockAccessResponderMockRecorder) SetAccessToken(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetAccessToken", reflect.TypeOf((*MockAccessResponder)(nil).SetAccessToken), token) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetAccessToken", reflect.TypeOf((*MockAccessResponder)(nil).SetAccessToken), arg0) } // SetExpiresIn mocks base method. @@ -105,52 +99,52 @@ func (m *MockAccessResponder) SetExpiresIn(arg0 time.Duration) { } // SetExpiresIn indicates an expected call of SetExpiresIn. -func (mr *MockAccessResponderMockRecorder) SetExpiresIn(arg0 any) *gomock.Call { +func (mr *MockAccessResponderMockRecorder) SetExpiresIn(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetExpiresIn", reflect.TypeOf((*MockAccessResponder)(nil).SetExpiresIn), arg0) } // SetExtra mocks base method. -func (m *MockAccessResponder) SetExtra(key string, value any) { +func (m *MockAccessResponder) SetExtra(arg0 string, arg1 interface{}) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetExtra", key, value) + m.ctrl.Call(m, "SetExtra", arg0, arg1) } // SetExtra indicates an expected call of SetExtra. -func (mr *MockAccessResponderMockRecorder) SetExtra(key, value any) *gomock.Call { +func (mr *MockAccessResponderMockRecorder) SetExtra(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetExtra", reflect.TypeOf((*MockAccessResponder)(nil).SetExtra), key, value) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetExtra", reflect.TypeOf((*MockAccessResponder)(nil).SetExtra), arg0, arg1) } // SetScopes mocks base method. -func (m *MockAccessResponder) SetScopes(scopes fosite.Arguments) { +func (m *MockAccessResponder) SetScopes(arg0 fosite.Arguments) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetScopes", scopes) + m.ctrl.Call(m, "SetScopes", arg0) } // SetScopes indicates an expected call of SetScopes. -func (mr *MockAccessResponderMockRecorder) SetScopes(scopes any) *gomock.Call { +func (mr *MockAccessResponderMockRecorder) SetScopes(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetScopes", reflect.TypeOf((*MockAccessResponder)(nil).SetScopes), scopes) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetScopes", reflect.TypeOf((*MockAccessResponder)(nil).SetScopes), arg0) } // SetTokenType mocks base method. -func (m *MockAccessResponder) SetTokenType(tokenType string) { +func (m *MockAccessResponder) SetTokenType(arg0 string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetTokenType", tokenType) + m.ctrl.Call(m, "SetTokenType", arg0) } // SetTokenType indicates an expected call of SetTokenType. -func (mr *MockAccessResponderMockRecorder) SetTokenType(tokenType any) *gomock.Call { +func (mr *MockAccessResponderMockRecorder) SetTokenType(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTokenType", reflect.TypeOf((*MockAccessResponder)(nil).SetTokenType), tokenType) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetTokenType", reflect.TypeOf((*MockAccessResponder)(nil).SetTokenType), arg0) } // ToMap mocks base method. -func (m *MockAccessResponder) ToMap() map[string]any { +func (m *MockAccessResponder) ToMap() map[string]interface{} { m.ctrl.T.Helper() ret := m.ctrl.Call(m, "ToMap") - ret0, _ := ret[0].(map[string]any) + ret0, _ := ret[0].(map[string]interface{}) return ret0 } diff --git a/internal/access_token_storage.go b/internal/access_token_storage.go index 0082eec34..ed1a7aa09 100644 --- a/internal/access_token_storage.go +++ b/internal/access_token_storage.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/handler/oauth2 (interfaces: AccessTokenStorage) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/access_token_storage.go github.com/ory/fosite/handler/oauth2 AccessTokenStorage -// // Package internal is a generated GoMock package. package internal @@ -16,15 +11,14 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockAccessTokenStorage is a mock of AccessTokenStorage interface. type MockAccessTokenStorage struct { ctrl *gomock.Controller recorder *MockAccessTokenStorageMockRecorder - isgomock struct{} } // MockAccessTokenStorageMockRecorder is the mock recorder for MockAccessTokenStorage. @@ -45,44 +39,44 @@ func (m *MockAccessTokenStorage) EXPECT() *MockAccessTokenStorageMockRecorder { } // CreateAccessTokenSession mocks base method. -func (m *MockAccessTokenStorage) CreateAccessTokenSession(ctx context.Context, signature string, request fosite.Requester) error { +func (m *MockAccessTokenStorage) CreateAccessTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Requester) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateAccessTokenSession", ctx, signature, request) + ret := m.ctrl.Call(m, "CreateAccessTokenSession", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // CreateAccessTokenSession indicates an expected call of CreateAccessTokenSession. -func (mr *MockAccessTokenStorageMockRecorder) CreateAccessTokenSession(ctx, signature, request any) *gomock.Call { +func (mr *MockAccessTokenStorageMockRecorder) CreateAccessTokenSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAccessTokenSession", reflect.TypeOf((*MockAccessTokenStorage)(nil).CreateAccessTokenSession), ctx, signature, request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAccessTokenSession", reflect.TypeOf((*MockAccessTokenStorage)(nil).CreateAccessTokenSession), arg0, arg1, arg2) } // DeleteAccessTokenSession mocks base method. -func (m *MockAccessTokenStorage) DeleteAccessTokenSession(ctx context.Context, signature string) error { +func (m *MockAccessTokenStorage) DeleteAccessTokenSession(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeleteAccessTokenSession", ctx, signature) + ret := m.ctrl.Call(m, "DeleteAccessTokenSession", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // DeleteAccessTokenSession indicates an expected call of DeleteAccessTokenSession. -func (mr *MockAccessTokenStorageMockRecorder) DeleteAccessTokenSession(ctx, signature any) *gomock.Call { +func (mr *MockAccessTokenStorageMockRecorder) DeleteAccessTokenSession(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAccessTokenSession", reflect.TypeOf((*MockAccessTokenStorage)(nil).DeleteAccessTokenSession), ctx, signature) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAccessTokenSession", reflect.TypeOf((*MockAccessTokenStorage)(nil).DeleteAccessTokenSession), arg0, arg1) } // GetAccessTokenSession mocks base method. -func (m *MockAccessTokenStorage) GetAccessTokenSession(ctx context.Context, signature string, session fosite.Session) (fosite.Requester, error) { +func (m *MockAccessTokenStorage) GetAccessTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.Requester, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetAccessTokenSession", ctx, signature, session) + ret := m.ctrl.Call(m, "GetAccessTokenSession", arg0, arg1, arg2) ret0, _ := ret[0].(fosite.Requester) ret1, _ := ret[1].(error) return ret0, ret1 } // GetAccessTokenSession indicates an expected call of GetAccessTokenSession. -func (mr *MockAccessTokenStorageMockRecorder) GetAccessTokenSession(ctx, signature, session any) *gomock.Call { +func (mr *MockAccessTokenStorageMockRecorder) GetAccessTokenSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccessTokenSession", reflect.TypeOf((*MockAccessTokenStorage)(nil).GetAccessTokenSession), ctx, signature, session) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccessTokenSession", reflect.TypeOf((*MockAccessTokenStorage)(nil).GetAccessTokenSession), arg0, arg1, arg2) } diff --git a/internal/access_token_strategy.go b/internal/access_token_strategy.go index cdd224ef8..bf7192542 100644 --- a/internal/access_token_strategy.go +++ b/internal/access_token_strategy.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/handler/oauth2 (interfaces: AccessTokenStrategy) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/access_token_strategy.go github.com/ory/fosite/handler/oauth2 AccessTokenStrategy -// // Package internal is a generated GoMock package. package internal @@ -16,15 +11,14 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockAccessTokenStrategy is a mock of AccessTokenStrategy interface. type MockAccessTokenStrategy struct { ctrl *gomock.Controller recorder *MockAccessTokenStrategyMockRecorder - isgomock struct{} } // MockAccessTokenStrategyMockRecorder is the mock recorder for MockAccessTokenStrategy. @@ -45,23 +39,23 @@ func (m *MockAccessTokenStrategy) EXPECT() *MockAccessTokenStrategyMockRecorder } // AccessTokenSignature mocks base method. -func (m *MockAccessTokenStrategy) AccessTokenSignature(ctx context.Context, token string) string { +func (m *MockAccessTokenStrategy) AccessTokenSignature(arg0 context.Context, arg1 string) string { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "AccessTokenSignature", ctx, token) + ret := m.ctrl.Call(m, "AccessTokenSignature", arg0, arg1) ret0, _ := ret[0].(string) return ret0 } // AccessTokenSignature indicates an expected call of AccessTokenSignature. -func (mr *MockAccessTokenStrategyMockRecorder) AccessTokenSignature(ctx, token any) *gomock.Call { +func (mr *MockAccessTokenStrategyMockRecorder) AccessTokenSignature(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AccessTokenSignature", reflect.TypeOf((*MockAccessTokenStrategy)(nil).AccessTokenSignature), ctx, token) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AccessTokenSignature", reflect.TypeOf((*MockAccessTokenStrategy)(nil).AccessTokenSignature), arg0, arg1) } // GenerateAccessToken mocks base method. -func (m *MockAccessTokenStrategy) GenerateAccessToken(ctx context.Context, requester fosite.Requester) (string, string, error) { +func (m *MockAccessTokenStrategy) GenerateAccessToken(arg0 context.Context, arg1 fosite.Requester) (string, string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GenerateAccessToken", ctx, requester) + ret := m.ctrl.Call(m, "GenerateAccessToken", arg0, arg1) ret0, _ := ret[0].(string) ret1, _ := ret[1].(string) ret2, _ := ret[2].(error) @@ -69,21 +63,21 @@ func (m *MockAccessTokenStrategy) GenerateAccessToken(ctx context.Context, reque } // GenerateAccessToken indicates an expected call of GenerateAccessToken. -func (mr *MockAccessTokenStrategyMockRecorder) GenerateAccessToken(ctx, requester any) *gomock.Call { +func (mr *MockAccessTokenStrategyMockRecorder) GenerateAccessToken(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateAccessToken", reflect.TypeOf((*MockAccessTokenStrategy)(nil).GenerateAccessToken), ctx, requester) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateAccessToken", reflect.TypeOf((*MockAccessTokenStrategy)(nil).GenerateAccessToken), arg0, arg1) } // ValidateAccessToken mocks base method. -func (m *MockAccessTokenStrategy) ValidateAccessToken(ctx context.Context, requester fosite.Requester, token string) error { +func (m *MockAccessTokenStrategy) ValidateAccessToken(arg0 context.Context, arg1 fosite.Requester, arg2 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ValidateAccessToken", ctx, requester, token) + ret := m.ctrl.Call(m, "ValidateAccessToken", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // ValidateAccessToken indicates an expected call of ValidateAccessToken. -func (mr *MockAccessTokenStrategyMockRecorder) ValidateAccessToken(ctx, requester, token any) *gomock.Call { +func (mr *MockAccessTokenStrategyMockRecorder) ValidateAccessToken(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateAccessToken", reflect.TypeOf((*MockAccessTokenStrategy)(nil).ValidateAccessToken), ctx, requester, token) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateAccessToken", reflect.TypeOf((*MockAccessTokenStrategy)(nil).ValidateAccessToken), arg0, arg1, arg2) } diff --git a/internal/authorize_code_storage.go b/internal/authorize_code_storage.go index 246b77e97..0922b7151 100644 --- a/internal/authorize_code_storage.go +++ b/internal/authorize_code_storage.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/handler/oauth2 (interfaces: AuthorizeCodeStorage) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/authorize_code_storage.go github.com/ory/fosite/handler/oauth2 AuthorizeCodeStorage -// // Package internal is a generated GoMock package. package internal @@ -16,15 +11,14 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockAuthorizeCodeStorage is a mock of AuthorizeCodeStorage interface. type MockAuthorizeCodeStorage struct { ctrl *gomock.Controller recorder *MockAuthorizeCodeStorageMockRecorder - isgomock struct{} } // MockAuthorizeCodeStorageMockRecorder is the mock recorder for MockAuthorizeCodeStorage. @@ -45,44 +39,44 @@ func (m *MockAuthorizeCodeStorage) EXPECT() *MockAuthorizeCodeStorageMockRecorde } // CreateAuthorizeCodeSession mocks base method. -func (m *MockAuthorizeCodeStorage) CreateAuthorizeCodeSession(ctx context.Context, code string, request fosite.Requester) error { +func (m *MockAuthorizeCodeStorage) CreateAuthorizeCodeSession(arg0 context.Context, arg1 string, arg2 fosite.Requester) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateAuthorizeCodeSession", ctx, code, request) + ret := m.ctrl.Call(m, "CreateAuthorizeCodeSession", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // CreateAuthorizeCodeSession indicates an expected call of CreateAuthorizeCodeSession. -func (mr *MockAuthorizeCodeStorageMockRecorder) CreateAuthorizeCodeSession(ctx, code, request any) *gomock.Call { +func (mr *MockAuthorizeCodeStorageMockRecorder) CreateAuthorizeCodeSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAuthorizeCodeSession", reflect.TypeOf((*MockAuthorizeCodeStorage)(nil).CreateAuthorizeCodeSession), ctx, code, request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAuthorizeCodeSession", reflect.TypeOf((*MockAuthorizeCodeStorage)(nil).CreateAuthorizeCodeSession), arg0, arg1, arg2) } // GetAuthorizeCodeSession mocks base method. -func (m *MockAuthorizeCodeStorage) GetAuthorizeCodeSession(ctx context.Context, code string, session fosite.Session) (fosite.Requester, error) { +func (m *MockAuthorizeCodeStorage) GetAuthorizeCodeSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.Requester, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetAuthorizeCodeSession", ctx, code, session) + ret := m.ctrl.Call(m, "GetAuthorizeCodeSession", arg0, arg1, arg2) ret0, _ := ret[0].(fosite.Requester) ret1, _ := ret[1].(error) return ret0, ret1 } // GetAuthorizeCodeSession indicates an expected call of GetAuthorizeCodeSession. -func (mr *MockAuthorizeCodeStorageMockRecorder) GetAuthorizeCodeSession(ctx, code, session any) *gomock.Call { +func (mr *MockAuthorizeCodeStorageMockRecorder) GetAuthorizeCodeSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAuthorizeCodeSession", reflect.TypeOf((*MockAuthorizeCodeStorage)(nil).GetAuthorizeCodeSession), ctx, code, session) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAuthorizeCodeSession", reflect.TypeOf((*MockAuthorizeCodeStorage)(nil).GetAuthorizeCodeSession), arg0, arg1, arg2) } // InvalidateAuthorizeCodeSession mocks base method. -func (m *MockAuthorizeCodeStorage) InvalidateAuthorizeCodeSession(ctx context.Context, code string) error { +func (m *MockAuthorizeCodeStorage) InvalidateAuthorizeCodeSession(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "InvalidateAuthorizeCodeSession", ctx, code) + ret := m.ctrl.Call(m, "InvalidateAuthorizeCodeSession", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // InvalidateAuthorizeCodeSession indicates an expected call of InvalidateAuthorizeCodeSession. -func (mr *MockAuthorizeCodeStorageMockRecorder) InvalidateAuthorizeCodeSession(ctx, code any) *gomock.Call { +func (mr *MockAuthorizeCodeStorageMockRecorder) InvalidateAuthorizeCodeSession(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InvalidateAuthorizeCodeSession", reflect.TypeOf((*MockAuthorizeCodeStorage)(nil).InvalidateAuthorizeCodeSession), ctx, code) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InvalidateAuthorizeCodeSession", reflect.TypeOf((*MockAuthorizeCodeStorage)(nil).InvalidateAuthorizeCodeSession), arg0, arg1) } diff --git a/internal/authorize_code_strategy.go b/internal/authorize_code_strategy.go index a143faa85..a91b1bf89 100644 --- a/internal/authorize_code_strategy.go +++ b/internal/authorize_code_strategy.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/handler/oauth2 (interfaces: AuthorizeCodeStrategy) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/authorize_code_strategy.go github.com/ory/fosite/handler/oauth2 AuthorizeCodeStrategy -// // Package internal is a generated GoMock package. package internal @@ -16,15 +11,14 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockAuthorizeCodeStrategy is a mock of AuthorizeCodeStrategy interface. type MockAuthorizeCodeStrategy struct { ctrl *gomock.Controller recorder *MockAuthorizeCodeStrategyMockRecorder - isgomock struct{} } // MockAuthorizeCodeStrategyMockRecorder is the mock recorder for MockAuthorizeCodeStrategy. @@ -45,23 +39,23 @@ func (m *MockAuthorizeCodeStrategy) EXPECT() *MockAuthorizeCodeStrategyMockRecor } // AuthorizeCodeSignature mocks base method. -func (m *MockAuthorizeCodeStrategy) AuthorizeCodeSignature(ctx context.Context, token string) string { +func (m *MockAuthorizeCodeStrategy) AuthorizeCodeSignature(arg0 context.Context, arg1 string) string { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "AuthorizeCodeSignature", ctx, token) + ret := m.ctrl.Call(m, "AuthorizeCodeSignature", arg0, arg1) ret0, _ := ret[0].(string) return ret0 } // AuthorizeCodeSignature indicates an expected call of AuthorizeCodeSignature. -func (mr *MockAuthorizeCodeStrategyMockRecorder) AuthorizeCodeSignature(ctx, token any) *gomock.Call { +func (mr *MockAuthorizeCodeStrategyMockRecorder) AuthorizeCodeSignature(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AuthorizeCodeSignature", reflect.TypeOf((*MockAuthorizeCodeStrategy)(nil).AuthorizeCodeSignature), ctx, token) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AuthorizeCodeSignature", reflect.TypeOf((*MockAuthorizeCodeStrategy)(nil).AuthorizeCodeSignature), arg0, arg1) } // GenerateAuthorizeCode mocks base method. -func (m *MockAuthorizeCodeStrategy) GenerateAuthorizeCode(ctx context.Context, requester fosite.Requester) (string, string, error) { +func (m *MockAuthorizeCodeStrategy) GenerateAuthorizeCode(arg0 context.Context, arg1 fosite.Requester) (string, string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GenerateAuthorizeCode", ctx, requester) + ret := m.ctrl.Call(m, "GenerateAuthorizeCode", arg0, arg1) ret0, _ := ret[0].(string) ret1, _ := ret[1].(string) ret2, _ := ret[2].(error) @@ -69,21 +63,21 @@ func (m *MockAuthorizeCodeStrategy) GenerateAuthorizeCode(ctx context.Context, r } // GenerateAuthorizeCode indicates an expected call of GenerateAuthorizeCode. -func (mr *MockAuthorizeCodeStrategyMockRecorder) GenerateAuthorizeCode(ctx, requester any) *gomock.Call { +func (mr *MockAuthorizeCodeStrategyMockRecorder) GenerateAuthorizeCode(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateAuthorizeCode", reflect.TypeOf((*MockAuthorizeCodeStrategy)(nil).GenerateAuthorizeCode), ctx, requester) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateAuthorizeCode", reflect.TypeOf((*MockAuthorizeCodeStrategy)(nil).GenerateAuthorizeCode), arg0, arg1) } // ValidateAuthorizeCode mocks base method. -func (m *MockAuthorizeCodeStrategy) ValidateAuthorizeCode(ctx context.Context, requester fosite.Requester, token string) error { +func (m *MockAuthorizeCodeStrategy) ValidateAuthorizeCode(arg0 context.Context, arg1 fosite.Requester, arg2 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ValidateAuthorizeCode", ctx, requester, token) + ret := m.ctrl.Call(m, "ValidateAuthorizeCode", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // ValidateAuthorizeCode indicates an expected call of ValidateAuthorizeCode. -func (mr *MockAuthorizeCodeStrategyMockRecorder) ValidateAuthorizeCode(ctx, requester, token any) *gomock.Call { +func (mr *MockAuthorizeCodeStrategyMockRecorder) ValidateAuthorizeCode(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateAuthorizeCode", reflect.TypeOf((*MockAuthorizeCodeStrategy)(nil).ValidateAuthorizeCode), ctx, requester, token) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateAuthorizeCode", reflect.TypeOf((*MockAuthorizeCodeStrategy)(nil).ValidateAuthorizeCode), arg0, arg1, arg2) } diff --git a/internal/authorize_handler.go b/internal/authorize_handler.go index 36bec0504..acbe5171f 100644 --- a/internal/authorize_handler.go +++ b/internal/authorize_handler.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite (interfaces: AuthorizeEndpointHandler) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/authorize_handler.go github.com/ory/fosite AuthorizeEndpointHandler -// // Package internal is a generated GoMock package. package internal @@ -16,15 +11,14 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockAuthorizeEndpointHandler is a mock of AuthorizeEndpointHandler interface. type MockAuthorizeEndpointHandler struct { ctrl *gomock.Controller recorder *MockAuthorizeEndpointHandlerMockRecorder - isgomock struct{} } // MockAuthorizeEndpointHandlerMockRecorder is the mock recorder for MockAuthorizeEndpointHandler. @@ -45,15 +39,15 @@ func (m *MockAuthorizeEndpointHandler) EXPECT() *MockAuthorizeEndpointHandlerMoc } // HandleAuthorizeEndpointRequest mocks base method. -func (m *MockAuthorizeEndpointHandler) HandleAuthorizeEndpointRequest(ctx context.Context, requester fosite.AuthorizeRequester, responder fosite.AuthorizeResponder) error { +func (m *MockAuthorizeEndpointHandler) HandleAuthorizeEndpointRequest(arg0 context.Context, arg1 fosite.AuthorizeRequester, arg2 fosite.AuthorizeResponder) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "HandleAuthorizeEndpointRequest", ctx, requester, responder) + ret := m.ctrl.Call(m, "HandleAuthorizeEndpointRequest", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // HandleAuthorizeEndpointRequest indicates an expected call of HandleAuthorizeEndpointRequest. -func (mr *MockAuthorizeEndpointHandlerMockRecorder) HandleAuthorizeEndpointRequest(ctx, requester, responder any) *gomock.Call { +func (mr *MockAuthorizeEndpointHandlerMockRecorder) HandleAuthorizeEndpointRequest(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleAuthorizeEndpointRequest", reflect.TypeOf((*MockAuthorizeEndpointHandler)(nil).HandleAuthorizeEndpointRequest), ctx, requester, responder) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleAuthorizeEndpointRequest", reflect.TypeOf((*MockAuthorizeEndpointHandler)(nil).HandleAuthorizeEndpointRequest), arg0, arg1, arg2) } diff --git a/internal/authorize_request.go b/internal/authorize_request.go index 69e6cbe49..3cb659a6a 100644 --- a/internal/authorize_request.go +++ b/internal/authorize_request.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite (interfaces: AuthorizeRequester) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/authorize_request.go github.com/ory/fosite AuthorizeRequester -// // Package internal is a generated GoMock package. package internal @@ -17,15 +12,14 @@ import ( reflect "reflect" time "time" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockAuthorizeRequester is a mock of AuthorizeRequester interface. type MockAuthorizeRequester struct { ctrl *gomock.Controller recorder *MockAuthorizeRequesterMockRecorder - isgomock struct{} } // MockAuthorizeRequesterMockRecorder is the mock recorder for MockAuthorizeRequester. @@ -46,15 +40,15 @@ func (m *MockAuthorizeRequester) EXPECT() *MockAuthorizeRequesterMockRecorder { } // AppendRequestedScope mocks base method. -func (m *MockAuthorizeRequester) AppendRequestedScope(scope string) { +func (m *MockAuthorizeRequester) AppendRequestedScope(arg0 string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "AppendRequestedScope", scope) + m.ctrl.Call(m, "AppendRequestedScope", arg0) } // AppendRequestedScope indicates an expected call of AppendRequestedScope. -func (mr *MockAuthorizeRequesterMockRecorder) AppendRequestedScope(scope any) *gomock.Call { +func (mr *MockAuthorizeRequesterMockRecorder) AppendRequestedScope(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AppendRequestedScope", reflect.TypeOf((*MockAuthorizeRequester)(nil).AppendRequestedScope), scope) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AppendRequestedScope", reflect.TypeOf((*MockAuthorizeRequester)(nil).AppendRequestedScope), arg0) } // DidHandleAllResponseTypes mocks base method. @@ -268,27 +262,27 @@ func (mr *MockAuthorizeRequesterMockRecorder) GetState() *gomock.Call { } // GrantAudience mocks base method. -func (m *MockAuthorizeRequester) GrantAudience(audience string) { +func (m *MockAuthorizeRequester) GrantAudience(arg0 string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "GrantAudience", audience) + m.ctrl.Call(m, "GrantAudience", arg0) } // GrantAudience indicates an expected call of GrantAudience. -func (mr *MockAuthorizeRequesterMockRecorder) GrantAudience(audience any) *gomock.Call { +func (mr *MockAuthorizeRequesterMockRecorder) GrantAudience(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GrantAudience", reflect.TypeOf((*MockAuthorizeRequester)(nil).GrantAudience), audience) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GrantAudience", reflect.TypeOf((*MockAuthorizeRequester)(nil).GrantAudience), arg0) } // GrantScope mocks base method. -func (m *MockAuthorizeRequester) GrantScope(scope string) { +func (m *MockAuthorizeRequester) GrantScope(arg0 string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "GrantScope", scope) + m.ctrl.Call(m, "GrantScope", arg0) } // GrantScope indicates an expected call of GrantScope. -func (mr *MockAuthorizeRequesterMockRecorder) GrantScope(scope any) *gomock.Call { +func (mr *MockAuthorizeRequesterMockRecorder) GrantScope(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GrantScope", reflect.TypeOf((*MockAuthorizeRequester)(nil).GrantScope), scope) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GrantScope", reflect.TypeOf((*MockAuthorizeRequester)(nil).GrantScope), arg0) } // IsRedirectURIValid mocks base method. @@ -306,99 +300,99 @@ func (mr *MockAuthorizeRequesterMockRecorder) IsRedirectURIValid() *gomock.Call } // Merge mocks base method. -func (m *MockAuthorizeRequester) Merge(requester fosite.Requester) { +func (m *MockAuthorizeRequester) Merge(arg0 fosite.Requester) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Merge", requester) + m.ctrl.Call(m, "Merge", arg0) } // Merge indicates an expected call of Merge. -func (mr *MockAuthorizeRequesterMockRecorder) Merge(requester any) *gomock.Call { +func (mr *MockAuthorizeRequesterMockRecorder) Merge(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Merge", reflect.TypeOf((*MockAuthorizeRequester)(nil).Merge), requester) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Merge", reflect.TypeOf((*MockAuthorizeRequester)(nil).Merge), arg0) } // Sanitize mocks base method. -func (m *MockAuthorizeRequester) Sanitize(allowedParameters []string) fosite.Requester { +func (m *MockAuthorizeRequester) Sanitize(arg0 []string) fosite.Requester { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Sanitize", allowedParameters) + ret := m.ctrl.Call(m, "Sanitize", arg0) ret0, _ := ret[0].(fosite.Requester) return ret0 } // Sanitize indicates an expected call of Sanitize. -func (mr *MockAuthorizeRequesterMockRecorder) Sanitize(allowedParameters any) *gomock.Call { +func (mr *MockAuthorizeRequesterMockRecorder) Sanitize(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sanitize", reflect.TypeOf((*MockAuthorizeRequester)(nil).Sanitize), allowedParameters) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sanitize", reflect.TypeOf((*MockAuthorizeRequester)(nil).Sanitize), arg0) } // SetDefaultResponseMode mocks base method. -func (m *MockAuthorizeRequester) SetDefaultResponseMode(responseMode fosite.ResponseModeType) { +func (m *MockAuthorizeRequester) SetDefaultResponseMode(arg0 fosite.ResponseModeType) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetDefaultResponseMode", responseMode) + m.ctrl.Call(m, "SetDefaultResponseMode", arg0) } // SetDefaultResponseMode indicates an expected call of SetDefaultResponseMode. -func (mr *MockAuthorizeRequesterMockRecorder) SetDefaultResponseMode(responseMode any) *gomock.Call { +func (mr *MockAuthorizeRequesterMockRecorder) SetDefaultResponseMode(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDefaultResponseMode", reflect.TypeOf((*MockAuthorizeRequester)(nil).SetDefaultResponseMode), responseMode) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetDefaultResponseMode", reflect.TypeOf((*MockAuthorizeRequester)(nil).SetDefaultResponseMode), arg0) } // SetID mocks base method. -func (m *MockAuthorizeRequester) SetID(id string) { +func (m *MockAuthorizeRequester) SetID(arg0 string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetID", id) + m.ctrl.Call(m, "SetID", arg0) } // SetID indicates an expected call of SetID. -func (mr *MockAuthorizeRequesterMockRecorder) SetID(id any) *gomock.Call { +func (mr *MockAuthorizeRequesterMockRecorder) SetID(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetID", reflect.TypeOf((*MockAuthorizeRequester)(nil).SetID), id) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetID", reflect.TypeOf((*MockAuthorizeRequester)(nil).SetID), arg0) } // SetRequestedAudience mocks base method. -func (m *MockAuthorizeRequester) SetRequestedAudience(audience fosite.Arguments) { +func (m *MockAuthorizeRequester) SetRequestedAudience(arg0 fosite.Arguments) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetRequestedAudience", audience) + m.ctrl.Call(m, "SetRequestedAudience", arg0) } // SetRequestedAudience indicates an expected call of SetRequestedAudience. -func (mr *MockAuthorizeRequesterMockRecorder) SetRequestedAudience(audience any) *gomock.Call { +func (mr *MockAuthorizeRequesterMockRecorder) SetRequestedAudience(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetRequestedAudience", reflect.TypeOf((*MockAuthorizeRequester)(nil).SetRequestedAudience), audience) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetRequestedAudience", reflect.TypeOf((*MockAuthorizeRequester)(nil).SetRequestedAudience), arg0) } // SetRequestedScopes mocks base method. -func (m *MockAuthorizeRequester) SetRequestedScopes(scopes fosite.Arguments) { +func (m *MockAuthorizeRequester) SetRequestedScopes(arg0 fosite.Arguments) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetRequestedScopes", scopes) + m.ctrl.Call(m, "SetRequestedScopes", arg0) } // SetRequestedScopes indicates an expected call of SetRequestedScopes. -func (mr *MockAuthorizeRequesterMockRecorder) SetRequestedScopes(scopes any) *gomock.Call { +func (mr *MockAuthorizeRequesterMockRecorder) SetRequestedScopes(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetRequestedScopes", reflect.TypeOf((*MockAuthorizeRequester)(nil).SetRequestedScopes), scopes) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetRequestedScopes", reflect.TypeOf((*MockAuthorizeRequester)(nil).SetRequestedScopes), arg0) } // SetResponseTypeHandled mocks base method. -func (m *MockAuthorizeRequester) SetResponseTypeHandled(responseType string) { +func (m *MockAuthorizeRequester) SetResponseTypeHandled(arg0 string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetResponseTypeHandled", responseType) + m.ctrl.Call(m, "SetResponseTypeHandled", arg0) } // SetResponseTypeHandled indicates an expected call of SetResponseTypeHandled. -func (mr *MockAuthorizeRequesterMockRecorder) SetResponseTypeHandled(responseType any) *gomock.Call { +func (mr *MockAuthorizeRequesterMockRecorder) SetResponseTypeHandled(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetResponseTypeHandled", reflect.TypeOf((*MockAuthorizeRequester)(nil).SetResponseTypeHandled), responseType) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetResponseTypeHandled", reflect.TypeOf((*MockAuthorizeRequester)(nil).SetResponseTypeHandled), arg0) } // SetSession mocks base method. -func (m *MockAuthorizeRequester) SetSession(session fosite.Session) { +func (m *MockAuthorizeRequester) SetSession(arg0 fosite.Session) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetSession", session) + m.ctrl.Call(m, "SetSession", arg0) } // SetSession indicates an expected call of SetSession. -func (mr *MockAuthorizeRequesterMockRecorder) SetSession(session any) *gomock.Call { +func (mr *MockAuthorizeRequesterMockRecorder) SetSession(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetSession", reflect.TypeOf((*MockAuthorizeRequester)(nil).SetSession), session) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetSession", reflect.TypeOf((*MockAuthorizeRequester)(nil).SetSession), arg0) } diff --git a/internal/authorize_response.go b/internal/authorize_response.go index 13c4709d2..f546ae17d 100644 --- a/internal/authorize_response.go +++ b/internal/authorize_response.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite (interfaces: AuthorizeResponder) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/authorize_response.go github.com/ory/fosite AuthorizeResponder -// // Package internal is a generated GoMock package. package internal @@ -17,14 +12,13 @@ import ( url "net/url" reflect "reflect" - gomock "go.uber.org/mock/gomock" + gomock "github.com/golang/mock/gomock" ) // MockAuthorizeResponder is a mock of AuthorizeResponder interface. type MockAuthorizeResponder struct { ctrl *gomock.Controller recorder *MockAuthorizeResponderMockRecorder - isgomock struct{} } // MockAuthorizeResponderMockRecorder is the mock recorder for MockAuthorizeResponder. @@ -45,27 +39,27 @@ func (m *MockAuthorizeResponder) EXPECT() *MockAuthorizeResponderMockRecorder { } // AddHeader mocks base method. -func (m *MockAuthorizeResponder) AddHeader(key, value string) { +func (m *MockAuthorizeResponder) AddHeader(arg0, arg1 string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "AddHeader", key, value) + m.ctrl.Call(m, "AddHeader", arg0, arg1) } // AddHeader indicates an expected call of AddHeader. -func (mr *MockAuthorizeResponderMockRecorder) AddHeader(key, value any) *gomock.Call { +func (mr *MockAuthorizeResponderMockRecorder) AddHeader(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddHeader", reflect.TypeOf((*MockAuthorizeResponder)(nil).AddHeader), key, value) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddHeader", reflect.TypeOf((*MockAuthorizeResponder)(nil).AddHeader), arg0, arg1) } // AddParameter mocks base method. -func (m *MockAuthorizeResponder) AddParameter(key, value string) { +func (m *MockAuthorizeResponder) AddParameter(arg0, arg1 string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "AddParameter", key, value) + m.ctrl.Call(m, "AddParameter", arg0, arg1) } // AddParameter indicates an expected call of AddParameter. -func (mr *MockAuthorizeResponderMockRecorder) AddParameter(key, value any) *gomock.Call { +func (mr *MockAuthorizeResponderMockRecorder) AddParameter(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddParameter", reflect.TypeOf((*MockAuthorizeResponder)(nil).AddParameter), key, value) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AddParameter", reflect.TypeOf((*MockAuthorizeResponder)(nil).AddParameter), arg0, arg1) } // GetCode mocks base method. diff --git a/internal/client.go b/internal/client.go index 522d9384e..c2cd21a08 100644 --- a/internal/client.go +++ b/internal/client.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite (interfaces: Client) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/client.go github.com/ory/fosite Client -// // Package internal is a generated GoMock package. package internal @@ -15,15 +10,14 @@ package internal import ( reflect "reflect" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockClient is a mock of Client interface. type MockClient struct { ctrl *gomock.Controller recorder *MockClientMockRecorder - isgomock struct{} } // MockClientMockRecorder is the mock recorder for MockClient. diff --git a/internal/device_code_rate_limit_strategy.go b/internal/device_code_rate_limit_strategy.go index a0903b55b..581036888 100644 --- a/internal/device_code_rate_limit_strategy.go +++ b/internal/device_code_rate_limit_strategy.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/handler/rfc8628 (interfaces: DeviceRateLimitStrategy) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/device_code_rate_limit_strategy.go github.com/ory/fosite/handler/rfc8628 DeviceRateLimitStrategy -// // Package internal is a generated GoMock package. package internal @@ -16,14 +11,13 @@ import ( context "context" reflect "reflect" - gomock "go.uber.org/mock/gomock" + gomock "github.com/golang/mock/gomock" ) // MockDeviceRateLimitStrategy is a mock of DeviceRateLimitStrategy interface. type MockDeviceRateLimitStrategy struct { ctrl *gomock.Controller recorder *MockDeviceRateLimitStrategyMockRecorder - isgomock struct{} } // MockDeviceRateLimitStrategyMockRecorder is the mock recorder for MockDeviceRateLimitStrategy. @@ -44,16 +38,16 @@ func (m *MockDeviceRateLimitStrategy) EXPECT() *MockDeviceRateLimitStrategyMockR } // ShouldRateLimit mocks base method. -func (m *MockDeviceRateLimitStrategy) ShouldRateLimit(ctx context.Context, code string) (bool, error) { +func (m *MockDeviceRateLimitStrategy) ShouldRateLimit(arg0 context.Context, arg1 string) (bool, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ShouldRateLimit", ctx, code) + ret := m.ctrl.Call(m, "ShouldRateLimit", arg0, arg1) ret0, _ := ret[0].(bool) ret1, _ := ret[1].(error) return ret0, ret1 } // ShouldRateLimit indicates an expected call of ShouldRateLimit. -func (mr *MockDeviceRateLimitStrategyMockRecorder) ShouldRateLimit(ctx, code any) *gomock.Call { +func (mr *MockDeviceRateLimitStrategyMockRecorder) ShouldRateLimit(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ShouldRateLimit", reflect.TypeOf((*MockDeviceRateLimitStrategy)(nil).ShouldRateLimit), ctx, code) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ShouldRateLimit", reflect.TypeOf((*MockDeviceRateLimitStrategy)(nil).ShouldRateLimit), arg0, arg1) } diff --git a/internal/hash.go b/internal/hash.go index 1480152b8..e31958658 100644 --- a/internal/hash.go +++ b/internal/hash.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite (interfaces: Hasher) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/hash.go github.com/ory/fosite Hasher -// // Package internal is a generated GoMock package. package internal @@ -16,14 +11,13 @@ import ( context "context" reflect "reflect" - gomock "go.uber.org/mock/gomock" + gomock "github.com/golang/mock/gomock" ) // MockHasher is a mock of Hasher interface. type MockHasher struct { ctrl *gomock.Controller recorder *MockHasherMockRecorder - isgomock struct{} } // MockHasherMockRecorder is the mock recorder for MockHasher. @@ -44,30 +38,30 @@ func (m *MockHasher) EXPECT() *MockHasherMockRecorder { } // Compare mocks base method. -func (m *MockHasher) Compare(ctx context.Context, hash, data []byte) error { +func (m *MockHasher) Compare(arg0 context.Context, arg1, arg2 []byte) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Compare", ctx, hash, data) + ret := m.ctrl.Call(m, "Compare", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // Compare indicates an expected call of Compare. -func (mr *MockHasherMockRecorder) Compare(ctx, hash, data any) *gomock.Call { +func (mr *MockHasherMockRecorder) Compare(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Compare", reflect.TypeOf((*MockHasher)(nil).Compare), ctx, hash, data) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Compare", reflect.TypeOf((*MockHasher)(nil).Compare), arg0, arg1, arg2) } // Hash mocks base method. -func (m *MockHasher) Hash(ctx context.Context, data []byte) ([]byte, error) { +func (m *MockHasher) Hash(arg0 context.Context, arg1 []byte) ([]byte, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Hash", ctx, data) + ret := m.ctrl.Call(m, "Hash", arg0, arg1) ret0, _ := ret[0].([]byte) ret1, _ := ret[1].(error) return ret0, ret1 } // Hash indicates an expected call of Hash. -func (mr *MockHasherMockRecorder) Hash(ctx, data any) *gomock.Call { +func (mr *MockHasherMockRecorder) Hash(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Hash", reflect.TypeOf((*MockHasher)(nil).Hash), ctx, data) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Hash", reflect.TypeOf((*MockHasher)(nil).Hash), arg0, arg1) } diff --git a/internal/id_token_strategy.go b/internal/id_token_strategy.go index 05b5f524d..e22803f6c 100644 --- a/internal/id_token_strategy.go +++ b/internal/id_token_strategy.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/handler/openid (interfaces: OpenIDConnectTokenStrategy) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/id_token_strategy.go github.com/ory/fosite/handler/openid OpenIDConnectTokenStrategy -// // Package internal is a generated GoMock package. package internal @@ -17,15 +12,14 @@ import ( reflect "reflect" time "time" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockOpenIDConnectTokenStrategy is a mock of OpenIDConnectTokenStrategy interface. type MockOpenIDConnectTokenStrategy struct { ctrl *gomock.Controller recorder *MockOpenIDConnectTokenStrategyMockRecorder - isgomock struct{} } // MockOpenIDConnectTokenStrategyMockRecorder is the mock recorder for MockOpenIDConnectTokenStrategy. @@ -46,16 +40,16 @@ func (m *MockOpenIDConnectTokenStrategy) EXPECT() *MockOpenIDConnectTokenStrateg } // GenerateIDToken mocks base method. -func (m *MockOpenIDConnectTokenStrategy) GenerateIDToken(ctx context.Context, lifespan time.Duration, requester fosite.Requester) (string, error) { +func (m *MockOpenIDConnectTokenStrategy) GenerateIDToken(arg0 context.Context, arg1 time.Duration, arg2 fosite.Requester) (string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GenerateIDToken", ctx, lifespan, requester) + ret := m.ctrl.Call(m, "GenerateIDToken", arg0, arg1, arg2) ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) return ret0, ret1 } // GenerateIDToken indicates an expected call of GenerateIDToken. -func (mr *MockOpenIDConnectTokenStrategyMockRecorder) GenerateIDToken(ctx, lifespan, requester any) *gomock.Call { +func (mr *MockOpenIDConnectTokenStrategyMockRecorder) GenerateIDToken(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateIDToken", reflect.TypeOf((*MockOpenIDConnectTokenStrategy)(nil).GenerateIDToken), ctx, lifespan, requester) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateIDToken", reflect.TypeOf((*MockOpenIDConnectTokenStrategy)(nil).GenerateIDToken), arg0, arg1, arg2) } diff --git a/internal/introspector.go b/internal/introspector.go index c2dd27c3a..f4160da15 100644 --- a/internal/introspector.go +++ b/internal/introspector.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite (interfaces: TokenIntrospector) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/introspector.go github.com/ory/fosite TokenIntrospector -// // Package internal is a generated GoMock package. package internal @@ -16,15 +11,14 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockTokenIntrospector is a mock of TokenIntrospector interface. type MockTokenIntrospector struct { ctrl *gomock.Controller recorder *MockTokenIntrospectorMockRecorder - isgomock struct{} } // MockTokenIntrospectorMockRecorder is the mock recorder for MockTokenIntrospector. @@ -45,16 +39,16 @@ func (m *MockTokenIntrospector) EXPECT() *MockTokenIntrospectorMockRecorder { } // IntrospectToken mocks base method. -func (m *MockTokenIntrospector) IntrospectToken(ctx context.Context, token string, tokenUse fosite.TokenType, accessRequest fosite.AccessRequester, scopes []string) (fosite.TokenType, error) { +func (m *MockTokenIntrospector) IntrospectToken(arg0 context.Context, arg1 string, arg2 fosite.TokenType, arg3 fosite.AccessRequester, arg4 []string) (fosite.TokenType, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "IntrospectToken", ctx, token, tokenUse, accessRequest, scopes) + ret := m.ctrl.Call(m, "IntrospectToken", arg0, arg1, arg2, arg3, arg4) ret0, _ := ret[0].(fosite.TokenType) ret1, _ := ret[1].(error) return ret0, ret1 } // IntrospectToken indicates an expected call of IntrospectToken. -func (mr *MockTokenIntrospectorMockRecorder) IntrospectToken(ctx, token, tokenUse, accessRequest, scopes any) *gomock.Call { +func (mr *MockTokenIntrospectorMockRecorder) IntrospectToken(arg0, arg1, arg2, arg3, arg4 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IntrospectToken", reflect.TypeOf((*MockTokenIntrospector)(nil).IntrospectToken), ctx, token, tokenUse, accessRequest, scopes) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IntrospectToken", reflect.TypeOf((*MockTokenIntrospector)(nil).IntrospectToken), arg0, arg1, arg2, arg3, arg4) } diff --git a/internal/oauth2_auth_jwt_storage.go b/internal/oauth2_auth_jwt_storage.go index e7e4398bb..19dbd6d1e 100644 --- a/internal/oauth2_auth_jwt_storage.go +++ b/internal/oauth2_auth_jwt_storage.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/handler/rfc7523 (interfaces: RFC7523KeyStorage) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/oauth2_auth_jwt_storage.go github.com/ory/fosite/handler/rfc7523 RFC7523KeyStorage -// // Package internal is a generated GoMock package. package internal @@ -18,14 +13,13 @@ import ( time "time" jose "github.com/go-jose/go-jose/v3" - gomock "go.uber.org/mock/gomock" + gomock "github.com/golang/mock/gomock" ) // MockRFC7523KeyStorage is a mock of RFC7523KeyStorage interface. type MockRFC7523KeyStorage struct { ctrl *gomock.Controller recorder *MockRFC7523KeyStorageMockRecorder - isgomock struct{} } // MockRFC7523KeyStorageMockRecorder is the mock recorder for MockRFC7523KeyStorage. @@ -46,75 +40,75 @@ func (m *MockRFC7523KeyStorage) EXPECT() *MockRFC7523KeyStorageMockRecorder { } // GetPublicKey mocks base method. -func (m *MockRFC7523KeyStorage) GetPublicKey(ctx context.Context, issuer, subject, keyId string) (*jose.JSONWebKey, error) { +func (m *MockRFC7523KeyStorage) GetPublicKey(arg0 context.Context, arg1, arg2, arg3 string) (*jose.JSONWebKey, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetPublicKey", ctx, issuer, subject, keyId) + ret := m.ctrl.Call(m, "GetPublicKey", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(*jose.JSONWebKey) ret1, _ := ret[1].(error) return ret0, ret1 } // GetPublicKey indicates an expected call of GetPublicKey. -func (mr *MockRFC7523KeyStorageMockRecorder) GetPublicKey(ctx, issuer, subject, keyId any) *gomock.Call { +func (mr *MockRFC7523KeyStorageMockRecorder) GetPublicKey(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPublicKey", reflect.TypeOf((*MockRFC7523KeyStorage)(nil).GetPublicKey), ctx, issuer, subject, keyId) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPublicKey", reflect.TypeOf((*MockRFC7523KeyStorage)(nil).GetPublicKey), arg0, arg1, arg2, arg3) } // GetPublicKeyScopes mocks base method. -func (m *MockRFC7523KeyStorage) GetPublicKeyScopes(ctx context.Context, issuer, subject, keyId string) ([]string, error) { +func (m *MockRFC7523KeyStorage) GetPublicKeyScopes(arg0 context.Context, arg1, arg2, arg3 string) ([]string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetPublicKeyScopes", ctx, issuer, subject, keyId) + ret := m.ctrl.Call(m, "GetPublicKeyScopes", arg0, arg1, arg2, arg3) ret0, _ := ret[0].([]string) ret1, _ := ret[1].(error) return ret0, ret1 } // GetPublicKeyScopes indicates an expected call of GetPublicKeyScopes. -func (mr *MockRFC7523KeyStorageMockRecorder) GetPublicKeyScopes(ctx, issuer, subject, keyId any) *gomock.Call { +func (mr *MockRFC7523KeyStorageMockRecorder) GetPublicKeyScopes(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPublicKeyScopes", reflect.TypeOf((*MockRFC7523KeyStorage)(nil).GetPublicKeyScopes), ctx, issuer, subject, keyId) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPublicKeyScopes", reflect.TypeOf((*MockRFC7523KeyStorage)(nil).GetPublicKeyScopes), arg0, arg1, arg2, arg3) } // GetPublicKeys mocks base method. -func (m *MockRFC7523KeyStorage) GetPublicKeys(ctx context.Context, issuer, subject string) (*jose.JSONWebKeySet, error) { +func (m *MockRFC7523KeyStorage) GetPublicKeys(arg0 context.Context, arg1, arg2 string) (*jose.JSONWebKeySet, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetPublicKeys", ctx, issuer, subject) + ret := m.ctrl.Call(m, "GetPublicKeys", arg0, arg1, arg2) ret0, _ := ret[0].(*jose.JSONWebKeySet) ret1, _ := ret[1].(error) return ret0, ret1 } // GetPublicKeys indicates an expected call of GetPublicKeys. -func (mr *MockRFC7523KeyStorageMockRecorder) GetPublicKeys(ctx, issuer, subject any) *gomock.Call { +func (mr *MockRFC7523KeyStorageMockRecorder) GetPublicKeys(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPublicKeys", reflect.TypeOf((*MockRFC7523KeyStorage)(nil).GetPublicKeys), ctx, issuer, subject) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPublicKeys", reflect.TypeOf((*MockRFC7523KeyStorage)(nil).GetPublicKeys), arg0, arg1, arg2) } // IsJWTUsed mocks base method. -func (m *MockRFC7523KeyStorage) IsJWTUsed(ctx context.Context, jti string) (bool, error) { +func (m *MockRFC7523KeyStorage) IsJWTUsed(arg0 context.Context, arg1 string) (bool, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "IsJWTUsed", ctx, jti) + ret := m.ctrl.Call(m, "IsJWTUsed", arg0, arg1) ret0, _ := ret[0].(bool) ret1, _ := ret[1].(error) return ret0, ret1 } // IsJWTUsed indicates an expected call of IsJWTUsed. -func (mr *MockRFC7523KeyStorageMockRecorder) IsJWTUsed(ctx, jti any) *gomock.Call { +func (mr *MockRFC7523KeyStorageMockRecorder) IsJWTUsed(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsJWTUsed", reflect.TypeOf((*MockRFC7523KeyStorage)(nil).IsJWTUsed), ctx, jti) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "IsJWTUsed", reflect.TypeOf((*MockRFC7523KeyStorage)(nil).IsJWTUsed), arg0, arg1) } // MarkJWTUsedForTime mocks base method. -func (m *MockRFC7523KeyStorage) MarkJWTUsedForTime(ctx context.Context, jti string, exp time.Time) error { +func (m *MockRFC7523KeyStorage) MarkJWTUsedForTime(arg0 context.Context, arg1 string, arg2 time.Time) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "MarkJWTUsedForTime", ctx, jti, exp) + ret := m.ctrl.Call(m, "MarkJWTUsedForTime", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // MarkJWTUsedForTime indicates an expected call of MarkJWTUsedForTime. -func (mr *MockRFC7523KeyStorageMockRecorder) MarkJWTUsedForTime(ctx, jti, exp any) *gomock.Call { +func (mr *MockRFC7523KeyStorageMockRecorder) MarkJWTUsedForTime(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MarkJWTUsedForTime", reflect.TypeOf((*MockRFC7523KeyStorage)(nil).MarkJWTUsedForTime), ctx, jti, exp) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "MarkJWTUsedForTime", reflect.TypeOf((*MockRFC7523KeyStorage)(nil).MarkJWTUsedForTime), arg0, arg1, arg2) } diff --git a/internal/oauth2_client_storage.go b/internal/oauth2_client_storage.go index 4a52d2cdc..4f8fad7a6 100644 --- a/internal/oauth2_client_storage.go +++ b/internal/oauth2_client_storage.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/handler/oauth2 (interfaces: ClientCredentialsGrantStorage) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/oauth2_client_storage.go github.com/ory/fosite/handler/oauth2 ClientCredentialsGrantStorage -// // Package internal is a generated GoMock package. package internal @@ -16,15 +11,14 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockClientCredentialsGrantStorage is a mock of ClientCredentialsGrantStorage interface. type MockClientCredentialsGrantStorage struct { ctrl *gomock.Controller recorder *MockClientCredentialsGrantStorageMockRecorder - isgomock struct{} } // MockClientCredentialsGrantStorageMockRecorder is the mock recorder for MockClientCredentialsGrantStorage. @@ -45,44 +39,44 @@ func (m *MockClientCredentialsGrantStorage) EXPECT() *MockClientCredentialsGrant } // CreateAccessTokenSession mocks base method. -func (m *MockClientCredentialsGrantStorage) CreateAccessTokenSession(ctx context.Context, signature string, request fosite.Requester) error { +func (m *MockClientCredentialsGrantStorage) CreateAccessTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Requester) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateAccessTokenSession", ctx, signature, request) + ret := m.ctrl.Call(m, "CreateAccessTokenSession", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // CreateAccessTokenSession indicates an expected call of CreateAccessTokenSession. -func (mr *MockClientCredentialsGrantStorageMockRecorder) CreateAccessTokenSession(ctx, signature, request any) *gomock.Call { +func (mr *MockClientCredentialsGrantStorageMockRecorder) CreateAccessTokenSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAccessTokenSession", reflect.TypeOf((*MockClientCredentialsGrantStorage)(nil).CreateAccessTokenSession), ctx, signature, request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAccessTokenSession", reflect.TypeOf((*MockClientCredentialsGrantStorage)(nil).CreateAccessTokenSession), arg0, arg1, arg2) } // DeleteAccessTokenSession mocks base method. -func (m *MockClientCredentialsGrantStorage) DeleteAccessTokenSession(ctx context.Context, signature string) error { +func (m *MockClientCredentialsGrantStorage) DeleteAccessTokenSession(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeleteAccessTokenSession", ctx, signature) + ret := m.ctrl.Call(m, "DeleteAccessTokenSession", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // DeleteAccessTokenSession indicates an expected call of DeleteAccessTokenSession. -func (mr *MockClientCredentialsGrantStorageMockRecorder) DeleteAccessTokenSession(ctx, signature any) *gomock.Call { +func (mr *MockClientCredentialsGrantStorageMockRecorder) DeleteAccessTokenSession(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAccessTokenSession", reflect.TypeOf((*MockClientCredentialsGrantStorage)(nil).DeleteAccessTokenSession), ctx, signature) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAccessTokenSession", reflect.TypeOf((*MockClientCredentialsGrantStorage)(nil).DeleteAccessTokenSession), arg0, arg1) } // GetAccessTokenSession mocks base method. -func (m *MockClientCredentialsGrantStorage) GetAccessTokenSession(ctx context.Context, signature string, session fosite.Session) (fosite.Requester, error) { +func (m *MockClientCredentialsGrantStorage) GetAccessTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.Requester, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetAccessTokenSession", ctx, signature, session) + ret := m.ctrl.Call(m, "GetAccessTokenSession", arg0, arg1, arg2) ret0, _ := ret[0].(fosite.Requester) ret1, _ := ret[1].(error) return ret0, ret1 } // GetAccessTokenSession indicates an expected call of GetAccessTokenSession. -func (mr *MockClientCredentialsGrantStorageMockRecorder) GetAccessTokenSession(ctx, signature, session any) *gomock.Call { +func (mr *MockClientCredentialsGrantStorageMockRecorder) GetAccessTokenSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccessTokenSession", reflect.TypeOf((*MockClientCredentialsGrantStorage)(nil).GetAccessTokenSession), ctx, signature, session) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccessTokenSession", reflect.TypeOf((*MockClientCredentialsGrantStorage)(nil).GetAccessTokenSession), arg0, arg1, arg2) } diff --git a/internal/oauth2_explicit_storage.go b/internal/oauth2_explicit_storage.go index aff385540..891aca38a 100644 --- a/internal/oauth2_explicit_storage.go +++ b/internal/oauth2_explicit_storage.go @@ -9,7 +9,7 @@ package internal import ( "context" - gomock "go.uber.org/mock/gomock" + gomock "github.com/golang/mock/gomock" "github.com/ory/fosite" ) diff --git a/internal/oauth2_owner_storage.go b/internal/oauth2_owner_storage.go index 57adf311a..0535b38e5 100644 --- a/internal/oauth2_owner_storage.go +++ b/internal/oauth2_owner_storage.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/handler/oauth2 (interfaces: ResourceOwnerPasswordCredentialsGrantStorage) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/oauth2_owner_storage.go github.com/ory/fosite/handler/oauth2 ResourceOwnerPasswordCredentialsGrantStorage -// // Package internal is a generated GoMock package. package internal @@ -15,16 +10,16 @@ package internal import ( context "context" reflect "reflect" + time "time" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockResourceOwnerPasswordCredentialsGrantStorage is a mock of ResourceOwnerPasswordCredentialsGrantStorage interface. type MockResourceOwnerPasswordCredentialsGrantStorage struct { ctrl *gomock.Controller recorder *MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder - isgomock struct{} } // MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder is the mock recorder for MockResourceOwnerPasswordCredentialsGrantStorage. @@ -45,116 +40,116 @@ func (m *MockResourceOwnerPasswordCredentialsGrantStorage) EXPECT() *MockResourc } // Authenticate mocks base method. -func (m *MockResourceOwnerPasswordCredentialsGrantStorage) Authenticate(ctx context.Context, name, secret string) (string, error) { +func (m *MockResourceOwnerPasswordCredentialsGrantStorage) Authenticate(arg0 context.Context, arg1, arg2 string) (string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Authenticate", ctx, name, secret) + ret := m.ctrl.Call(m, "Authenticate", arg0, arg1, arg2) ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) return ret0, ret1 } // Authenticate indicates an expected call of Authenticate. -func (mr *MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder) Authenticate(ctx, name, secret any) *gomock.Call { +func (mr *MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder) Authenticate(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Authenticate", reflect.TypeOf((*MockResourceOwnerPasswordCredentialsGrantStorage)(nil).Authenticate), ctx, name, secret) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Authenticate", reflect.TypeOf((*MockResourceOwnerPasswordCredentialsGrantStorage)(nil).Authenticate), arg0, arg1, arg2) } // CreateAccessTokenSession mocks base method. -func (m *MockResourceOwnerPasswordCredentialsGrantStorage) CreateAccessTokenSession(ctx context.Context, signature string, request fosite.Requester) error { +func (m *MockResourceOwnerPasswordCredentialsGrantStorage) CreateAccessTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Requester) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateAccessTokenSession", ctx, signature, request) + ret := m.ctrl.Call(m, "CreateAccessTokenSession", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // CreateAccessTokenSession indicates an expected call of CreateAccessTokenSession. -func (mr *MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder) CreateAccessTokenSession(ctx, signature, request any) *gomock.Call { +func (mr *MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder) CreateAccessTokenSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAccessTokenSession", reflect.TypeOf((*MockResourceOwnerPasswordCredentialsGrantStorage)(nil).CreateAccessTokenSession), ctx, signature, request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAccessTokenSession", reflect.TypeOf((*MockResourceOwnerPasswordCredentialsGrantStorage)(nil).CreateAccessTokenSession), arg0, arg1, arg2) } // CreateRefreshTokenSession mocks base method. -func (m *MockResourceOwnerPasswordCredentialsGrantStorage) CreateRefreshTokenSession(ctx context.Context, signature, accessSignature string, request fosite.Requester) error { +func (m *MockResourceOwnerPasswordCredentialsGrantStorage) CreateRefreshTokenSession(arg0 context.Context, arg1, arg2 string, arg3 fosite.Requester) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateRefreshTokenSession", ctx, signature, accessSignature, request) + ret := m.ctrl.Call(m, "CreateRefreshTokenSession", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(error) return ret0 } // CreateRefreshTokenSession indicates an expected call of CreateRefreshTokenSession. -func (mr *MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder) CreateRefreshTokenSession(ctx, signature, accessSignature, request any) *gomock.Call { +func (mr *MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder) CreateRefreshTokenSession(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRefreshTokenSession", reflect.TypeOf((*MockResourceOwnerPasswordCredentialsGrantStorage)(nil).CreateRefreshTokenSession), ctx, signature, accessSignature, request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRefreshTokenSession", reflect.TypeOf((*MockResourceOwnerPasswordCredentialsGrantStorage)(nil).CreateRefreshTokenSession), arg0, arg1, arg2, arg3) } // DeleteAccessTokenSession mocks base method. -func (m *MockResourceOwnerPasswordCredentialsGrantStorage) DeleteAccessTokenSession(ctx context.Context, signature string) error { +func (m *MockResourceOwnerPasswordCredentialsGrantStorage) DeleteAccessTokenSession(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeleteAccessTokenSession", ctx, signature) + ret := m.ctrl.Call(m, "DeleteAccessTokenSession", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // DeleteAccessTokenSession indicates an expected call of DeleteAccessTokenSession. -func (mr *MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder) DeleteAccessTokenSession(ctx, signature any) *gomock.Call { +func (mr *MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder) DeleteAccessTokenSession(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAccessTokenSession", reflect.TypeOf((*MockResourceOwnerPasswordCredentialsGrantStorage)(nil).DeleteAccessTokenSession), ctx, signature) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAccessTokenSession", reflect.TypeOf((*MockResourceOwnerPasswordCredentialsGrantStorage)(nil).DeleteAccessTokenSession), arg0, arg1) } // DeleteRefreshTokenSession mocks base method. -func (m *MockResourceOwnerPasswordCredentialsGrantStorage) DeleteRefreshTokenSession(ctx context.Context, signature string) error { +func (m *MockResourceOwnerPasswordCredentialsGrantStorage) DeleteRefreshTokenSession(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeleteRefreshTokenSession", ctx, signature) + ret := m.ctrl.Call(m, "DeleteRefreshTokenSession", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // DeleteRefreshTokenSession indicates an expected call of DeleteRefreshTokenSession. -func (mr *MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder) DeleteRefreshTokenSession(ctx, signature any) *gomock.Call { +func (mr *MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder) DeleteRefreshTokenSession(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteRefreshTokenSession", reflect.TypeOf((*MockResourceOwnerPasswordCredentialsGrantStorage)(nil).DeleteRefreshTokenSession), ctx, signature) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteRefreshTokenSession", reflect.TypeOf((*MockResourceOwnerPasswordCredentialsGrantStorage)(nil).DeleteRefreshTokenSession), arg0, arg1) } // GetAccessTokenSession mocks base method. -func (m *MockResourceOwnerPasswordCredentialsGrantStorage) GetAccessTokenSession(ctx context.Context, signature string, session fosite.Session) (fosite.Requester, error) { +func (m *MockResourceOwnerPasswordCredentialsGrantStorage) GetAccessTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.Requester, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetAccessTokenSession", ctx, signature, session) + ret := m.ctrl.Call(m, "GetAccessTokenSession", arg0, arg1, arg2) ret0, _ := ret[0].(fosite.Requester) ret1, _ := ret[1].(error) return ret0, ret1 } // GetAccessTokenSession indicates an expected call of GetAccessTokenSession. -func (mr *MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder) GetAccessTokenSession(ctx, signature, session any) *gomock.Call { +func (mr *MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder) GetAccessTokenSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccessTokenSession", reflect.TypeOf((*MockResourceOwnerPasswordCredentialsGrantStorage)(nil).GetAccessTokenSession), ctx, signature, session) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccessTokenSession", reflect.TypeOf((*MockResourceOwnerPasswordCredentialsGrantStorage)(nil).GetAccessTokenSession), arg0, arg1, arg2) } // GetRefreshTokenSession mocks base method. -func (m *MockResourceOwnerPasswordCredentialsGrantStorage) GetRefreshTokenSession(ctx context.Context, signature string, session fosite.Session) (fosite.Requester, error) { +func (m *MockResourceOwnerPasswordCredentialsGrantStorage) GetRefreshTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.Requester, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetRefreshTokenSession", ctx, signature, session) + ret := m.ctrl.Call(m, "GetRefreshTokenSession", arg0, arg1, arg2) ret0, _ := ret[0].(fosite.Requester) ret1, _ := ret[1].(error) return ret0, ret1 } // GetRefreshTokenSession indicates an expected call of GetRefreshTokenSession. -func (mr *MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder) GetRefreshTokenSession(ctx, signature, session any) *gomock.Call { +func (mr *MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder) GetRefreshTokenSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRefreshTokenSession", reflect.TypeOf((*MockResourceOwnerPasswordCredentialsGrantStorage)(nil).GetRefreshTokenSession), ctx, signature, session) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRefreshTokenSession", reflect.TypeOf((*MockResourceOwnerPasswordCredentialsGrantStorage)(nil).GetRefreshTokenSession), arg0, arg1, arg2) } // RotateRefreshToken mocks base method. -func (m *MockResourceOwnerPasswordCredentialsGrantStorage) RotateRefreshToken(ctx context.Context, requestID, refreshTokenSignature string) error { +func (m *MockResourceOwnerPasswordCredentialsGrantStorage) RotateRefreshToken(arg0 context.Context, arg1, arg2 string, arg3 time.Time) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RotateRefreshToken", ctx, requestID, refreshTokenSignature) + ret := m.ctrl.Call(m, "RotateRefreshToken", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(error) return ret0 } // RotateRefreshToken indicates an expected call of RotateRefreshToken. -func (mr *MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder) RotateRefreshToken(ctx, requestID, refreshTokenSignature any) *gomock.Call { +func (mr *MockResourceOwnerPasswordCredentialsGrantStorageMockRecorder) RotateRefreshToken(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RotateRefreshToken", reflect.TypeOf((*MockResourceOwnerPasswordCredentialsGrantStorage)(nil).RotateRefreshToken), ctx, requestID, refreshTokenSignature) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RotateRefreshToken", reflect.TypeOf((*MockResourceOwnerPasswordCredentialsGrantStorage)(nil).RotateRefreshToken), arg0, arg1, arg2, arg3) } diff --git a/internal/oauth2_refresh_storage.go b/internal/oauth2_refresh_storage.go index 7a7ffc6f9..f18069f97 100644 --- a/internal/oauth2_refresh_storage.go +++ b/internal/oauth2_refresh_storage.go @@ -9,7 +9,7 @@ package internal import ( "context" - gomock "go.uber.org/mock/gomock" + gomock "github.com/golang/mock/gomock" "github.com/ory/fosite" ) diff --git a/internal/oauth2_revoke_storage.go b/internal/oauth2_revoke_storage.go index 939baf420..bb876424a 100644 --- a/internal/oauth2_revoke_storage.go +++ b/internal/oauth2_revoke_storage.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/handler/oauth2 (interfaces: TokenRevocationStorage) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/oauth2_revoke_storage.go github.com/ory/fosite/handler/oauth2 TokenRevocationStorage -// // Package internal is a generated GoMock package. package internal @@ -15,16 +10,16 @@ package internal import ( context "context" reflect "reflect" + time "time" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockTokenRevocationStorage is a mock of TokenRevocationStorage interface. type MockTokenRevocationStorage struct { ctrl *gomock.Controller recorder *MockTokenRevocationStorageMockRecorder - isgomock struct{} } // MockTokenRevocationStorageMockRecorder is the mock recorder for MockTokenRevocationStorage. @@ -45,129 +40,129 @@ func (m *MockTokenRevocationStorage) EXPECT() *MockTokenRevocationStorageMockRec } // CreateAccessTokenSession mocks base method. -func (m *MockTokenRevocationStorage) CreateAccessTokenSession(ctx context.Context, signature string, request fosite.Requester) error { +func (m *MockTokenRevocationStorage) CreateAccessTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Requester) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateAccessTokenSession", ctx, signature, request) + ret := m.ctrl.Call(m, "CreateAccessTokenSession", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // CreateAccessTokenSession indicates an expected call of CreateAccessTokenSession. -func (mr *MockTokenRevocationStorageMockRecorder) CreateAccessTokenSession(ctx, signature, request any) *gomock.Call { +func (mr *MockTokenRevocationStorageMockRecorder) CreateAccessTokenSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAccessTokenSession", reflect.TypeOf((*MockTokenRevocationStorage)(nil).CreateAccessTokenSession), ctx, signature, request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAccessTokenSession", reflect.TypeOf((*MockTokenRevocationStorage)(nil).CreateAccessTokenSession), arg0, arg1, arg2) } // CreateRefreshTokenSession mocks base method. -func (m *MockTokenRevocationStorage) CreateRefreshTokenSession(ctx context.Context, signature, accessSignature string, request fosite.Requester) error { +func (m *MockTokenRevocationStorage) CreateRefreshTokenSession(arg0 context.Context, arg1, arg2 string, arg3 fosite.Requester) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateRefreshTokenSession", ctx, signature, accessSignature, request) + ret := m.ctrl.Call(m, "CreateRefreshTokenSession", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(error) return ret0 } // CreateRefreshTokenSession indicates an expected call of CreateRefreshTokenSession. -func (mr *MockTokenRevocationStorageMockRecorder) CreateRefreshTokenSession(ctx, signature, accessSignature, request any) *gomock.Call { +func (mr *MockTokenRevocationStorageMockRecorder) CreateRefreshTokenSession(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRefreshTokenSession", reflect.TypeOf((*MockTokenRevocationStorage)(nil).CreateRefreshTokenSession), ctx, signature, accessSignature, request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRefreshTokenSession", reflect.TypeOf((*MockTokenRevocationStorage)(nil).CreateRefreshTokenSession), arg0, arg1, arg2, arg3) } // DeleteAccessTokenSession mocks base method. -func (m *MockTokenRevocationStorage) DeleteAccessTokenSession(ctx context.Context, signature string) error { +func (m *MockTokenRevocationStorage) DeleteAccessTokenSession(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeleteAccessTokenSession", ctx, signature) + ret := m.ctrl.Call(m, "DeleteAccessTokenSession", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // DeleteAccessTokenSession indicates an expected call of DeleteAccessTokenSession. -func (mr *MockTokenRevocationStorageMockRecorder) DeleteAccessTokenSession(ctx, signature any) *gomock.Call { +func (mr *MockTokenRevocationStorageMockRecorder) DeleteAccessTokenSession(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAccessTokenSession", reflect.TypeOf((*MockTokenRevocationStorage)(nil).DeleteAccessTokenSession), ctx, signature) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAccessTokenSession", reflect.TypeOf((*MockTokenRevocationStorage)(nil).DeleteAccessTokenSession), arg0, arg1) } // DeleteRefreshTokenSession mocks base method. -func (m *MockTokenRevocationStorage) DeleteRefreshTokenSession(ctx context.Context, signature string) error { +func (m *MockTokenRevocationStorage) DeleteRefreshTokenSession(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeleteRefreshTokenSession", ctx, signature) + ret := m.ctrl.Call(m, "DeleteRefreshTokenSession", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // DeleteRefreshTokenSession indicates an expected call of DeleteRefreshTokenSession. -func (mr *MockTokenRevocationStorageMockRecorder) DeleteRefreshTokenSession(ctx, signature any) *gomock.Call { +func (mr *MockTokenRevocationStorageMockRecorder) DeleteRefreshTokenSession(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteRefreshTokenSession", reflect.TypeOf((*MockTokenRevocationStorage)(nil).DeleteRefreshTokenSession), ctx, signature) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteRefreshTokenSession", reflect.TypeOf((*MockTokenRevocationStorage)(nil).DeleteRefreshTokenSession), arg0, arg1) } // GetAccessTokenSession mocks base method. -func (m *MockTokenRevocationStorage) GetAccessTokenSession(ctx context.Context, signature string, session fosite.Session) (fosite.Requester, error) { +func (m *MockTokenRevocationStorage) GetAccessTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.Requester, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetAccessTokenSession", ctx, signature, session) + ret := m.ctrl.Call(m, "GetAccessTokenSession", arg0, arg1, arg2) ret0, _ := ret[0].(fosite.Requester) ret1, _ := ret[1].(error) return ret0, ret1 } // GetAccessTokenSession indicates an expected call of GetAccessTokenSession. -func (mr *MockTokenRevocationStorageMockRecorder) GetAccessTokenSession(ctx, signature, session any) *gomock.Call { +func (mr *MockTokenRevocationStorageMockRecorder) GetAccessTokenSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccessTokenSession", reflect.TypeOf((*MockTokenRevocationStorage)(nil).GetAccessTokenSession), ctx, signature, session) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccessTokenSession", reflect.TypeOf((*MockTokenRevocationStorage)(nil).GetAccessTokenSession), arg0, arg1, arg2) } // GetRefreshTokenSession mocks base method. -func (m *MockTokenRevocationStorage) GetRefreshTokenSession(ctx context.Context, signature string, session fosite.Session) (fosite.Requester, error) { +func (m *MockTokenRevocationStorage) GetRefreshTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.Requester, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetRefreshTokenSession", ctx, signature, session) + ret := m.ctrl.Call(m, "GetRefreshTokenSession", arg0, arg1, arg2) ret0, _ := ret[0].(fosite.Requester) ret1, _ := ret[1].(error) return ret0, ret1 } // GetRefreshTokenSession indicates an expected call of GetRefreshTokenSession. -func (mr *MockTokenRevocationStorageMockRecorder) GetRefreshTokenSession(ctx, signature, session any) *gomock.Call { +func (mr *MockTokenRevocationStorageMockRecorder) GetRefreshTokenSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRefreshTokenSession", reflect.TypeOf((*MockTokenRevocationStorage)(nil).GetRefreshTokenSession), ctx, signature, session) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRefreshTokenSession", reflect.TypeOf((*MockTokenRevocationStorage)(nil).GetRefreshTokenSession), arg0, arg1, arg2) } // RevokeAccessToken mocks base method. -func (m *MockTokenRevocationStorage) RevokeAccessToken(ctx context.Context, requestID string) error { +func (m *MockTokenRevocationStorage) RevokeAccessToken(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RevokeAccessToken", ctx, requestID) + ret := m.ctrl.Call(m, "RevokeAccessToken", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // RevokeAccessToken indicates an expected call of RevokeAccessToken. -func (mr *MockTokenRevocationStorageMockRecorder) RevokeAccessToken(ctx, requestID any) *gomock.Call { +func (mr *MockTokenRevocationStorageMockRecorder) RevokeAccessToken(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RevokeAccessToken", reflect.TypeOf((*MockTokenRevocationStorage)(nil).RevokeAccessToken), ctx, requestID) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RevokeAccessToken", reflect.TypeOf((*MockTokenRevocationStorage)(nil).RevokeAccessToken), arg0, arg1) } // RevokeRefreshToken mocks base method. -func (m *MockTokenRevocationStorage) RevokeRefreshToken(ctx context.Context, requestID string) error { +func (m *MockTokenRevocationStorage) RevokeRefreshToken(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RevokeRefreshToken", ctx, requestID) + ret := m.ctrl.Call(m, "RevokeRefreshToken", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // RevokeRefreshToken indicates an expected call of RevokeRefreshToken. -func (mr *MockTokenRevocationStorageMockRecorder) RevokeRefreshToken(ctx, requestID any) *gomock.Call { +func (mr *MockTokenRevocationStorageMockRecorder) RevokeRefreshToken(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RevokeRefreshToken", reflect.TypeOf((*MockTokenRevocationStorage)(nil).RevokeRefreshToken), ctx, requestID) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RevokeRefreshToken", reflect.TypeOf((*MockTokenRevocationStorage)(nil).RevokeRefreshToken), arg0, arg1) } // RotateRefreshToken mocks base method. -func (m *MockTokenRevocationStorage) RotateRefreshToken(ctx context.Context, requestID, refreshTokenSignature string) error { +func (m *MockTokenRevocationStorage) RotateRefreshToken(arg0 context.Context, arg1, arg2 string, arg3 time.Time) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RotateRefreshToken", ctx, requestID, refreshTokenSignature) + ret := m.ctrl.Call(m, "RotateRefreshToken", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(error) return ret0 } // RotateRefreshToken indicates an expected call of RotateRefreshToken. -func (mr *MockTokenRevocationStorageMockRecorder) RotateRefreshToken(ctx, requestID, refreshTokenSignature any) *gomock.Call { +func (mr *MockTokenRevocationStorageMockRecorder) RotateRefreshToken(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RotateRefreshToken", reflect.TypeOf((*MockTokenRevocationStorage)(nil).RotateRefreshToken), ctx, requestID, refreshTokenSignature) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RotateRefreshToken", reflect.TypeOf((*MockTokenRevocationStorage)(nil).RotateRefreshToken), arg0, arg1, arg2, arg3) } diff --git a/internal/oauth2_storage.go b/internal/oauth2_storage.go index bc6cf1bcb..73dc8d0e3 100644 --- a/internal/oauth2_storage.go +++ b/internal/oauth2_storage.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/handler/oauth2 (interfaces: CoreStorage) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/oauth2_storage.go github.com/ory/fosite/handler/oauth2 CoreStorage -// // Package internal is a generated GoMock package. package internal @@ -15,16 +10,16 @@ package internal import ( context "context" reflect "reflect" + time "time" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockCoreStorage is a mock of CoreStorage interface. type MockCoreStorage struct { ctrl *gomock.Controller recorder *MockCoreStorageMockRecorder - isgomock struct{} } // MockCoreStorageMockRecorder is the mock recorder for MockCoreStorage. @@ -45,144 +40,144 @@ func (m *MockCoreStorage) EXPECT() *MockCoreStorageMockRecorder { } // CreateAccessTokenSession mocks base method. -func (m *MockCoreStorage) CreateAccessTokenSession(ctx context.Context, signature string, request fosite.Requester) error { +func (m *MockCoreStorage) CreateAccessTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Requester) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateAccessTokenSession", ctx, signature, request) + ret := m.ctrl.Call(m, "CreateAccessTokenSession", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // CreateAccessTokenSession indicates an expected call of CreateAccessTokenSession. -func (mr *MockCoreStorageMockRecorder) CreateAccessTokenSession(ctx, signature, request any) *gomock.Call { +func (mr *MockCoreStorageMockRecorder) CreateAccessTokenSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAccessTokenSession", reflect.TypeOf((*MockCoreStorage)(nil).CreateAccessTokenSession), ctx, signature, request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAccessTokenSession", reflect.TypeOf((*MockCoreStorage)(nil).CreateAccessTokenSession), arg0, arg1, arg2) } // CreateAuthorizeCodeSession mocks base method. -func (m *MockCoreStorage) CreateAuthorizeCodeSession(ctx context.Context, code string, request fosite.Requester) error { +func (m *MockCoreStorage) CreateAuthorizeCodeSession(arg0 context.Context, arg1 string, arg2 fosite.Requester) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateAuthorizeCodeSession", ctx, code, request) + ret := m.ctrl.Call(m, "CreateAuthorizeCodeSession", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // CreateAuthorizeCodeSession indicates an expected call of CreateAuthorizeCodeSession. -func (mr *MockCoreStorageMockRecorder) CreateAuthorizeCodeSession(ctx, code, request any) *gomock.Call { +func (mr *MockCoreStorageMockRecorder) CreateAuthorizeCodeSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAuthorizeCodeSession", reflect.TypeOf((*MockCoreStorage)(nil).CreateAuthorizeCodeSession), ctx, code, request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAuthorizeCodeSession", reflect.TypeOf((*MockCoreStorage)(nil).CreateAuthorizeCodeSession), arg0, arg1, arg2) } // CreateRefreshTokenSession mocks base method. -func (m *MockCoreStorage) CreateRefreshTokenSession(ctx context.Context, signature, accessSignature string, request fosite.Requester) error { +func (m *MockCoreStorage) CreateRefreshTokenSession(arg0 context.Context, arg1, arg2 string, arg3 fosite.Requester) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateRefreshTokenSession", ctx, signature, accessSignature, request) + ret := m.ctrl.Call(m, "CreateRefreshTokenSession", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(error) return ret0 } // CreateRefreshTokenSession indicates an expected call of CreateRefreshTokenSession. -func (mr *MockCoreStorageMockRecorder) CreateRefreshTokenSession(ctx, signature, accessSignature, request any) *gomock.Call { +func (mr *MockCoreStorageMockRecorder) CreateRefreshTokenSession(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRefreshTokenSession", reflect.TypeOf((*MockCoreStorage)(nil).CreateRefreshTokenSession), ctx, signature, accessSignature, request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRefreshTokenSession", reflect.TypeOf((*MockCoreStorage)(nil).CreateRefreshTokenSession), arg0, arg1, arg2, arg3) } // DeleteAccessTokenSession mocks base method. -func (m *MockCoreStorage) DeleteAccessTokenSession(ctx context.Context, signature string) error { +func (m *MockCoreStorage) DeleteAccessTokenSession(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeleteAccessTokenSession", ctx, signature) + ret := m.ctrl.Call(m, "DeleteAccessTokenSession", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // DeleteAccessTokenSession indicates an expected call of DeleteAccessTokenSession. -func (mr *MockCoreStorageMockRecorder) DeleteAccessTokenSession(ctx, signature any) *gomock.Call { +func (mr *MockCoreStorageMockRecorder) DeleteAccessTokenSession(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAccessTokenSession", reflect.TypeOf((*MockCoreStorage)(nil).DeleteAccessTokenSession), ctx, signature) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAccessTokenSession", reflect.TypeOf((*MockCoreStorage)(nil).DeleteAccessTokenSession), arg0, arg1) } // DeleteRefreshTokenSession mocks base method. -func (m *MockCoreStorage) DeleteRefreshTokenSession(ctx context.Context, signature string) error { +func (m *MockCoreStorage) DeleteRefreshTokenSession(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeleteRefreshTokenSession", ctx, signature) + ret := m.ctrl.Call(m, "DeleteRefreshTokenSession", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // DeleteRefreshTokenSession indicates an expected call of DeleteRefreshTokenSession. -func (mr *MockCoreStorageMockRecorder) DeleteRefreshTokenSession(ctx, signature any) *gomock.Call { +func (mr *MockCoreStorageMockRecorder) DeleteRefreshTokenSession(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteRefreshTokenSession", reflect.TypeOf((*MockCoreStorage)(nil).DeleteRefreshTokenSession), ctx, signature) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteRefreshTokenSession", reflect.TypeOf((*MockCoreStorage)(nil).DeleteRefreshTokenSession), arg0, arg1) } // GetAccessTokenSession mocks base method. -func (m *MockCoreStorage) GetAccessTokenSession(ctx context.Context, signature string, session fosite.Session) (fosite.Requester, error) { +func (m *MockCoreStorage) GetAccessTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.Requester, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetAccessTokenSession", ctx, signature, session) + ret := m.ctrl.Call(m, "GetAccessTokenSession", arg0, arg1, arg2) ret0, _ := ret[0].(fosite.Requester) ret1, _ := ret[1].(error) return ret0, ret1 } // GetAccessTokenSession indicates an expected call of GetAccessTokenSession. -func (mr *MockCoreStorageMockRecorder) GetAccessTokenSession(ctx, signature, session any) *gomock.Call { +func (mr *MockCoreStorageMockRecorder) GetAccessTokenSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccessTokenSession", reflect.TypeOf((*MockCoreStorage)(nil).GetAccessTokenSession), ctx, signature, session) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccessTokenSession", reflect.TypeOf((*MockCoreStorage)(nil).GetAccessTokenSession), arg0, arg1, arg2) } // GetAuthorizeCodeSession mocks base method. -func (m *MockCoreStorage) GetAuthorizeCodeSession(ctx context.Context, code string, session fosite.Session) (fosite.Requester, error) { +func (m *MockCoreStorage) GetAuthorizeCodeSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.Requester, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetAuthorizeCodeSession", ctx, code, session) + ret := m.ctrl.Call(m, "GetAuthorizeCodeSession", arg0, arg1, arg2) ret0, _ := ret[0].(fosite.Requester) ret1, _ := ret[1].(error) return ret0, ret1 } // GetAuthorizeCodeSession indicates an expected call of GetAuthorizeCodeSession. -func (mr *MockCoreStorageMockRecorder) GetAuthorizeCodeSession(ctx, code, session any) *gomock.Call { +func (mr *MockCoreStorageMockRecorder) GetAuthorizeCodeSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAuthorizeCodeSession", reflect.TypeOf((*MockCoreStorage)(nil).GetAuthorizeCodeSession), ctx, code, session) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAuthorizeCodeSession", reflect.TypeOf((*MockCoreStorage)(nil).GetAuthorizeCodeSession), arg0, arg1, arg2) } // GetRefreshTokenSession mocks base method. -func (m *MockCoreStorage) GetRefreshTokenSession(ctx context.Context, signature string, session fosite.Session) (fosite.Requester, error) { +func (m *MockCoreStorage) GetRefreshTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.Requester, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetRefreshTokenSession", ctx, signature, session) + ret := m.ctrl.Call(m, "GetRefreshTokenSession", arg0, arg1, arg2) ret0, _ := ret[0].(fosite.Requester) ret1, _ := ret[1].(error) return ret0, ret1 } // GetRefreshTokenSession indicates an expected call of GetRefreshTokenSession. -func (mr *MockCoreStorageMockRecorder) GetRefreshTokenSession(ctx, signature, session any) *gomock.Call { +func (mr *MockCoreStorageMockRecorder) GetRefreshTokenSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRefreshTokenSession", reflect.TypeOf((*MockCoreStorage)(nil).GetRefreshTokenSession), ctx, signature, session) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRefreshTokenSession", reflect.TypeOf((*MockCoreStorage)(nil).GetRefreshTokenSession), arg0, arg1, arg2) } // InvalidateAuthorizeCodeSession mocks base method. -func (m *MockCoreStorage) InvalidateAuthorizeCodeSession(ctx context.Context, code string) error { +func (m *MockCoreStorage) InvalidateAuthorizeCodeSession(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "InvalidateAuthorizeCodeSession", ctx, code) + ret := m.ctrl.Call(m, "InvalidateAuthorizeCodeSession", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // InvalidateAuthorizeCodeSession indicates an expected call of InvalidateAuthorizeCodeSession. -func (mr *MockCoreStorageMockRecorder) InvalidateAuthorizeCodeSession(ctx, code any) *gomock.Call { +func (mr *MockCoreStorageMockRecorder) InvalidateAuthorizeCodeSession(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InvalidateAuthorizeCodeSession", reflect.TypeOf((*MockCoreStorage)(nil).InvalidateAuthorizeCodeSession), ctx, code) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InvalidateAuthorizeCodeSession", reflect.TypeOf((*MockCoreStorage)(nil).InvalidateAuthorizeCodeSession), arg0, arg1) } // RotateRefreshToken mocks base method. -func (m *MockCoreStorage) RotateRefreshToken(ctx context.Context, requestID, refreshTokenSignature string) error { +func (m *MockCoreStorage) RotateRefreshToken(arg0 context.Context, arg1, arg2 string, arg3 time.Time) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RotateRefreshToken", ctx, requestID, refreshTokenSignature) + ret := m.ctrl.Call(m, "RotateRefreshToken", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(error) return ret0 } // RotateRefreshToken indicates an expected call of RotateRefreshToken. -func (mr *MockCoreStorageMockRecorder) RotateRefreshToken(ctx, requestID, refreshTokenSignature any) *gomock.Call { +func (mr *MockCoreStorageMockRecorder) RotateRefreshToken(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RotateRefreshToken", reflect.TypeOf((*MockCoreStorage)(nil).RotateRefreshToken), ctx, requestID, refreshTokenSignature) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RotateRefreshToken", reflect.TypeOf((*MockCoreStorage)(nil).RotateRefreshToken), arg0, arg1, arg2, arg3) } diff --git a/internal/oauth2_strategy.go b/internal/oauth2_strategy.go index 2c15a3bb1..5cf497bca 100644 --- a/internal/oauth2_strategy.go +++ b/internal/oauth2_strategy.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/handler/oauth2 (interfaces: CoreStrategy) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/oauth2_strategy.go github.com/ory/fosite/handler/oauth2 CoreStrategy -// // Package internal is a generated GoMock package. package internal @@ -16,15 +11,14 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockCoreStrategy is a mock of CoreStrategy interface. type MockCoreStrategy struct { ctrl *gomock.Controller recorder *MockCoreStrategyMockRecorder - isgomock struct{} } // MockCoreStrategyMockRecorder is the mock recorder for MockCoreStrategy. @@ -45,37 +39,37 @@ func (m *MockCoreStrategy) EXPECT() *MockCoreStrategyMockRecorder { } // AccessTokenSignature mocks base method. -func (m *MockCoreStrategy) AccessTokenSignature(ctx context.Context, token string) string { +func (m *MockCoreStrategy) AccessTokenSignature(arg0 context.Context, arg1 string) string { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "AccessTokenSignature", ctx, token) + ret := m.ctrl.Call(m, "AccessTokenSignature", arg0, arg1) ret0, _ := ret[0].(string) return ret0 } // AccessTokenSignature indicates an expected call of AccessTokenSignature. -func (mr *MockCoreStrategyMockRecorder) AccessTokenSignature(ctx, token any) *gomock.Call { +func (mr *MockCoreStrategyMockRecorder) AccessTokenSignature(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AccessTokenSignature", reflect.TypeOf((*MockCoreStrategy)(nil).AccessTokenSignature), ctx, token) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AccessTokenSignature", reflect.TypeOf((*MockCoreStrategy)(nil).AccessTokenSignature), arg0, arg1) } // AuthorizeCodeSignature mocks base method. -func (m *MockCoreStrategy) AuthorizeCodeSignature(ctx context.Context, token string) string { +func (m *MockCoreStrategy) AuthorizeCodeSignature(arg0 context.Context, arg1 string) string { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "AuthorizeCodeSignature", ctx, token) + ret := m.ctrl.Call(m, "AuthorizeCodeSignature", arg0, arg1) ret0, _ := ret[0].(string) return ret0 } // AuthorizeCodeSignature indicates an expected call of AuthorizeCodeSignature. -func (mr *MockCoreStrategyMockRecorder) AuthorizeCodeSignature(ctx, token any) *gomock.Call { +func (mr *MockCoreStrategyMockRecorder) AuthorizeCodeSignature(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AuthorizeCodeSignature", reflect.TypeOf((*MockCoreStrategy)(nil).AuthorizeCodeSignature), ctx, token) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AuthorizeCodeSignature", reflect.TypeOf((*MockCoreStrategy)(nil).AuthorizeCodeSignature), arg0, arg1) } // GenerateAccessToken mocks base method. -func (m *MockCoreStrategy) GenerateAccessToken(ctx context.Context, requester fosite.Requester) (string, string, error) { +func (m *MockCoreStrategy) GenerateAccessToken(arg0 context.Context, arg1 fosite.Requester) (string, string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GenerateAccessToken", ctx, requester) + ret := m.ctrl.Call(m, "GenerateAccessToken", arg0, arg1) ret0, _ := ret[0].(string) ret1, _ := ret[1].(string) ret2, _ := ret[2].(error) @@ -83,15 +77,15 @@ func (m *MockCoreStrategy) GenerateAccessToken(ctx context.Context, requester fo } // GenerateAccessToken indicates an expected call of GenerateAccessToken. -func (mr *MockCoreStrategyMockRecorder) GenerateAccessToken(ctx, requester any) *gomock.Call { +func (mr *MockCoreStrategyMockRecorder) GenerateAccessToken(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateAccessToken", reflect.TypeOf((*MockCoreStrategy)(nil).GenerateAccessToken), ctx, requester) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateAccessToken", reflect.TypeOf((*MockCoreStrategy)(nil).GenerateAccessToken), arg0, arg1) } // GenerateAuthorizeCode mocks base method. -func (m *MockCoreStrategy) GenerateAuthorizeCode(ctx context.Context, requester fosite.Requester) (string, string, error) { +func (m *MockCoreStrategy) GenerateAuthorizeCode(arg0 context.Context, arg1 fosite.Requester) (string, string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GenerateAuthorizeCode", ctx, requester) + ret := m.ctrl.Call(m, "GenerateAuthorizeCode", arg0, arg1) ret0, _ := ret[0].(string) ret1, _ := ret[1].(string) ret2, _ := ret[2].(error) @@ -99,15 +93,15 @@ func (m *MockCoreStrategy) GenerateAuthorizeCode(ctx context.Context, requester } // GenerateAuthorizeCode indicates an expected call of GenerateAuthorizeCode. -func (mr *MockCoreStrategyMockRecorder) GenerateAuthorizeCode(ctx, requester any) *gomock.Call { +func (mr *MockCoreStrategyMockRecorder) GenerateAuthorizeCode(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateAuthorizeCode", reflect.TypeOf((*MockCoreStrategy)(nil).GenerateAuthorizeCode), ctx, requester) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateAuthorizeCode", reflect.TypeOf((*MockCoreStrategy)(nil).GenerateAuthorizeCode), arg0, arg1) } // GenerateRefreshToken mocks base method. -func (m *MockCoreStrategy) GenerateRefreshToken(ctx context.Context, requester fosite.Requester) (string, string, error) { +func (m *MockCoreStrategy) GenerateRefreshToken(arg0 context.Context, arg1 fosite.Requester) (string, string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GenerateRefreshToken", ctx, requester) + ret := m.ctrl.Call(m, "GenerateRefreshToken", arg0, arg1) ret0, _ := ret[0].(string) ret1, _ := ret[1].(string) ret2, _ := ret[2].(error) @@ -115,63 +109,63 @@ func (m *MockCoreStrategy) GenerateRefreshToken(ctx context.Context, requester f } // GenerateRefreshToken indicates an expected call of GenerateRefreshToken. -func (mr *MockCoreStrategyMockRecorder) GenerateRefreshToken(ctx, requester any) *gomock.Call { +func (mr *MockCoreStrategyMockRecorder) GenerateRefreshToken(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateRefreshToken", reflect.TypeOf((*MockCoreStrategy)(nil).GenerateRefreshToken), ctx, requester) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateRefreshToken", reflect.TypeOf((*MockCoreStrategy)(nil).GenerateRefreshToken), arg0, arg1) } // RefreshTokenSignature mocks base method. -func (m *MockCoreStrategy) RefreshTokenSignature(ctx context.Context, token string) string { +func (m *MockCoreStrategy) RefreshTokenSignature(arg0 context.Context, arg1 string) string { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RefreshTokenSignature", ctx, token) + ret := m.ctrl.Call(m, "RefreshTokenSignature", arg0, arg1) ret0, _ := ret[0].(string) return ret0 } // RefreshTokenSignature indicates an expected call of RefreshTokenSignature. -func (mr *MockCoreStrategyMockRecorder) RefreshTokenSignature(ctx, token any) *gomock.Call { +func (mr *MockCoreStrategyMockRecorder) RefreshTokenSignature(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RefreshTokenSignature", reflect.TypeOf((*MockCoreStrategy)(nil).RefreshTokenSignature), ctx, token) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RefreshTokenSignature", reflect.TypeOf((*MockCoreStrategy)(nil).RefreshTokenSignature), arg0, arg1) } // ValidateAccessToken mocks base method. -func (m *MockCoreStrategy) ValidateAccessToken(ctx context.Context, requester fosite.Requester, token string) error { +func (m *MockCoreStrategy) ValidateAccessToken(arg0 context.Context, arg1 fosite.Requester, arg2 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ValidateAccessToken", ctx, requester, token) + ret := m.ctrl.Call(m, "ValidateAccessToken", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // ValidateAccessToken indicates an expected call of ValidateAccessToken. -func (mr *MockCoreStrategyMockRecorder) ValidateAccessToken(ctx, requester, token any) *gomock.Call { +func (mr *MockCoreStrategyMockRecorder) ValidateAccessToken(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateAccessToken", reflect.TypeOf((*MockCoreStrategy)(nil).ValidateAccessToken), ctx, requester, token) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateAccessToken", reflect.TypeOf((*MockCoreStrategy)(nil).ValidateAccessToken), arg0, arg1, arg2) } // ValidateAuthorizeCode mocks base method. -func (m *MockCoreStrategy) ValidateAuthorizeCode(ctx context.Context, requester fosite.Requester, token string) error { +func (m *MockCoreStrategy) ValidateAuthorizeCode(arg0 context.Context, arg1 fosite.Requester, arg2 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ValidateAuthorizeCode", ctx, requester, token) + ret := m.ctrl.Call(m, "ValidateAuthorizeCode", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // ValidateAuthorizeCode indicates an expected call of ValidateAuthorizeCode. -func (mr *MockCoreStrategyMockRecorder) ValidateAuthorizeCode(ctx, requester, token any) *gomock.Call { +func (mr *MockCoreStrategyMockRecorder) ValidateAuthorizeCode(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateAuthorizeCode", reflect.TypeOf((*MockCoreStrategy)(nil).ValidateAuthorizeCode), ctx, requester, token) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateAuthorizeCode", reflect.TypeOf((*MockCoreStrategy)(nil).ValidateAuthorizeCode), arg0, arg1, arg2) } // ValidateRefreshToken mocks base method. -func (m *MockCoreStrategy) ValidateRefreshToken(ctx context.Context, requester fosite.Requester, token string) error { +func (m *MockCoreStrategy) ValidateRefreshToken(arg0 context.Context, arg1 fosite.Requester, arg2 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ValidateRefreshToken", ctx, requester, token) + ret := m.ctrl.Call(m, "ValidateRefreshToken", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // ValidateRefreshToken indicates an expected call of ValidateRefreshToken. -func (mr *MockCoreStrategyMockRecorder) ValidateRefreshToken(ctx, requester, token any) *gomock.Call { +func (mr *MockCoreStrategyMockRecorder) ValidateRefreshToken(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateRefreshToken", reflect.TypeOf((*MockCoreStrategy)(nil).ValidateRefreshToken), ctx, requester, token) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateRefreshToken", reflect.TypeOf((*MockCoreStrategy)(nil).ValidateRefreshToken), arg0, arg1, arg2) } diff --git a/internal/openid_id_token_storage.go b/internal/openid_id_token_storage.go index d6e4cf640..5a59c005d 100644 --- a/internal/openid_id_token_storage.go +++ b/internal/openid_id_token_storage.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/handler/openid (interfaces: OpenIDConnectRequestStorage) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/openid_id_token_storage.go github.com/ory/fosite/handler/openid OpenIDConnectRequestStorage -// // Package internal is a generated GoMock package. package internal @@ -16,15 +11,14 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockOpenIDConnectRequestStorage is a mock of OpenIDConnectRequestStorage interface. type MockOpenIDConnectRequestStorage struct { ctrl *gomock.Controller recorder *MockOpenIDConnectRequestStorageMockRecorder - isgomock struct{} } // MockOpenIDConnectRequestStorageMockRecorder is the mock recorder for MockOpenIDConnectRequestStorage. @@ -45,44 +39,44 @@ func (m *MockOpenIDConnectRequestStorage) EXPECT() *MockOpenIDConnectRequestStor } // CreateOpenIDConnectSession mocks base method. -func (m *MockOpenIDConnectRequestStorage) CreateOpenIDConnectSession(ctx context.Context, authorizeCode string, requester fosite.Requester) error { +func (m *MockOpenIDConnectRequestStorage) CreateOpenIDConnectSession(arg0 context.Context, arg1 string, arg2 fosite.Requester) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateOpenIDConnectSession", ctx, authorizeCode, requester) + ret := m.ctrl.Call(m, "CreateOpenIDConnectSession", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // CreateOpenIDConnectSession indicates an expected call of CreateOpenIDConnectSession. -func (mr *MockOpenIDConnectRequestStorageMockRecorder) CreateOpenIDConnectSession(ctx, authorizeCode, requester any) *gomock.Call { +func (mr *MockOpenIDConnectRequestStorageMockRecorder) CreateOpenIDConnectSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateOpenIDConnectSession", reflect.TypeOf((*MockOpenIDConnectRequestStorage)(nil).CreateOpenIDConnectSession), ctx, authorizeCode, requester) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateOpenIDConnectSession", reflect.TypeOf((*MockOpenIDConnectRequestStorage)(nil).CreateOpenIDConnectSession), arg0, arg1, arg2) } // DeleteOpenIDConnectSession mocks base method. -func (m *MockOpenIDConnectRequestStorage) DeleteOpenIDConnectSession(ctx context.Context, authorizeCode string) error { +func (m *MockOpenIDConnectRequestStorage) DeleteOpenIDConnectSession(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeleteOpenIDConnectSession", ctx, authorizeCode) + ret := m.ctrl.Call(m, "DeleteOpenIDConnectSession", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // DeleteOpenIDConnectSession indicates an expected call of DeleteOpenIDConnectSession. -func (mr *MockOpenIDConnectRequestStorageMockRecorder) DeleteOpenIDConnectSession(ctx, authorizeCode any) *gomock.Call { +func (mr *MockOpenIDConnectRequestStorageMockRecorder) DeleteOpenIDConnectSession(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteOpenIDConnectSession", reflect.TypeOf((*MockOpenIDConnectRequestStorage)(nil).DeleteOpenIDConnectSession), ctx, authorizeCode) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteOpenIDConnectSession", reflect.TypeOf((*MockOpenIDConnectRequestStorage)(nil).DeleteOpenIDConnectSession), arg0, arg1) } // GetOpenIDConnectSession mocks base method. -func (m *MockOpenIDConnectRequestStorage) GetOpenIDConnectSession(ctx context.Context, authorizeCode string, requester fosite.Requester) (fosite.Requester, error) { +func (m *MockOpenIDConnectRequestStorage) GetOpenIDConnectSession(arg0 context.Context, arg1 string, arg2 fosite.Requester) (fosite.Requester, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetOpenIDConnectSession", ctx, authorizeCode, requester) + ret := m.ctrl.Call(m, "GetOpenIDConnectSession", arg0, arg1, arg2) ret0, _ := ret[0].(fosite.Requester) ret1, _ := ret[1].(error) return ret0, ret1 } // GetOpenIDConnectSession indicates an expected call of GetOpenIDConnectSession. -func (mr *MockOpenIDConnectRequestStorageMockRecorder) GetOpenIDConnectSession(ctx, authorizeCode, requester any) *gomock.Call { +func (mr *MockOpenIDConnectRequestStorageMockRecorder) GetOpenIDConnectSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetOpenIDConnectSession", reflect.TypeOf((*MockOpenIDConnectRequestStorage)(nil).GetOpenIDConnectSession), ctx, authorizeCode, requester) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetOpenIDConnectSession", reflect.TypeOf((*MockOpenIDConnectRequestStorage)(nil).GetOpenIDConnectSession), arg0, arg1, arg2) } diff --git a/internal/pkce_storage_strategy.go b/internal/pkce_storage_strategy.go index 70672e050..533049bad 100644 --- a/internal/pkce_storage_strategy.go +++ b/internal/pkce_storage_strategy.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/handler/pkce (interfaces: PKCERequestStorage) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/pkce_storage_strategy.go github.com/ory/fosite/handler/pkce PKCERequestStorage -// // Package internal is a generated GoMock package. package internal @@ -16,15 +11,14 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockPKCERequestStorage is a mock of PKCERequestStorage interface. type MockPKCERequestStorage struct { ctrl *gomock.Controller recorder *MockPKCERequestStorageMockRecorder - isgomock struct{} } // MockPKCERequestStorageMockRecorder is the mock recorder for MockPKCERequestStorage. @@ -45,44 +39,44 @@ func (m *MockPKCERequestStorage) EXPECT() *MockPKCERequestStorageMockRecorder { } // CreatePKCERequestSession mocks base method. -func (m *MockPKCERequestStorage) CreatePKCERequestSession(ctx context.Context, signature string, requester fosite.Requester) error { +func (m *MockPKCERequestStorage) CreatePKCERequestSession(arg0 context.Context, arg1 string, arg2 fosite.Requester) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreatePKCERequestSession", ctx, signature, requester) + ret := m.ctrl.Call(m, "CreatePKCERequestSession", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // CreatePKCERequestSession indicates an expected call of CreatePKCERequestSession. -func (mr *MockPKCERequestStorageMockRecorder) CreatePKCERequestSession(ctx, signature, requester any) *gomock.Call { +func (mr *MockPKCERequestStorageMockRecorder) CreatePKCERequestSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreatePKCERequestSession", reflect.TypeOf((*MockPKCERequestStorage)(nil).CreatePKCERequestSession), ctx, signature, requester) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreatePKCERequestSession", reflect.TypeOf((*MockPKCERequestStorage)(nil).CreatePKCERequestSession), arg0, arg1, arg2) } // DeletePKCERequestSession mocks base method. -func (m *MockPKCERequestStorage) DeletePKCERequestSession(ctx context.Context, signature string) error { +func (m *MockPKCERequestStorage) DeletePKCERequestSession(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeletePKCERequestSession", ctx, signature) + ret := m.ctrl.Call(m, "DeletePKCERequestSession", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // DeletePKCERequestSession indicates an expected call of DeletePKCERequestSession. -func (mr *MockPKCERequestStorageMockRecorder) DeletePKCERequestSession(ctx, signature any) *gomock.Call { +func (mr *MockPKCERequestStorageMockRecorder) DeletePKCERequestSession(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeletePKCERequestSession", reflect.TypeOf((*MockPKCERequestStorage)(nil).DeletePKCERequestSession), ctx, signature) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeletePKCERequestSession", reflect.TypeOf((*MockPKCERequestStorage)(nil).DeletePKCERequestSession), arg0, arg1) } // GetPKCERequestSession mocks base method. -func (m *MockPKCERequestStorage) GetPKCERequestSession(ctx context.Context, signature string, session fosite.Session) (fosite.Requester, error) { +func (m *MockPKCERequestStorage) GetPKCERequestSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.Requester, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetPKCERequestSession", ctx, signature, session) + ret := m.ctrl.Call(m, "GetPKCERequestSession", arg0, arg1, arg2) ret0, _ := ret[0].(fosite.Requester) ret1, _ := ret[1].(error) return ret0, ret1 } // GetPKCERequestSession indicates an expected call of GetPKCERequestSession. -func (mr *MockPKCERequestStorageMockRecorder) GetPKCERequestSession(ctx, signature, session any) *gomock.Call { +func (mr *MockPKCERequestStorageMockRecorder) GetPKCERequestSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPKCERequestSession", reflect.TypeOf((*MockPKCERequestStorage)(nil).GetPKCERequestSession), ctx, signature, session) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetPKCERequestSession", reflect.TypeOf((*MockPKCERequestStorage)(nil).GetPKCERequestSession), arg0, arg1, arg2) } diff --git a/internal/pushed_authorize_handler.go b/internal/pushed_authorize_handler.go index 7044cc8d3..a1340c0df 100644 --- a/internal/pushed_authorize_handler.go +++ b/internal/pushed_authorize_handler.go @@ -7,7 +7,7 @@ import ( "context" "reflect" - gomock "go.uber.org/mock/gomock" + gomock "github.com/golang/mock/gomock" "github.com/ory/fosite" ) diff --git a/internal/refresh_token_strategy.go b/internal/refresh_token_strategy.go index 691031f67..31547bddf 100644 --- a/internal/refresh_token_strategy.go +++ b/internal/refresh_token_strategy.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/handler/oauth2 (interfaces: RefreshTokenStrategy) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/refresh_token_strategy.go github.com/ory/fosite/handler/oauth2 RefreshTokenStrategy -// // Package internal is a generated GoMock package. package internal @@ -16,15 +11,14 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockRefreshTokenStrategy is a mock of RefreshTokenStrategy interface. type MockRefreshTokenStrategy struct { ctrl *gomock.Controller recorder *MockRefreshTokenStrategyMockRecorder - isgomock struct{} } // MockRefreshTokenStrategyMockRecorder is the mock recorder for MockRefreshTokenStrategy. @@ -45,9 +39,9 @@ func (m *MockRefreshTokenStrategy) EXPECT() *MockRefreshTokenStrategyMockRecorde } // GenerateRefreshToken mocks base method. -func (m *MockRefreshTokenStrategy) GenerateRefreshToken(ctx context.Context, requester fosite.Requester) (string, string, error) { +func (m *MockRefreshTokenStrategy) GenerateRefreshToken(arg0 context.Context, arg1 fosite.Requester) (string, string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GenerateRefreshToken", ctx, requester) + ret := m.ctrl.Call(m, "GenerateRefreshToken", arg0, arg1) ret0, _ := ret[0].(string) ret1, _ := ret[1].(string) ret2, _ := ret[2].(error) @@ -55,35 +49,35 @@ func (m *MockRefreshTokenStrategy) GenerateRefreshToken(ctx context.Context, req } // GenerateRefreshToken indicates an expected call of GenerateRefreshToken. -func (mr *MockRefreshTokenStrategyMockRecorder) GenerateRefreshToken(ctx, requester any) *gomock.Call { +func (mr *MockRefreshTokenStrategyMockRecorder) GenerateRefreshToken(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateRefreshToken", reflect.TypeOf((*MockRefreshTokenStrategy)(nil).GenerateRefreshToken), ctx, requester) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateRefreshToken", reflect.TypeOf((*MockRefreshTokenStrategy)(nil).GenerateRefreshToken), arg0, arg1) } // RefreshTokenSignature mocks base method. -func (m *MockRefreshTokenStrategy) RefreshTokenSignature(ctx context.Context, token string) string { +func (m *MockRefreshTokenStrategy) RefreshTokenSignature(arg0 context.Context, arg1 string) string { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RefreshTokenSignature", ctx, token) + ret := m.ctrl.Call(m, "RefreshTokenSignature", arg0, arg1) ret0, _ := ret[0].(string) return ret0 } // RefreshTokenSignature indicates an expected call of RefreshTokenSignature. -func (mr *MockRefreshTokenStrategyMockRecorder) RefreshTokenSignature(ctx, token any) *gomock.Call { +func (mr *MockRefreshTokenStrategyMockRecorder) RefreshTokenSignature(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RefreshTokenSignature", reflect.TypeOf((*MockRefreshTokenStrategy)(nil).RefreshTokenSignature), ctx, token) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RefreshTokenSignature", reflect.TypeOf((*MockRefreshTokenStrategy)(nil).RefreshTokenSignature), arg0, arg1) } // ValidateRefreshToken mocks base method. -func (m *MockRefreshTokenStrategy) ValidateRefreshToken(ctx context.Context, requester fosite.Requester, token string) error { +func (m *MockRefreshTokenStrategy) ValidateRefreshToken(arg0 context.Context, arg1 fosite.Requester, arg2 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ValidateRefreshToken", ctx, requester, token) + ret := m.ctrl.Call(m, "ValidateRefreshToken", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // ValidateRefreshToken indicates an expected call of ValidateRefreshToken. -func (mr *MockRefreshTokenStrategyMockRecorder) ValidateRefreshToken(ctx, requester, token any) *gomock.Call { +func (mr *MockRefreshTokenStrategyMockRecorder) ValidateRefreshToken(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateRefreshToken", reflect.TypeOf((*MockRefreshTokenStrategy)(nil).ValidateRefreshToken), ctx, requester, token) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateRefreshToken", reflect.TypeOf((*MockRefreshTokenStrategy)(nil).ValidateRefreshToken), arg0, arg1, arg2) } diff --git a/internal/request.go b/internal/request.go index 6c22481dd..0ba6f4506 100644 --- a/internal/request.go +++ b/internal/request.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite (interfaces: Requester) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/request.go github.com/ory/fosite Requester -// // Package internal is a generated GoMock package. package internal @@ -17,15 +12,14 @@ import ( reflect "reflect" time "time" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockRequester is a mock of Requester interface. type MockRequester struct { ctrl *gomock.Controller recorder *MockRequesterMockRecorder - isgomock struct{} } // MockRequesterMockRecorder is the mock recorder for MockRequester. @@ -46,15 +40,15 @@ func (m *MockRequester) EXPECT() *MockRequesterMockRecorder { } // AppendRequestedScope mocks base method. -func (m *MockRequester) AppendRequestedScope(scope string) { +func (m *MockRequester) AppendRequestedScope(arg0 string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "AppendRequestedScope", scope) + m.ctrl.Call(m, "AppendRequestedScope", arg0) } // AppendRequestedScope indicates an expected call of AppendRequestedScope. -func (mr *MockRequesterMockRecorder) AppendRequestedScope(scope any) *gomock.Call { +func (mr *MockRequesterMockRecorder) AppendRequestedScope(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AppendRequestedScope", reflect.TypeOf((*MockRequester)(nil).AppendRequestedScope), scope) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "AppendRequestedScope", reflect.TypeOf((*MockRequester)(nil).AppendRequestedScope), arg0) } // GetClient mocks base method. @@ -184,99 +178,99 @@ func (mr *MockRequesterMockRecorder) GetSession() *gomock.Call { } // GrantAudience mocks base method. -func (m *MockRequester) GrantAudience(audience string) { +func (m *MockRequester) GrantAudience(arg0 string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "GrantAudience", audience) + m.ctrl.Call(m, "GrantAudience", arg0) } // GrantAudience indicates an expected call of GrantAudience. -func (mr *MockRequesterMockRecorder) GrantAudience(audience any) *gomock.Call { +func (mr *MockRequesterMockRecorder) GrantAudience(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GrantAudience", reflect.TypeOf((*MockRequester)(nil).GrantAudience), audience) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GrantAudience", reflect.TypeOf((*MockRequester)(nil).GrantAudience), arg0) } // GrantScope mocks base method. -func (m *MockRequester) GrantScope(scope string) { +func (m *MockRequester) GrantScope(arg0 string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "GrantScope", scope) + m.ctrl.Call(m, "GrantScope", arg0) } // GrantScope indicates an expected call of GrantScope. -func (mr *MockRequesterMockRecorder) GrantScope(scope any) *gomock.Call { +func (mr *MockRequesterMockRecorder) GrantScope(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GrantScope", reflect.TypeOf((*MockRequester)(nil).GrantScope), scope) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GrantScope", reflect.TypeOf((*MockRequester)(nil).GrantScope), arg0) } // Merge mocks base method. -func (m *MockRequester) Merge(requester fosite.Requester) { +func (m *MockRequester) Merge(arg0 fosite.Requester) { m.ctrl.T.Helper() - m.ctrl.Call(m, "Merge", requester) + m.ctrl.Call(m, "Merge", arg0) } // Merge indicates an expected call of Merge. -func (mr *MockRequesterMockRecorder) Merge(requester any) *gomock.Call { +func (mr *MockRequesterMockRecorder) Merge(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Merge", reflect.TypeOf((*MockRequester)(nil).Merge), requester) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Merge", reflect.TypeOf((*MockRequester)(nil).Merge), arg0) } // Sanitize mocks base method. -func (m *MockRequester) Sanitize(allowedParameters []string) fosite.Requester { +func (m *MockRequester) Sanitize(arg0 []string) fosite.Requester { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Sanitize", allowedParameters) + ret := m.ctrl.Call(m, "Sanitize", arg0) ret0, _ := ret[0].(fosite.Requester) return ret0 } // Sanitize indicates an expected call of Sanitize. -func (mr *MockRequesterMockRecorder) Sanitize(allowedParameters any) *gomock.Call { +func (mr *MockRequesterMockRecorder) Sanitize(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sanitize", reflect.TypeOf((*MockRequester)(nil).Sanitize), allowedParameters) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Sanitize", reflect.TypeOf((*MockRequester)(nil).Sanitize), arg0) } // SetID mocks base method. -func (m *MockRequester) SetID(id string) { +func (m *MockRequester) SetID(arg0 string) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetID", id) + m.ctrl.Call(m, "SetID", arg0) } // SetID indicates an expected call of SetID. -func (mr *MockRequesterMockRecorder) SetID(id any) *gomock.Call { +func (mr *MockRequesterMockRecorder) SetID(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetID", reflect.TypeOf((*MockRequester)(nil).SetID), id) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetID", reflect.TypeOf((*MockRequester)(nil).SetID), arg0) } // SetRequestedAudience mocks base method. -func (m *MockRequester) SetRequestedAudience(audience fosite.Arguments) { +func (m *MockRequester) SetRequestedAudience(arg0 fosite.Arguments) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetRequestedAudience", audience) + m.ctrl.Call(m, "SetRequestedAudience", arg0) } // SetRequestedAudience indicates an expected call of SetRequestedAudience. -func (mr *MockRequesterMockRecorder) SetRequestedAudience(audience any) *gomock.Call { +func (mr *MockRequesterMockRecorder) SetRequestedAudience(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetRequestedAudience", reflect.TypeOf((*MockRequester)(nil).SetRequestedAudience), audience) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetRequestedAudience", reflect.TypeOf((*MockRequester)(nil).SetRequestedAudience), arg0) } // SetRequestedScopes mocks base method. -func (m *MockRequester) SetRequestedScopes(scopes fosite.Arguments) { +func (m *MockRequester) SetRequestedScopes(arg0 fosite.Arguments) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetRequestedScopes", scopes) + m.ctrl.Call(m, "SetRequestedScopes", arg0) } // SetRequestedScopes indicates an expected call of SetRequestedScopes. -func (mr *MockRequesterMockRecorder) SetRequestedScopes(scopes any) *gomock.Call { +func (mr *MockRequesterMockRecorder) SetRequestedScopes(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetRequestedScopes", reflect.TypeOf((*MockRequester)(nil).SetRequestedScopes), scopes) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetRequestedScopes", reflect.TypeOf((*MockRequester)(nil).SetRequestedScopes), arg0) } // SetSession mocks base method. -func (m *MockRequester) SetSession(session fosite.Session) { +func (m *MockRequester) SetSession(arg0 fosite.Session) { m.ctrl.T.Helper() - m.ctrl.Call(m, "SetSession", session) + m.ctrl.Call(m, "SetSession", arg0) } // SetSession indicates an expected call of SetSession. -func (mr *MockRequesterMockRecorder) SetSession(session any) *gomock.Call { +func (mr *MockRequesterMockRecorder) SetSession(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetSession", reflect.TypeOf((*MockRequester)(nil).SetSession), session) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetSession", reflect.TypeOf((*MockRequester)(nil).SetSession), arg0) } diff --git a/internal/revoke_handler.go b/internal/revoke_handler.go index 8679e99d0..7a3284a13 100644 --- a/internal/revoke_handler.go +++ b/internal/revoke_handler.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite (interfaces: RevocationHandler) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/revoke_handler.go github.com/ory/fosite RevocationHandler -// // Package internal is a generated GoMock package. package internal @@ -16,15 +11,14 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockRevocationHandler is a mock of RevocationHandler interface. type MockRevocationHandler struct { ctrl *gomock.Controller recorder *MockRevocationHandlerMockRecorder - isgomock struct{} } // MockRevocationHandlerMockRecorder is the mock recorder for MockRevocationHandler. @@ -45,15 +39,15 @@ func (m *MockRevocationHandler) EXPECT() *MockRevocationHandlerMockRecorder { } // RevokeToken mocks base method. -func (m *MockRevocationHandler) RevokeToken(ctx context.Context, token string, tokenType fosite.TokenType, client fosite.Client) error { +func (m *MockRevocationHandler) RevokeToken(arg0 context.Context, arg1 string, arg2 fosite.TokenType, arg3 fosite.Client) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RevokeToken", ctx, token, tokenType, client) + ret := m.ctrl.Call(m, "RevokeToken", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(error) return ret0 } // RevokeToken indicates an expected call of RevokeToken. -func (mr *MockRevocationHandlerMockRecorder) RevokeToken(ctx, token, tokenType, client any) *gomock.Call { +func (mr *MockRevocationHandlerMockRecorder) RevokeToken(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RevokeToken", reflect.TypeOf((*MockRevocationHandler)(nil).RevokeToken), ctx, token, tokenType, client) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RevokeToken", reflect.TypeOf((*MockRevocationHandler)(nil).RevokeToken), arg0, arg1, arg2, arg3) } diff --git a/internal/rfc8628_code_strategy.go b/internal/rfc8628_code_strategy.go index 17abcc1fd..84929552d 100644 --- a/internal/rfc8628_code_strategy.go +++ b/internal/rfc8628_code_strategy.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/handler/rfc8628 (interfaces: RFC8628CodeStrategy) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/rfc8628_code_strategy.go github.com/ory/fosite/handler/rfc8628 RFC8628CodeStrategy -// // Package internal is a generated GoMock package. package internal @@ -16,15 +11,14 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockRFC8628CodeStrategy is a mock of RFC8628CodeStrategy interface. type MockRFC8628CodeStrategy struct { ctrl *gomock.Controller recorder *MockRFC8628CodeStrategyMockRecorder - isgomock struct{} } // MockRFC8628CodeStrategyMockRecorder is the mock recorder for MockRFC8628CodeStrategy. @@ -45,24 +39,24 @@ func (m *MockRFC8628CodeStrategy) EXPECT() *MockRFC8628CodeStrategyMockRecorder } // DeviceCodeSignature mocks base method. -func (m *MockRFC8628CodeStrategy) DeviceCodeSignature(ctx context.Context, code string) (string, error) { +func (m *MockRFC8628CodeStrategy) DeviceCodeSignature(arg0 context.Context, arg1 string) (string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeviceCodeSignature", ctx, code) + ret := m.ctrl.Call(m, "DeviceCodeSignature", arg0, arg1) ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) return ret0, ret1 } // DeviceCodeSignature indicates an expected call of DeviceCodeSignature. -func (mr *MockRFC8628CodeStrategyMockRecorder) DeviceCodeSignature(ctx, code any) *gomock.Call { +func (mr *MockRFC8628CodeStrategyMockRecorder) DeviceCodeSignature(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeviceCodeSignature", reflect.TypeOf((*MockRFC8628CodeStrategy)(nil).DeviceCodeSignature), ctx, code) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeviceCodeSignature", reflect.TypeOf((*MockRFC8628CodeStrategy)(nil).DeviceCodeSignature), arg0, arg1) } // GenerateDeviceCode mocks base method. -func (m *MockRFC8628CodeStrategy) GenerateDeviceCode(ctx context.Context) (string, string, error) { +func (m *MockRFC8628CodeStrategy) GenerateDeviceCode(arg0 context.Context) (string, string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GenerateDeviceCode", ctx) + ret := m.ctrl.Call(m, "GenerateDeviceCode", arg0) ret0, _ := ret[0].(string) ret1, _ := ret[1].(string) ret2, _ := ret[2].(error) @@ -70,15 +64,15 @@ func (m *MockRFC8628CodeStrategy) GenerateDeviceCode(ctx context.Context) (strin } // GenerateDeviceCode indicates an expected call of GenerateDeviceCode. -func (mr *MockRFC8628CodeStrategyMockRecorder) GenerateDeviceCode(ctx any) *gomock.Call { +func (mr *MockRFC8628CodeStrategyMockRecorder) GenerateDeviceCode(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateDeviceCode", reflect.TypeOf((*MockRFC8628CodeStrategy)(nil).GenerateDeviceCode), ctx) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateDeviceCode", reflect.TypeOf((*MockRFC8628CodeStrategy)(nil).GenerateDeviceCode), arg0) } // GenerateUserCode mocks base method. -func (m *MockRFC8628CodeStrategy) GenerateUserCode(ctx context.Context) (string, string, error) { +func (m *MockRFC8628CodeStrategy) GenerateUserCode(arg0 context.Context) (string, string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GenerateUserCode", ctx) + ret := m.ctrl.Call(m, "GenerateUserCode", arg0) ret0, _ := ret[0].(string) ret1, _ := ret[1].(string) ret2, _ := ret[2].(error) @@ -86,65 +80,65 @@ func (m *MockRFC8628CodeStrategy) GenerateUserCode(ctx context.Context) (string, } // GenerateUserCode indicates an expected call of GenerateUserCode. -func (mr *MockRFC8628CodeStrategyMockRecorder) GenerateUserCode(ctx any) *gomock.Call { +func (mr *MockRFC8628CodeStrategyMockRecorder) GenerateUserCode(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateUserCode", reflect.TypeOf((*MockRFC8628CodeStrategy)(nil).GenerateUserCode), ctx) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GenerateUserCode", reflect.TypeOf((*MockRFC8628CodeStrategy)(nil).GenerateUserCode), arg0) } // ShouldRateLimit mocks base method. -func (m *MockRFC8628CodeStrategy) ShouldRateLimit(ctx context.Context, code string) (bool, error) { +func (m *MockRFC8628CodeStrategy) ShouldRateLimit(arg0 context.Context, arg1 string) (bool, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ShouldRateLimit", ctx, code) + ret := m.ctrl.Call(m, "ShouldRateLimit", arg0, arg1) ret0, _ := ret[0].(bool) ret1, _ := ret[1].(error) return ret0, ret1 } // ShouldRateLimit indicates an expected call of ShouldRateLimit. -func (mr *MockRFC8628CodeStrategyMockRecorder) ShouldRateLimit(ctx, code any) *gomock.Call { +func (mr *MockRFC8628CodeStrategyMockRecorder) ShouldRateLimit(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ShouldRateLimit", reflect.TypeOf((*MockRFC8628CodeStrategy)(nil).ShouldRateLimit), ctx, code) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ShouldRateLimit", reflect.TypeOf((*MockRFC8628CodeStrategy)(nil).ShouldRateLimit), arg0, arg1) } // UserCodeSignature mocks base method. -func (m *MockRFC8628CodeStrategy) UserCodeSignature(ctx context.Context, code string) (string, error) { +func (m *MockRFC8628CodeStrategy) UserCodeSignature(arg0 context.Context, arg1 string) (string, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "UserCodeSignature", ctx, code) + ret := m.ctrl.Call(m, "UserCodeSignature", arg0, arg1) ret0, _ := ret[0].(string) ret1, _ := ret[1].(error) return ret0, ret1 } // UserCodeSignature indicates an expected call of UserCodeSignature. -func (mr *MockRFC8628CodeStrategyMockRecorder) UserCodeSignature(ctx, code any) *gomock.Call { +func (mr *MockRFC8628CodeStrategyMockRecorder) UserCodeSignature(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UserCodeSignature", reflect.TypeOf((*MockRFC8628CodeStrategy)(nil).UserCodeSignature), ctx, code) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "UserCodeSignature", reflect.TypeOf((*MockRFC8628CodeStrategy)(nil).UserCodeSignature), arg0, arg1) } // ValidateDeviceCode mocks base method. -func (m *MockRFC8628CodeStrategy) ValidateDeviceCode(ctx context.Context, r fosite.DeviceRequester, code string) error { +func (m *MockRFC8628CodeStrategy) ValidateDeviceCode(arg0 context.Context, arg1 fosite.DeviceRequester, arg2 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ValidateDeviceCode", ctx, r, code) + ret := m.ctrl.Call(m, "ValidateDeviceCode", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // ValidateDeviceCode indicates an expected call of ValidateDeviceCode. -func (mr *MockRFC8628CodeStrategyMockRecorder) ValidateDeviceCode(ctx, r, code any) *gomock.Call { +func (mr *MockRFC8628CodeStrategyMockRecorder) ValidateDeviceCode(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateDeviceCode", reflect.TypeOf((*MockRFC8628CodeStrategy)(nil).ValidateDeviceCode), ctx, r, code) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateDeviceCode", reflect.TypeOf((*MockRFC8628CodeStrategy)(nil).ValidateDeviceCode), arg0, arg1, arg2) } // ValidateUserCode mocks base method. -func (m *MockRFC8628CodeStrategy) ValidateUserCode(ctx context.Context, r fosite.DeviceRequester, code string) error { +func (m *MockRFC8628CodeStrategy) ValidateUserCode(arg0 context.Context, arg1 fosite.DeviceRequester, arg2 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ValidateUserCode", ctx, r, code) + ret := m.ctrl.Call(m, "ValidateUserCode", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // ValidateUserCode indicates an expected call of ValidateUserCode. -func (mr *MockRFC8628CodeStrategyMockRecorder) ValidateUserCode(ctx, r, code any) *gomock.Call { +func (mr *MockRFC8628CodeStrategyMockRecorder) ValidateUserCode(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateUserCode", reflect.TypeOf((*MockRFC8628CodeStrategy)(nil).ValidateUserCode), ctx, r, code) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ValidateUserCode", reflect.TypeOf((*MockRFC8628CodeStrategy)(nil).ValidateUserCode), arg0, arg1, arg2) } diff --git a/internal/rfc8628_core_storage.go b/internal/rfc8628_core_storage.go index 07e3884f9..b68f32d9c 100644 --- a/internal/rfc8628_core_storage.go +++ b/internal/rfc8628_core_storage.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/handler/rfc8628 (interfaces: RFC8628CoreStorage) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/rfc8628_core_storage.go github.com/ory/fosite/handler/rfc8628 RFC8628CoreStorage -// // Package internal is a generated GoMock package. package internal @@ -15,16 +10,16 @@ package internal import ( context "context" reflect "reflect" + time "time" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockRFC8628CoreStorage is a mock of RFC8628CoreStorage interface. type MockRFC8628CoreStorage struct { ctrl *gomock.Controller recorder *MockRFC8628CoreStorageMockRecorder - isgomock struct{} } // MockRFC8628CoreStorageMockRecorder is the mock recorder for MockRFC8628CoreStorage. @@ -45,144 +40,144 @@ func (m *MockRFC8628CoreStorage) EXPECT() *MockRFC8628CoreStorageMockRecorder { } // CreateAccessTokenSession mocks base method. -func (m *MockRFC8628CoreStorage) CreateAccessTokenSession(ctx context.Context, signature string, request fosite.Requester) error { +func (m *MockRFC8628CoreStorage) CreateAccessTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Requester) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateAccessTokenSession", ctx, signature, request) + ret := m.ctrl.Call(m, "CreateAccessTokenSession", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // CreateAccessTokenSession indicates an expected call of CreateAccessTokenSession. -func (mr *MockRFC8628CoreStorageMockRecorder) CreateAccessTokenSession(ctx, signature, request any) *gomock.Call { +func (mr *MockRFC8628CoreStorageMockRecorder) CreateAccessTokenSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAccessTokenSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).CreateAccessTokenSession), ctx, signature, request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateAccessTokenSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).CreateAccessTokenSession), arg0, arg1, arg2) } // CreateDeviceAuthSession mocks base method. -func (m *MockRFC8628CoreStorage) CreateDeviceAuthSession(ctx context.Context, deviceCodeSignature, userCodeSignature string, request fosite.DeviceRequester) error { +func (m *MockRFC8628CoreStorage) CreateDeviceAuthSession(arg0 context.Context, arg1, arg2 string, arg3 fosite.DeviceRequester) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateDeviceAuthSession", ctx, deviceCodeSignature, userCodeSignature, request) + ret := m.ctrl.Call(m, "CreateDeviceAuthSession", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(error) return ret0 } // CreateDeviceAuthSession indicates an expected call of CreateDeviceAuthSession. -func (mr *MockRFC8628CoreStorageMockRecorder) CreateDeviceAuthSession(ctx, deviceCodeSignature, userCodeSignature, request any) *gomock.Call { +func (mr *MockRFC8628CoreStorageMockRecorder) CreateDeviceAuthSession(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateDeviceAuthSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).CreateDeviceAuthSession), ctx, deviceCodeSignature, userCodeSignature, request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateDeviceAuthSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).CreateDeviceAuthSession), arg0, arg1, arg2, arg3) } // CreateRefreshTokenSession mocks base method. -func (m *MockRFC8628CoreStorage) CreateRefreshTokenSession(ctx context.Context, signature, accessSignature string, request fosite.Requester) error { +func (m *MockRFC8628CoreStorage) CreateRefreshTokenSession(arg0 context.Context, arg1, arg2 string, arg3 fosite.Requester) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CreateRefreshTokenSession", ctx, signature, accessSignature, request) + ret := m.ctrl.Call(m, "CreateRefreshTokenSession", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(error) return ret0 } // CreateRefreshTokenSession indicates an expected call of CreateRefreshTokenSession. -func (mr *MockRFC8628CoreStorageMockRecorder) CreateRefreshTokenSession(ctx, signature, accessSignature, request any) *gomock.Call { +func (mr *MockRFC8628CoreStorageMockRecorder) CreateRefreshTokenSession(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRefreshTokenSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).CreateRefreshTokenSession), ctx, signature, accessSignature, request) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CreateRefreshTokenSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).CreateRefreshTokenSession), arg0, arg1, arg2, arg3) } // DeleteAccessTokenSession mocks base method. -func (m *MockRFC8628CoreStorage) DeleteAccessTokenSession(ctx context.Context, signature string) error { +func (m *MockRFC8628CoreStorage) DeleteAccessTokenSession(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeleteAccessTokenSession", ctx, signature) + ret := m.ctrl.Call(m, "DeleteAccessTokenSession", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // DeleteAccessTokenSession indicates an expected call of DeleteAccessTokenSession. -func (mr *MockRFC8628CoreStorageMockRecorder) DeleteAccessTokenSession(ctx, signature any) *gomock.Call { +func (mr *MockRFC8628CoreStorageMockRecorder) DeleteAccessTokenSession(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAccessTokenSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).DeleteAccessTokenSession), ctx, signature) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteAccessTokenSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).DeleteAccessTokenSession), arg0, arg1) } // DeleteRefreshTokenSession mocks base method. -func (m *MockRFC8628CoreStorage) DeleteRefreshTokenSession(ctx context.Context, signature string) error { +func (m *MockRFC8628CoreStorage) DeleteRefreshTokenSession(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "DeleteRefreshTokenSession", ctx, signature) + ret := m.ctrl.Call(m, "DeleteRefreshTokenSession", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // DeleteRefreshTokenSession indicates an expected call of DeleteRefreshTokenSession. -func (mr *MockRFC8628CoreStorageMockRecorder) DeleteRefreshTokenSession(ctx, signature any) *gomock.Call { +func (mr *MockRFC8628CoreStorageMockRecorder) DeleteRefreshTokenSession(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteRefreshTokenSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).DeleteRefreshTokenSession), ctx, signature) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "DeleteRefreshTokenSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).DeleteRefreshTokenSession), arg0, arg1) } // GetAccessTokenSession mocks base method. -func (m *MockRFC8628CoreStorage) GetAccessTokenSession(ctx context.Context, signature string, session fosite.Session) (fosite.Requester, error) { +func (m *MockRFC8628CoreStorage) GetAccessTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.Requester, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetAccessTokenSession", ctx, signature, session) + ret := m.ctrl.Call(m, "GetAccessTokenSession", arg0, arg1, arg2) ret0, _ := ret[0].(fosite.Requester) ret1, _ := ret[1].(error) return ret0, ret1 } // GetAccessTokenSession indicates an expected call of GetAccessTokenSession. -func (mr *MockRFC8628CoreStorageMockRecorder) GetAccessTokenSession(ctx, signature, session any) *gomock.Call { +func (mr *MockRFC8628CoreStorageMockRecorder) GetAccessTokenSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccessTokenSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).GetAccessTokenSession), ctx, signature, session) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetAccessTokenSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).GetAccessTokenSession), arg0, arg1, arg2) } // GetDeviceCodeSession mocks base method. -func (m *MockRFC8628CoreStorage) GetDeviceCodeSession(ctx context.Context, signature string, session fosite.Session) (fosite.DeviceRequester, error) { +func (m *MockRFC8628CoreStorage) GetDeviceCodeSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.DeviceRequester, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetDeviceCodeSession", ctx, signature, session) + ret := m.ctrl.Call(m, "GetDeviceCodeSession", arg0, arg1, arg2) ret0, _ := ret[0].(fosite.DeviceRequester) ret1, _ := ret[1].(error) return ret0, ret1 } // GetDeviceCodeSession indicates an expected call of GetDeviceCodeSession. -func (mr *MockRFC8628CoreStorageMockRecorder) GetDeviceCodeSession(ctx, signature, session any) *gomock.Call { +func (mr *MockRFC8628CoreStorageMockRecorder) GetDeviceCodeSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDeviceCodeSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).GetDeviceCodeSession), ctx, signature, session) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetDeviceCodeSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).GetDeviceCodeSession), arg0, arg1, arg2) } // GetRefreshTokenSession mocks base method. -func (m *MockRFC8628CoreStorage) GetRefreshTokenSession(ctx context.Context, signature string, session fosite.Session) (fosite.Requester, error) { +func (m *MockRFC8628CoreStorage) GetRefreshTokenSession(arg0 context.Context, arg1 string, arg2 fosite.Session) (fosite.Requester, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetRefreshTokenSession", ctx, signature, session) + ret := m.ctrl.Call(m, "GetRefreshTokenSession", arg0, arg1, arg2) ret0, _ := ret[0].(fosite.Requester) ret1, _ := ret[1].(error) return ret0, ret1 } // GetRefreshTokenSession indicates an expected call of GetRefreshTokenSession. -func (mr *MockRFC8628CoreStorageMockRecorder) GetRefreshTokenSession(ctx, signature, session any) *gomock.Call { +func (mr *MockRFC8628CoreStorageMockRecorder) GetRefreshTokenSession(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRefreshTokenSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).GetRefreshTokenSession), ctx, signature, session) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetRefreshTokenSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).GetRefreshTokenSession), arg0, arg1, arg2) } // InvalidateDeviceCodeSession mocks base method. -func (m *MockRFC8628CoreStorage) InvalidateDeviceCodeSession(ctx context.Context, signature string) error { +func (m *MockRFC8628CoreStorage) InvalidateDeviceCodeSession(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "InvalidateDeviceCodeSession", ctx, signature) + ret := m.ctrl.Call(m, "InvalidateDeviceCodeSession", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // InvalidateDeviceCodeSession indicates an expected call of InvalidateDeviceCodeSession. -func (mr *MockRFC8628CoreStorageMockRecorder) InvalidateDeviceCodeSession(ctx, signature any) *gomock.Call { +func (mr *MockRFC8628CoreStorageMockRecorder) InvalidateDeviceCodeSession(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InvalidateDeviceCodeSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).InvalidateDeviceCodeSession), ctx, signature) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "InvalidateDeviceCodeSession", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).InvalidateDeviceCodeSession), arg0, arg1) } // RotateRefreshToken mocks base method. -func (m *MockRFC8628CoreStorage) RotateRefreshToken(ctx context.Context, requestID, refreshTokenSignature string) error { +func (m *MockRFC8628CoreStorage) RotateRefreshToken(arg0 context.Context, arg1, arg2 string, arg3 time.Time) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "RotateRefreshToken", ctx, requestID, refreshTokenSignature) + ret := m.ctrl.Call(m, "RotateRefreshToken", arg0, arg1, arg2, arg3) ret0, _ := ret[0].(error) return ret0 } // RotateRefreshToken indicates an expected call of RotateRefreshToken. -func (mr *MockRFC8628CoreStorageMockRecorder) RotateRefreshToken(ctx, requestID, refreshTokenSignature any) *gomock.Call { +func (mr *MockRFC8628CoreStorageMockRecorder) RotateRefreshToken(arg0, arg1, arg2, arg3 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RotateRefreshToken", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).RotateRefreshToken), ctx, requestID, refreshTokenSignature) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "RotateRefreshToken", reflect.TypeOf((*MockRFC8628CoreStorage)(nil).RotateRefreshToken), arg0, arg1, arg2, arg3) } diff --git a/internal/rw.go b/internal/rw.go index 0c9cafc2b..278ee6424 100644 --- a/internal/rw.go +++ b/internal/rw.go @@ -9,7 +9,7 @@ package internal import ( "net/http" - gomock "go.uber.org/mock/gomock" + gomock "github.com/golang/mock/gomock" ) // Mock of ResponseWriter interface diff --git a/internal/storage.go b/internal/storage.go index 18ce1d483..d01ec648d 100644 --- a/internal/storage.go +++ b/internal/storage.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite (interfaces: Storage) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/storage.go github.com/ory/fosite Storage -// // Package internal is a generated GoMock package. package internal @@ -17,15 +12,14 @@ import ( reflect "reflect" time "time" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockStorage is a mock of Storage interface. type MockStorage struct { ctrl *gomock.Controller recorder *MockStorageMockRecorder - isgomock struct{} } // MockStorageMockRecorder is the mock recorder for MockStorage. @@ -46,44 +40,44 @@ func (m *MockStorage) EXPECT() *MockStorageMockRecorder { } // ClientAssertionJWTValid mocks base method. -func (m *MockStorage) ClientAssertionJWTValid(ctx context.Context, jti string) error { +func (m *MockStorage) ClientAssertionJWTValid(arg0 context.Context, arg1 string) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "ClientAssertionJWTValid", ctx, jti) + ret := m.ctrl.Call(m, "ClientAssertionJWTValid", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // ClientAssertionJWTValid indicates an expected call of ClientAssertionJWTValid. -func (mr *MockStorageMockRecorder) ClientAssertionJWTValid(ctx, jti any) *gomock.Call { +func (mr *MockStorageMockRecorder) ClientAssertionJWTValid(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClientAssertionJWTValid", reflect.TypeOf((*MockStorage)(nil).ClientAssertionJWTValid), ctx, jti) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "ClientAssertionJWTValid", reflect.TypeOf((*MockStorage)(nil).ClientAssertionJWTValid), arg0, arg1) } // GetClient mocks base method. -func (m *MockStorage) GetClient(ctx context.Context, id string) (fosite.Client, error) { +func (m *MockStorage) GetClient(arg0 context.Context, arg1 string) (fosite.Client, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "GetClient", ctx, id) + ret := m.ctrl.Call(m, "GetClient", arg0, arg1) ret0, _ := ret[0].(fosite.Client) ret1, _ := ret[1].(error) return ret0, ret1 } // GetClient indicates an expected call of GetClient. -func (mr *MockStorageMockRecorder) GetClient(ctx, id any) *gomock.Call { +func (mr *MockStorageMockRecorder) GetClient(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetClient", reflect.TypeOf((*MockStorage)(nil).GetClient), ctx, id) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "GetClient", reflect.TypeOf((*MockStorage)(nil).GetClient), arg0, arg1) } // SetClientAssertionJWT mocks base method. -func (m *MockStorage) SetClientAssertionJWT(ctx context.Context, jti string, exp time.Time) error { +func (m *MockStorage) SetClientAssertionJWT(arg0 context.Context, arg1 string, arg2 time.Time) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "SetClientAssertionJWT", ctx, jti, exp) + ret := m.ctrl.Call(m, "SetClientAssertionJWT", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // SetClientAssertionJWT indicates an expected call of SetClientAssertionJWT. -func (mr *MockStorageMockRecorder) SetClientAssertionJWT(ctx, jti, exp any) *gomock.Call { +func (mr *MockStorageMockRecorder) SetClientAssertionJWT(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetClientAssertionJWT", reflect.TypeOf((*MockStorage)(nil).SetClientAssertionJWT), ctx, jti, exp) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "SetClientAssertionJWT", reflect.TypeOf((*MockStorage)(nil).SetClientAssertionJWT), arg0, arg1, arg2) } diff --git a/internal/token_handler.go b/internal/token_handler.go index db895322a..3087967e2 100644 --- a/internal/token_handler.go +++ b/internal/token_handler.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite (interfaces: TokenEndpointHandler) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/token_handler.go github.com/ory/fosite TokenEndpointHandler -// // Package internal is a generated GoMock package. package internal @@ -16,15 +11,14 @@ import ( context "context" reflect "reflect" + gomock "github.com/golang/mock/gomock" fosite "github.com/ory/fosite" - gomock "go.uber.org/mock/gomock" ) // MockTokenEndpointHandler is a mock of TokenEndpointHandler interface. type MockTokenEndpointHandler struct { ctrl *gomock.Controller recorder *MockTokenEndpointHandlerMockRecorder - isgomock struct{} } // MockTokenEndpointHandlerMockRecorder is the mock recorder for MockTokenEndpointHandler. @@ -45,57 +39,57 @@ func (m *MockTokenEndpointHandler) EXPECT() *MockTokenEndpointHandlerMockRecorde } // CanHandleTokenEndpointRequest mocks base method. -func (m *MockTokenEndpointHandler) CanHandleTokenEndpointRequest(ctx context.Context, requester fosite.AccessRequester) bool { +func (m *MockTokenEndpointHandler) CanHandleTokenEndpointRequest(arg0 context.Context, arg1 fosite.AccessRequester) bool { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CanHandleTokenEndpointRequest", ctx, requester) + ret := m.ctrl.Call(m, "CanHandleTokenEndpointRequest", arg0, arg1) ret0, _ := ret[0].(bool) return ret0 } // CanHandleTokenEndpointRequest indicates an expected call of CanHandleTokenEndpointRequest. -func (mr *MockTokenEndpointHandlerMockRecorder) CanHandleTokenEndpointRequest(ctx, requester any) *gomock.Call { +func (mr *MockTokenEndpointHandlerMockRecorder) CanHandleTokenEndpointRequest(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CanHandleTokenEndpointRequest", reflect.TypeOf((*MockTokenEndpointHandler)(nil).CanHandleTokenEndpointRequest), ctx, requester) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CanHandleTokenEndpointRequest", reflect.TypeOf((*MockTokenEndpointHandler)(nil).CanHandleTokenEndpointRequest), arg0, arg1) } // CanSkipClientAuth mocks base method. -func (m *MockTokenEndpointHandler) CanSkipClientAuth(ctx context.Context, requester fosite.AccessRequester) bool { +func (m *MockTokenEndpointHandler) CanSkipClientAuth(arg0 context.Context, arg1 fosite.AccessRequester) bool { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "CanSkipClientAuth", ctx, requester) + ret := m.ctrl.Call(m, "CanSkipClientAuth", arg0, arg1) ret0, _ := ret[0].(bool) return ret0 } // CanSkipClientAuth indicates an expected call of CanSkipClientAuth. -func (mr *MockTokenEndpointHandlerMockRecorder) CanSkipClientAuth(ctx, requester any) *gomock.Call { +func (mr *MockTokenEndpointHandlerMockRecorder) CanSkipClientAuth(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CanSkipClientAuth", reflect.TypeOf((*MockTokenEndpointHandler)(nil).CanSkipClientAuth), ctx, requester) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "CanSkipClientAuth", reflect.TypeOf((*MockTokenEndpointHandler)(nil).CanSkipClientAuth), arg0, arg1) } // HandleTokenEndpointRequest mocks base method. -func (m *MockTokenEndpointHandler) HandleTokenEndpointRequest(ctx context.Context, requester fosite.AccessRequester) error { +func (m *MockTokenEndpointHandler) HandleTokenEndpointRequest(arg0 context.Context, arg1 fosite.AccessRequester) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "HandleTokenEndpointRequest", ctx, requester) + ret := m.ctrl.Call(m, "HandleTokenEndpointRequest", arg0, arg1) ret0, _ := ret[0].(error) return ret0 } // HandleTokenEndpointRequest indicates an expected call of HandleTokenEndpointRequest. -func (mr *MockTokenEndpointHandlerMockRecorder) HandleTokenEndpointRequest(ctx, requester any) *gomock.Call { +func (mr *MockTokenEndpointHandlerMockRecorder) HandleTokenEndpointRequest(arg0, arg1 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleTokenEndpointRequest", reflect.TypeOf((*MockTokenEndpointHandler)(nil).HandleTokenEndpointRequest), ctx, requester) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "HandleTokenEndpointRequest", reflect.TypeOf((*MockTokenEndpointHandler)(nil).HandleTokenEndpointRequest), arg0, arg1) } // PopulateTokenEndpointResponse mocks base method. -func (m *MockTokenEndpointHandler) PopulateTokenEndpointResponse(ctx context.Context, requester fosite.AccessRequester, responder fosite.AccessResponder) error { +func (m *MockTokenEndpointHandler) PopulateTokenEndpointResponse(arg0 context.Context, arg1 fosite.AccessRequester, arg2 fosite.AccessResponder) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "PopulateTokenEndpointResponse", ctx, requester, responder) + ret := m.ctrl.Call(m, "PopulateTokenEndpointResponse", arg0, arg1, arg2) ret0, _ := ret[0].(error) return ret0 } // PopulateTokenEndpointResponse indicates an expected call of PopulateTokenEndpointResponse. -func (mr *MockTokenEndpointHandlerMockRecorder) PopulateTokenEndpointResponse(ctx, requester, responder any) *gomock.Call { +func (mr *MockTokenEndpointHandlerMockRecorder) PopulateTokenEndpointResponse(arg0, arg1, arg2 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PopulateTokenEndpointResponse", reflect.TypeOf((*MockTokenEndpointHandler)(nil).PopulateTokenEndpointResponse), ctx, requester, responder) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "PopulateTokenEndpointResponse", reflect.TypeOf((*MockTokenEndpointHandler)(nil).PopulateTokenEndpointResponse), arg0, arg1, arg2) } diff --git a/internal/transactional.go b/internal/transactional.go index b7b6b898f..96b0aeefb 100644 --- a/internal/transactional.go +++ b/internal/transactional.go @@ -3,11 +3,6 @@ // Code generated by MockGen. DO NOT EDIT. // Source: github.com/ory/fosite/storage (interfaces: Transactional) -// -// Generated by this command: -// -// mockgen -package internal -destination internal/transactional.go github.com/ory/fosite/storage Transactional -// // Package internal is a generated GoMock package. package internal @@ -16,14 +11,13 @@ import ( context "context" reflect "reflect" - gomock "go.uber.org/mock/gomock" + gomock "github.com/golang/mock/gomock" ) // MockTransactional is a mock of Transactional interface. type MockTransactional struct { ctrl *gomock.Controller recorder *MockTransactionalMockRecorder - isgomock struct{} } // MockTransactionalMockRecorder is the mock recorder for MockTransactional. @@ -44,44 +38,44 @@ func (m *MockTransactional) EXPECT() *MockTransactionalMockRecorder { } // BeginTX mocks base method. -func (m *MockTransactional) BeginTX(ctx context.Context) (context.Context, error) { +func (m *MockTransactional) BeginTX(arg0 context.Context) (context.Context, error) { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "BeginTX", ctx) + ret := m.ctrl.Call(m, "BeginTX", arg0) ret0, _ := ret[0].(context.Context) ret1, _ := ret[1].(error) return ret0, ret1 } // BeginTX indicates an expected call of BeginTX. -func (mr *MockTransactionalMockRecorder) BeginTX(ctx any) *gomock.Call { +func (mr *MockTransactionalMockRecorder) BeginTX(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BeginTX", reflect.TypeOf((*MockTransactional)(nil).BeginTX), ctx) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "BeginTX", reflect.TypeOf((*MockTransactional)(nil).BeginTX), arg0) } // Commit mocks base method. -func (m *MockTransactional) Commit(ctx context.Context) error { +func (m *MockTransactional) Commit(arg0 context.Context) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Commit", ctx) + ret := m.ctrl.Call(m, "Commit", arg0) ret0, _ := ret[0].(error) return ret0 } // Commit indicates an expected call of Commit. -func (mr *MockTransactionalMockRecorder) Commit(ctx any) *gomock.Call { +func (mr *MockTransactionalMockRecorder) Commit(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Commit", reflect.TypeOf((*MockTransactional)(nil).Commit), ctx) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Commit", reflect.TypeOf((*MockTransactional)(nil).Commit), arg0) } // Rollback mocks base method. -func (m *MockTransactional) Rollback(ctx context.Context) error { +func (m *MockTransactional) Rollback(arg0 context.Context) error { m.ctrl.T.Helper() - ret := m.ctrl.Call(m, "Rollback", ctx) + ret := m.ctrl.Call(m, "Rollback", arg0) ret0, _ := ret[0].(error) return ret0 } // Rollback indicates an expected call of Rollback. -func (mr *MockTransactionalMockRecorder) Rollback(ctx any) *gomock.Call { +func (mr *MockTransactionalMockRecorder) Rollback(arg0 interface{}) *gomock.Call { mr.mock.ctrl.T.Helper() - return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Rollback", reflect.TypeOf((*MockTransactional)(nil).Rollback), ctx) + return mr.mock.ctrl.RecordCallWithMethodType(mr.mock, "Rollback", reflect.TypeOf((*MockTransactional)(nil).Rollback), arg0) } diff --git a/introspect_test.go b/introspect_test.go index 3f7da0fbe..083156cfd 100644 --- a/introspect_test.go +++ b/introspect_test.go @@ -9,9 +9,9 @@ import ( "net/http" "testing" + gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" . "github.com/ory/fosite" "github.com/ory/fosite/compose" diff --git a/introspection_request_handler_test.go b/introspection_request_handler_test.go index 067a5092d..14ab9956e 100644 --- a/introspection_request_handler_test.go +++ b/introspection_request_handler_test.go @@ -10,10 +10,10 @@ import ( "net/url" "testing" + gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" "github.com/ory/fosite" . "github.com/ory/fosite" diff --git a/introspection_response_writer_test.go b/introspection_response_writer_test.go index 431dd4e8d..6defd7252 100644 --- a/introspection_response_writer_test.go +++ b/introspection_response_writer_test.go @@ -13,10 +13,10 @@ import ( "github.com/ory/x/errorsx" + gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" . "github.com/ory/fosite" "github.com/ory/fosite/internal" diff --git a/pushed_authorize_request_handler_test.go b/pushed_authorize_request_handler_test.go index 94ec8868c..114294345 100644 --- a/pushed_authorize_request_handler_test.go +++ b/pushed_authorize_request_handler_test.go @@ -10,9 +10,9 @@ import ( "runtime/debug" "testing" + gomock "github.com/golang/mock/gomock" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - gomock "go.uber.org/mock/gomock" . "github.com/ory/fosite" "github.com/ory/fosite/internal" diff --git a/pushed_authorize_response_writer_test.go b/pushed_authorize_response_writer_test.go index 5c82862ab..4d5af449c 100644 --- a/pushed_authorize_response_writer_test.go +++ b/pushed_authorize_response_writer_test.go @@ -7,9 +7,9 @@ import ( "context" "testing" + gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/stretchr/testify/assert" - gomock "go.uber.org/mock/gomock" . "github.com/ory/fosite" . "github.com/ory/fosite/internal" diff --git a/revoke_handler_test.go b/revoke_handler_test.go index 55370fb51..41a0bbc82 100644 --- a/revoke_handler_test.go +++ b/revoke_handler_test.go @@ -11,9 +11,9 @@ import ( "net/url" "testing" + gomock "github.com/golang/mock/gomock" "github.com/pkg/errors" "github.com/stretchr/testify/assert" - gomock "go.uber.org/mock/gomock" . "github.com/ory/fosite" "github.com/ory/fosite/internal"