From 11ac3be4d82a746987c12b39bcfe427be10858fa Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Thu, 4 May 2023 12:19:44 -0500 Subject: [PATCH] fix: redirect to login on gitauth invalid session (#7416) --- coderd/coderd.go | 2 +- coderd/workspaceagents_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coderd/coderd.go b/coderd/coderd.go index d2721380bf..db4b7d3e78 100644 --- a/coderd/coderd.go +++ b/coderd/coderd.go @@ -449,7 +449,7 @@ func New(options *Options) *API { r.Route(fmt.Sprintf("/%s", gitAuthConfig.ID), func(r chi.Router) { r.Use( httpmw.ExtractOAuth2(gitAuthConfig, options.HTTPClient, nil), - apiKeyMiddleware, + apiKeyMiddlewareRedirect, ) r.Get("/callback", api.gitAuthCallback(gitAuthConfig)) }) diff --git a/coderd/workspaceagents_test.go b/coderd/workspaceagents_test.go index c2dd39cd32..d5ba9d2dda 100644 --- a/coderd/workspaceagents_test.go +++ b/coderd/workspaceagents_test.go @@ -876,7 +876,7 @@ func TestWorkspaceAgentsGitAuth(t *testing.T) { }}, }) resp := coderdtest.RequestGitAuthCallback(t, "github", client) - require.Equal(t, http.StatusUnauthorized, resp.StatusCode) + require.Equal(t, http.StatusSeeOther, resp.StatusCode) }) t.Run("AuthorizedCallback", func(t *testing.T) { t.Parallel()