fix: redirect to login on gitauth invalid session (#7416)

kylecarbs · web-flow · commit 11ac3be4d82a · 2023-05-04T17:19:44.000Z
diff --git 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
@@ -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()

Original file line number	Diff line number	Diff line change
`@@ -449,7 +449,7 @@ func New(options Options) API {`
`449`	`449`	`r.Route(fmt.Sprintf("/%s", gitAuthConfig.ID), func(r chi.Router) {`
`450`	`450`	`r.Use(`
`451`	`451`	`httpmw.ExtractOAuth2(gitAuthConfig, options.HTTPClient, nil),`
`452`		`- apiKeyMiddleware,`
	`452`	`+ apiKeyMiddlewareRedirect,`
`453`	`453`	`)`
`454`	`454`	`r.Get("/callback", api.gitAuthCallback(gitAuthConfig))`
`455`	`455`	`})`