Merge branch 'fosite-monorepo'

GitOrigin-RevId: 0496a85128a8006a1bdf0fb9ef3c393b31f90145

Author: hperl

aead/aead.go

@@ -6,7 +6,7 @@ package aead
 import (
 	"context"
 
-	"github.com/ory/fosite"
+	"github.com/ory/hydra/v2/fosite"
 )
 
 // Cipher provides AEAD (authenticated encryption with associated data). The

client/client.go

@@ -14,8 +14,8 @@ import (
 
 	"github.com/ory/pop/v6"
 
-	"github.com/ory/fosite"
 	"github.com/ory/hydra/v2/driver/config"
+	"github.com/ory/hydra/v2/fosite"
 	"github.com/ory/hydra/v2/x"
 	"github.com/ory/x/sqlxx"
 )

client/client_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/ory/fosite"
+	"github.com/ory/hydra/v2/fosite"
 )
 
 var _ fosite.OpenIDConnectClient = new(Client)

client/error.go

@@ -6,7 +6,7 @@ package client
 import (
 	"net/http"
 
-	"github.com/ory/fosite"
+	"github.com/ory/hydra/v2/fosite"
 )
 
 var ErrInvalidClientMetadata = &fosite.RFC6749Error{

client/handler.go

@@ -15,8 +15,8 @@ import (
 
 	"github.com/pkg/errors"
 
-	"github.com/ory/fosite"
 	"github.com/ory/herodot"
+	"github.com/ory/hydra/v2/fosite"
 	"github.com/ory/hydra/v2/x"
 	"github.com/ory/x/httprouterx"
 	"github.com/ory/x/jsonx"

client/manager.go

@@ -6,7 +6,7 @@ package client
 import (
 	"context"
 
-	"github.com/ory/fosite"
+	"github.com/ory/hydra/v2/fosite"
 	keysetpagination "github.com/ory/x/pagination/keysetpagination_v2"
 )
 

client/manager_test_helpers.go

@@ -18,7 +18,7 @@ import (
 
 	"github.com/ory/x/uuidx"
 
-	"github.com/ory/fosite"
+	"github.com/ory/hydra/v2/fosite"
 	testhelpersuuid "github.com/ory/hydra/v2/internal/testhelpers/uuid"
 	"github.com/ory/hydra/v2/x"
 	"github.com/ory/x/assertx"

client/registry.go

@@ -6,10 +6,10 @@ package client
 import (
 	"github.com/ory/hydra/v2/driver/config"
 
-	"github.com/ory/fosite"
-	foauth2 "github.com/ory/fosite/handler/oauth2"
-	"github.com/ory/fosite/handler/rfc8628"
-	enigma "github.com/ory/fosite/token/hmac"
+	"github.com/ory/hydra/v2/fosite"
+	foauth2 "github.com/ory/hydra/v2/fosite/handler/oauth2"
+	"github.com/ory/hydra/v2/fosite/handler/rfc8628"
+	enigma "github.com/ory/hydra/v2/fosite/token/hmac"
 	"github.com/ory/hydra/v2/jwk"
 	"github.com/ory/hydra/v2/x"
 )

client/validator_test.go

@@ -17,10 +17,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	"github.com/ory/fosite"
 	. "github.com/ory/hydra/v2/client"
 	"github.com/ory/hydra/v2/driver"
 	"github.com/ory/hydra/v2/driver/config"
+	"github.com/ory/hydra/v2/fosite"
 	"github.com/ory/hydra/v2/internal/testhelpers"
 	"github.com/ory/hydra/v2/x"
 	"github.com/ory/x/configx"

consent/csrf.go

@@ -12,8 +12,8 @@ import (
 	"github.com/gorilla/sessions"
 	"github.com/pkg/errors"
 
-	"github.com/ory/fosite"
 	"github.com/ory/hydra/v2/flow"
+	"github.com/ory/hydra/v2/fosite"
 	"github.com/ory/hydra/v2/x"
 	"github.com/ory/x/mapx"
 )