From 5500c9e24612824c6e60a5410c92defa17a1b1ec Mon Sep 17 00:00:00 2001 From: Bryan Frimin Date: Mon, 29 Dec 2025 11:48:02 +0100 Subject: [PATCH] Fix lastSession returns 5xx with api key Signed-off-by: Bryan Frimin --- pkg/server/api/connect/v1/graphql_handler.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/server/api/connect/v1/graphql_handler.go b/pkg/server/api/connect/v1/graphql_handler.go index 0f326456f..860d5bd0f 100644 --- a/pkg/server/api/connect/v1/graphql_handler.go +++ b/pkg/server/api/connect/v1/graphql_handler.go @@ -54,15 +54,16 @@ var ( func SessionDirective(ctx context.Context, obj any, next graphql.Resolver, required types.SessionRequirement) (any, error) { session := SessionFromContext(ctx) + apiKey := APIKeyFromContext(ctx) switch required { case types.SessionRequirementOptional: case types.SessionRequirementPresent: - if session == nil { + if session == nil && apiKey == nil { return nil, ErrUnauthenticated } case types.SessionRequirementNone: - if session != nil { + if session != nil && apiKey != nil { return nil, ErrAlreadyAuthenticated } }