From 5dcfad56cf654b0307cafb5d95e03cec295301b2 Mon Sep 17 00:00:00 2001 From: "Grot (@grafanabot)" <43478413+grafanabot@users.noreply.github.com> Date: Tue, 20 Apr 2021 08:25:46 +0100 Subject: [PATCH] Auth: Don't clear auth token cookie when lookup token fails (#32999) (#33136) If LookupToken fails we don't clear the auth token cookie. Ref #15316 (cherry picked from commit 747f3cd300940a1ed6f9a262597b6b8c7d57c428) Co-authored-by: Marcus Efraimsson --- pkg/services/contexthandler/contexthandler.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkg/services/contexthandler/contexthandler.go b/pkg/services/contexthandler/contexthandler.go index d00e303c81b..be9640169b4 100644 --- a/pkg/services/contexthandler/contexthandler.go +++ b/pkg/services/contexthandler/contexthandler.go @@ -257,12 +257,6 @@ func (h *ContextHandler) initContextWithToken(ctx *models.ReqContext, orgID int6 token, err := h.AuthTokenService.LookupToken(ctx.Req.Context(), rawToken) if err != nil { ctx.Logger.Error("Failed to look up user based on cookie", "error", err) - - var revokedErr *models.TokenRevokedError - if !errors.As(err, &revokedErr) || !ctx.IsApiRequest() { - cookies.WriteSessionCookie(ctx, h.Cfg, "", -1) - } - ctx.Data["lookupTokenErr"] = err return false }