Commit04afb88

authored

fix: return a more sophisticated error for device failure on 429 (#11554)

* fix: return a more sophisticated error for device failure on 429

1 parentb1d53a6 commit04afb88Copy full SHA for 04afb88

File tree

+30

-1

lines changed

+30

-1

lines changed

Lines changed: 8 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,14 @@ func (c DeviceAuth) AuthorizeDevice(ctx context.Context) (codersdk.ExternalAut`
`321`	`321`	`}`
`322`	`322`	`err=json.NewDecoder(resp.Body).Decode(&r)`
`323`	`323`	`iferr!=nil {`
`324`		`-returnnil,err`
	`324`	`+// Some status codes do not return json payloads, and we should`
	`325`	`+// return a better error.`
	`326`	`+switchresp.StatusCode {`
	`327`	`+casehttp.StatusTooManyRequests:`
	`328`	`+returnnil,fmt.Errorf("rate limit hit, unable to authorize device. please try again later")`
	`329`	`+default:`
	`330`	`+returnnil,err`
	`331`	`+}`
`325`	`332`	`}`
`326`	`333`	`ifr.ErrorDescription!="" {`
`327`	`334`	`returnnil,xerrors.New(r.ErrorDescription)`

Lines changed: 22 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -279,6 +279,28 @@ func TestExternalAuthDevice(t *testing.T) {`
`279`	`279`	`require.NoError(t,err)`
`280`	`280`	`require.True(t,auth.Authenticated)`
`281`	`281`	`})`
	`282`	`+t.Run("TooManyRequests",func(t*testing.T) {`
	`283`	`+t.Parallel()`
	`284`	`+srv:=httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter,r*http.Request) {`
	`285`	`+w.WriteHeader(http.StatusTooManyRequests)`
	`286`	`+// Github returns an html payload for this error.`
	`287`	+_,_=w.Write([]byte(`Please wait a few minutes before you try again`))
	`288`	`+}))`
	`289`	`+defersrv.Close()`
	`290`	`+client:=coderdtest.New(t,&coderdtest.Options{`
	`291`	`+ExternalAuthConfigs: []*externalauth.Config{{`
	`292`	`+ID:"test",`
	`293`	`+DeviceAuth:&externalauth.DeviceAuth{`
	`294`	`+ClientID:"test",`
	`295`	`+CodeURL:srv.URL,`
	`296`	`+Scopes: []string{"repo"},`
	`297`	`+},`
	`298`	`+}},`
	`299`	`+})`
	`300`	`+coderdtest.CreateFirstUser(t,client)`
	`301`	`+_,err:=client.ExternalAuthDeviceByID(context.Background(),"test")`
	`302`	`+require.ErrorContains(t,err,"rate limit hit")`
	`303`	`+})`
`282`	`304`	`}`
`283`	`305`
`284`	`306`	`// nolint:bodyclose`

Comments

(0)