From 7a78ad3893c5248728b7c1fbefbec695a75ee3e1 Mon Sep 17 00:00:00 2001
From: Karl Persson <kalle.persson@grafana.com>
Date: Fri, 5 Jul 2024 11:42:12 +0200
Subject: [PATCH] Authn: Remove response writer from auth req (#90110)

Authn: Remove response writer from request
---
 pkg/api/login.go                              | 2 +-
 pkg/api/login_oauth.go                        | 2 +-
 pkg/services/authn/authn.go                   | 6 ------
 pkg/services/authn/clients/ext_jwt_test.go    | 2 --
 pkg/services/authn/clients/jwt_test.go        | 5 -----
 pkg/services/contexthandler/contexthandler.go | 2 +-
 6 files changed, 3 insertions(+), 16 deletions(-)

diff --git a/pkg/api/login.go b/pkg/api/login.go
index 7123a3ba6de..415abb871aa 100644
--- a/pkg/api/login.go
+++ b/pkg/api/login.go
@@ -201,7 +201,7 @@ func (hs *HTTPServer) LoginAPIPing(c *contextmodel.ReqContext) response.Response
 }
 
 func (hs *HTTPServer) LoginPost(c *contextmodel.ReqContext) response.Response {
-	identity, err := hs.authnService.Login(c.Req.Context(), authn.ClientForm, &authn.Request{HTTPRequest: c.Req, Resp: c.Resp})
+	identity, err := hs.authnService.Login(c.Req.Context(), authn.ClientForm, &authn.Request{HTTPRequest: c.Req})
 	if err != nil {
 		tokenErr := &auth.CreateTokenErr{}
 		if errors.As(err, &tokenErr) {
diff --git a/pkg/api/login_oauth.go b/pkg/api/login_oauth.go
index 256a225959e..61cfa7d99e1 100644
--- a/pkg/api/login_oauth.go
+++ b/pkg/api/login_oauth.go
@@ -28,7 +28,7 @@ func (hs *HTTPServer) OAuthLogin(reqCtx *contextmodel.ReqContext) {
 
 	code := reqCtx.Query("code")
 
-	req := &authn.Request{HTTPRequest: reqCtx.Req, Resp: reqCtx.Resp}
+	req := &authn.Request{HTTPRequest: reqCtx.Req}
 	if code == "" {
 		redirect, err := hs.authnService.RedirectURL(reqCtx.Req.Context(), authn.ClientWithPrefix(name), req)
 		if err != nil {
diff --git a/pkg/services/authn/authn.go b/pkg/services/authn/authn.go
index 15974b1b983..88707690aab 100644
--- a/pkg/services/authn/authn.go
+++ b/pkg/services/authn/authn.go
@@ -14,7 +14,6 @@ import (
 	"github.com/grafana/grafana/pkg/models/usertoken"
 	"github.com/grafana/grafana/pkg/services/login"
 	"github.com/grafana/grafana/pkg/setting"
-	"github.com/grafana/grafana/pkg/web"
 )
 
 const (
@@ -186,11 +185,6 @@ type Request struct {
 	OrgID int64
 	// HTTPRequest is the original HTTP request to authenticate
 	HTTPRequest *http.Request
-
-	// Resp is the response writer to use for the request
-	// Used to set cookies and headers
-	Resp web.ResponseWriter
-
 	// metadata is additional information about the auth request
 	metadata map[string]string
 }
diff --git a/pkg/services/authn/clients/ext_jwt_test.go b/pkg/services/authn/clients/ext_jwt_test.go
index 7f072a6b5e8..6b8cdcce2a4 100644
--- a/pkg/services/authn/clients/ext_jwt_test.go
+++ b/pkg/services/authn/clients/ext_jwt_test.go
@@ -173,7 +173,6 @@ func TestExtendedJWT_Test(t *testing.T) {
 
 			actual := env.s.Test(context.Background(), &authn.Request{
 				HTTPRequest: validHTTPReq,
-				Resp:        nil,
 			})
 
 			assert.Equal(t, tc.want, actual)
@@ -320,7 +319,6 @@ func TestExtendedJWT_Authenticate(t *testing.T) {
 			id, err := env.s.Authenticate(context.Background(), &authn.Request{
 				OrgID:       tc.orgID,
 				HTTPRequest: validHTTPReq,
-				Resp:        nil,
 			})
 			if tc.wantErr != nil {
 				assert.ErrorIs(t, err, tc.wantErr)
diff --git a/pkg/services/authn/clients/jwt_test.go b/pkg/services/authn/clients/jwt_test.go
index 73cac5818f2..c4381f3945e 100644
--- a/pkg/services/authn/clients/jwt_test.go
+++ b/pkg/services/authn/clients/jwt_test.go
@@ -155,7 +155,6 @@ func TestAuthenticateJWT(t *testing.T) {
 			id, err := jwtClient.Authenticate(context.Background(), &authn.Request{
 				OrgID:       1,
 				HTTPRequest: validHTTPReq,
-				Resp:        nil,
 			})
 			require.NoError(t, err)
 
@@ -267,7 +266,6 @@ func TestJWTClaimConfig(t *testing.T) {
 			_, err := jwtClient.Authenticate(context.Background(), &authn.Request{
 				OrgID:       1,
 				HTTPRequest: httpReq,
-				Resp:        nil,
 			})
 			if tc.valid {
 				require.NoError(t, err)
@@ -384,7 +382,6 @@ func TestJWTTest(t *testing.T) {
 			got := jwtClient.Test(context.Background(), &authn.Request{
 				OrgID:       1,
 				HTTPRequest: httpReq,
-				Resp:        nil,
 			})
 
 			require.Equal(t, tc.want, got)
@@ -432,7 +429,6 @@ func TestJWTStripParam(t *testing.T) {
 	_, err := jwtClient.Authenticate(context.Background(), &authn.Request{
 		OrgID:       1,
 		HTTPRequest: httpReq,
-		Resp:        nil,
 	})
 	require.NoError(t, err)
 	// auth_token should be removed from the query string
@@ -489,7 +485,6 @@ func TestJWTSubClaimsConfig(t *testing.T) {
 	identity, err := jwtClient.Authenticate(context.Background(), &authn.Request{
 		OrgID:       1,
 		HTTPRequest: httpReq,
-		Resp:        nil,
 	})
 	require.NoError(t, err)
 	require.Equal(t, "mainemail+extraemail02@gmail.com", identity.Email)
diff --git a/pkg/services/contexthandler/contexthandler.go b/pkg/services/contexthandler/contexthandler.go
index fe8f810872e..4612bb0784f 100644
--- a/pkg/services/contexthandler/contexthandler.go
+++ b/pkg/services/contexthandler/contexthandler.go
@@ -112,7 +112,7 @@ func (h *ContextHandler) Middleware(next http.Handler) http.Handler {
 			reqContext.Logger = reqContext.Logger.New("traceID", traceID)
 		}
 
-		id, err := h.authnService.Authenticate(ctx, &authn.Request{HTTPRequest: reqContext.Req, Resp: reqContext.Resp})
+		id, err := h.authnService.Authenticate(ctx, &authn.Request{HTTPRequest: reqContext.Req})
 		if err != nil {
 			// Hack: set all errors on LookupTokenErr, so we can check it in auth middlewares
 			reqContext.LookupTokenErr = err