test(hydra): convert custom JWT claim tests to table

GitOrigin-RevId: c0114d299bdec370104e8ad0b3042d3a3c045bb1

Author: zepatrik

oauth2/e2e_test.go

@@ -38,8 +38,8 @@ func TestAuthCodeFlowE2E(t *testing.T) {
 		config.KeyRefreshTokenHook:     "",
 		config.KeyLoginURL:             testhelpers.LoginURL,
 		config.KeyConsentURL:           testhelpers.ConsentURL,
-		config.KeyAccessTokenLifespan:  10 * time.Second,
-		config.KeyRefreshTokenLifespan: 20 * time.Second,
+		config.KeyAccessTokenLifespan:  10 * time.Minute, // allow to debug
+		config.KeyRefreshTokenLifespan: 20 * time.Minute, // allow to debug
 		config.KeyScopeStrategy:        "exact",
 		config.KeyIssuerURL:            "https://hydra.ory",
 	})))

oauth2/handler.go

@@ -1463,7 +1463,6 @@ func (h *Handler) updateSessionWithRequest(
 	session.ExcludeNotBeforeClaim = h.c.ExcludeNotBeforeClaim(ctx)
 	session.AllowedTopLevelClaims = h.c.AllowedTopLevelClaims(ctx)
 	session.MirrorTopLevelClaims = h.c.MirrorTopLevelClaims(ctx)
-	session.Flow = flow
 
 	return session, nil
 }

oauth2/session.go

@@ -20,7 +20,6 @@ import (
 	"github.com/ory/fosite/handler/openid"
 	"github.com/ory/fosite/token/jwt"
 	"github.com/ory/hydra/v2/driver/config"
-	"github.com/ory/hydra/v2/flow"
 	"github.com/ory/x/logrusx"
 )
 
@@ -34,8 +33,6 @@ type Session struct {
 	ExcludeNotBeforeClaim  bool                   `json:"exclude_not_before_claim"`
 	AllowedTopLevelClaims  []string               `json:"allowed_top_level_claims"`
 	MirrorTopLevelClaims   bool                   `json:"mirror_top_level_claims"`
-
-	Flow *flow.Flow `json:"-"`
 }
 
 func NewTestSession(t testing.TB, subject string) *Session {
@@ -44,8 +41,6 @@ func NewTestSession(t testing.TB, subject string) *Session {
 }
 
 func NewSessionWithCustomClaims(ctx context.Context, p *config.DefaultProvider, subject string) *Session {
-	allowedTopLevelClaims := p.AllowedTopLevelClaims(ctx)
-	mirrorTopLevelClaims := p.MirrorTopLevelClaims(ctx)
 	return &Session{
 		DefaultSession: &openid.DefaultSession{
 			Claims:    new(jwt.IDTokenClaims),
@@ -54,8 +49,9 @@ func NewSessionWithCustomClaims(ctx context.Context, p *config.DefaultProvider,
 			ExpiresAt: make(map[fosite.TokenType]time.Time),
 		},
 		Extra:                 map[string]interface{}{},
-		AllowedTopLevelClaims: allowedTopLevelClaims,
-		MirrorTopLevelClaims:  mirrorTopLevelClaims,
+		AllowedTopLevelClaims: p.AllowedTopLevelClaims(ctx),
+		MirrorTopLevelClaims:  p.MirrorTopLevelClaims(ctx),
+		ExcludeNotBeforeClaim: p.ExcludeNotBeforeClaim(ctx),
 	}
 }