Skip to content

Commit a1f76a6

Browse files
james-d-elliottjames-d-elliott
authored
Merge branch 'master' into fix-refresh-scope-narrowing
2 parents 1b13725 + bc43abc commit a1f76a6

File tree

231 files changed

+260
-302
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

231 files changed

+260
-302
lines changed

‎.circleci/config.yml

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎access_error.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎access_error_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite_test

‎access_request.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎access_request_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎access_request_handler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite_test

‎access_request_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎access_response.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎access_response_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite_test

‎access_response_writer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎access_response_writer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite_test

‎access_write.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎access_write_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite_test

‎arguments.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎arguments_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎audience_strategy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎audience_strategy_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎authorize_error.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎authorize_error_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite_test

‎authorize_helper.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎authorize_helper_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite_test

‎authorize_request.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎authorize_request_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎authorize_request_handler_oidc_request_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite
@@ -18,7 +18,7 @@ import (
1818

1919
"github.com/stretchr/testify/assert"
2020
"github.com/stretchr/testify/require"
21-
jose "gopkg.in/square/go-jose.v2"
21+
"gopkg.in/square/go-jose.v2"
2222

2323
"github.com/ory/fosite/token/jwt"
2424
)

‎authorize_request_handler_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite_test

‎authorize_request_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎authorize_response.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎authorize_response_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎authorize_response_writer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎authorize_response_writer_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite_test

‎authorize_validators_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎authorize_write.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎authorize_write_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite_test

‎client.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite
55

66
import (
7-
jose "gopkg.in/square/go-jose.v2"
7+
"gopkg.in/square/go-jose.v2"
88
)
99

1010
// Client represents a client or an app.

‎client_authentication.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite
@@ -16,7 +16,7 @@ import (
1616
"github.com/ory/x/errorsx"
1717

1818
"github.com/pkg/errors"
19-
jose "gopkg.in/square/go-jose.v2"
19+
"gopkg.in/square/go-jose.v2"
2020

2121
"github.com/ory/fosite/token/jwt"
2222
)

‎client_authentication_jwks_strategy.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite
@@ -13,7 +13,7 @@ import (
1313

1414
"github.com/ory/x/errorsx"
1515

16-
jose "gopkg.in/square/go-jose.v2"
16+
"gopkg.in/square/go-jose.v2"
1717
)
1818

1919
const defaultJWKSFetcherStrategyCachePrefix = "github.com/ory/fosite.DefaultJWKSFetcherStrategy:"

‎client_authentication_jwks_strategy_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite
@@ -19,7 +19,7 @@ import (
1919

2020
"github.com/stretchr/testify/assert"
2121
"github.com/stretchr/testify/require"
22-
jose "gopkg.in/square/go-jose.v2"
22+
"gopkg.in/square/go-jose.v2"
2323
)
2424

2525
func initServerWithKey(t *testing.T) *httptest.Server {

‎client_authentication_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite_test
@@ -23,7 +23,7 @@ import (
2323
"github.com/pkg/errors"
2424
"github.com/stretchr/testify/assert"
2525
"github.com/stretchr/testify/require"
26-
jose "gopkg.in/square/go-jose.v2"
26+
"gopkg.in/square/go-jose.v2"
2727

2828
"github.com/ory/fosite/token/jwt"
2929

‎client_manager.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎client_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎client_with_custom_token_lifespans.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎client_with_custom_token_lifespans_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎compose/compose.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package compose

‎compose/compose_oauth2.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package compose

‎compose/compose_openid.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package compose

‎compose/compose_par.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package compose

‎compose/compose_pkce.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package compose

‎compose/compose_rfc7523.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package compose

‎compose/compose_strategy.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package compose

‎config.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎config_default.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

‎context.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright © 2022 Ory Corp
1+
// Copyright © 2023 Ory Corp
22
// SPDX-License-Identifier: Apache-2.0
33

44
package fosite

0 commit comments

Comments
 (0)