Fix git auth redirect

kylecarbs · kylecarbs · commit c4931b60c706 · 2023-10-02T16:38:46.000Z
diff --git a/coderd/externalauth_test.go b/coderd/externalauth_test.go
@@ -268,7 +268,7 @@ func TestGitAuthCallback(t *testing.T) {
 		agentClient.SetSessionToken(authToken)
 		token, err := agentClient.GitAuth(context.Background(), "github.com/asd/asd", false)
 		require.NoError(t, err)
-		require.True(t, strings.HasSuffix(token.URL, fmt.Sprintf("/external-auth/%s", "github")))
+		require.True(t, strings.HasSuffix(token.URL, fmt.Sprintf("/external-auth/%s", "github")), token.URL)
 	})
 	t.Run("UnauthorizedCallback", func(t *testing.T) {
 		t.Parallel()
diff --git a/coderd/workspaceagents.go b/coderd/workspaceagents.go
@@ -2278,7 +2278,7 @@ func (api *API) workspaceAgentsGitAuth(rw http.ResponseWriter, r *http.Request)
 	}
 
 	// This is the URL that will redirect the user with a state token.
-	redirectURL, err := api.AccessURL.Parse(fmt.Sprintf("/externalauth/%s", externalAuthConfig.ID))
+	redirectURL, err := api.AccessURL.Parse(fmt.Sprintf("/external-auth/%s", externalAuthConfig.ID))
 	if err != nil {
 		httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{
 			Message: "Failed to parse access URL.",

Original file line number	Diff line number	Diff line change
`@@ -2278,7 +2278,7 @@ func (api API) workspaceAgentsGitAuth(rw http.ResponseWriter, r http.Request)`
`2278`	`2278`	`}`
`2279`	`2279`
`2280`	`2280`	`// This is the URL that will redirect the user with a state token.`
`2281`		`- redirectURL, err := api.AccessURL.Parse(fmt.Sprintf("/externalauth/%s", externalAuthConfig.ID))`
	`2281`	`+ redirectURL, err := api.AccessURL.Parse(fmt.Sprintf("/external-auth/%s", externalAuthConfig.ID))`
`2282`	`2282`	`if err != nil {`
`2283`	`2283`	`httpapi.Write(ctx, rw, http.StatusInternalServerError, codersdk.Response{`
`2284`	`2284`	`Message: "Failed to parse access URL.",`