diff --git a/backend/internal/handler/auth_handler.go b/backend/internal/handler/auth_handler.go index 1855f851..f34b1373 100644 --- a/backend/internal/handler/auth_handler.go +++ b/backend/internal/handler/auth_handler.go @@ -5152,8 +5152,14 @@ func (h *AuthHandler) GetConsentRequest(c *fiber.Ctx) error { identity, err := h.KratosAdmin.GetIdentity(c.Context(), consentRequest.Subject) if err == nil && identity != nil { currentSessionID := h.resolveCurrentSessionID(c) + var tenantID string + if consentRequest.Client.Metadata != nil { + if tid, ok := consentRequest.Client.Metadata["tenant_id"].(string); ok { + tenantID = tid + } + } sessionClaims := withOidcSessionMetadata( - buildOidcClaimsFromTraits(identity.Traits, consentRequest.RequestedScope), + buildOidcClaimsFromTraits(identity.Traits, consentRequest.RequestedScope, tenantID), currentSessionID, ) acceptResp, err := h.Hydra.AcceptConsentRequest(c.Context(), challenge, consentRequest, sessionClaims) diff --git a/docker/ory/oathkeeper/rules.active.json b/docker/ory/oathkeeper/rules.active.json index fd6bfb2d..4a0735da 100755 --- a/docker/ory/oathkeeper/rules.active.json +++ b/docker/ory/oathkeeper/rules.active.json @@ -156,4 +156,4 @@ "authorizer": { "handler": "allow" }, "mutators": [{ "handler": "noop" }] } -] +] \ No newline at end of file