feat: support multiple token URLs (#3676)

ory · Dec 18, 2023 · 95cc273 · 95cc273
1 parent 9b33fc5
commit 95cc273
Show file tree

Hide file tree

Showing 4 changed files with 356 additions and 3 deletions.
diff --git a/fositex/config.go b/fositex/config.go
@@ -20,6 +20,7 @@ import (
 	"github.com/ory/hydra/v2/oauth2"
 	"github.com/ory/hydra/v2/persistence"
 	"github.com/ory/hydra/v2/x"
+	"github.com/ory/x/stringslice"
 	"github.com/ory/x/urlx"
 )
 
@@ -199,6 +200,9 @@ func (c *Config) GetFormPostHTMLTemplate(context.Context) *template.Template {
 	return fosite.DefaultFormPostTemplate
 }
 
-func (c *Config) GetTokenURL(ctx context.Context) string {
-	return urlx.AppendPaths(c.deps.Config().PublicURL(ctx), oauth2.TokenPath).String()
+func (c *Config) GetTokenURLs(ctx context.Context) []string {
+	return stringslice.Unique([]string{
+		c.OAuth2TokenURL(ctx).String(),
+		urlx.AppendPaths(c.deps.Config().PublicURL(ctx), oauth2.TokenPath).String(),
+	})
 }
diff --git a/go.mod b/go.mod
@@ -37,7 +37,7 @@ require (
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
 	github.com/oleiade/reflections v1.0.1
 	github.com/ory/analytics-go/v5 v5.0.1
-	github.com/ory/fosite v0.44.1-0.20230807113540-d4605bb2b3a6
+	github.com/ory/fosite v0.44.1-0.20231213153202-0d631f345034
 	github.com/ory/go-acc v0.2.9-0.20230103102148-6b1c9a70dbbe
 	github.com/ory/graceful v0.1.3
 	github.com/ory/herodot v0.10.3-0.20230626083119-d7e5192f0d88

diff --git a/go.sum b/go.sum
@@ -589,6 +589,8 @@ github.com/ory/dockertest/v3 v3.10.0 h1:4K3z2VMe8Woe++invjaTB7VRyQXQy5UY+loujO4a
 github.com/ory/dockertest/v3 v3.10.0/go.mod h1:nr57ZbRWMqfsdGdFNLHz5jjNdDb7VVFnzAeW1n5N1Lg=
 github.com/ory/fosite v0.44.1-0.20230807113540-d4605bb2b3a6 h1:pJLf9Gx4CfhE+M0lP/xXTg8YeT8t0V7mBMC4oXACyDQ=
 github.com/ory/fosite v0.44.1-0.20230807113540-d4605bb2b3a6/go.mod h1:fkMPsnm/UjiefE9dE9CdZQGOH48TWJLIzUcdGIXg8Kk=
+github.com/ory/fosite v0.44.1-0.20231213153202-0d631f345034 h1:0afOTtuICtxga4Ni/PLQwsr45I0jAzsYXg/MaCoXFQs=
+github.com/ory/fosite v0.44.1-0.20231213153202-0d631f345034/go.mod h1:fkMPsnm/UjiefE9dE9CdZQGOH48TWJLIzUcdGIXg8Kk=
 github.com/ory/go-acc v0.2.9-0.20230103102148-6b1c9a70dbbe h1:rvu4obdvqR0fkSIJ8IfgzKOWwZ5kOT2UNfLq81Qk7rc=
 github.com/ory/go-acc v0.2.9-0.20230103102148-6b1c9a70dbbe/go.mod h1:z4n3u6as84LbV4YmgjHhnwtccQqzf4cZlSk9f1FhygI=
 github.com/ory/go-convenience v0.1.0 h1:zouLKfF2GoSGnJwGq+PE/nJAE6dj2Zj5QlTgmMTsTS8=