Commitb4a7fe3

authored

fix: useexpires_in field for git device refresh (#8411)

This was causing git auth to never refresh after the tokenbecame expired after 8hrs.

1 parent9df8053 commitb4a7fe3Copy full SHA for b4a7fe3

File tree

+11

-5

lines changed

+11

-5

lines changed

Lines changed: 10 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,13 @@ import (`
`6`	`6`	`"net/http"`
`7`	`7`	`"net/url"`
`8`	`8`	`"regexp"`
	`9`	`+"time"`
`9`	`10`
`10`	`11`	`"golang.org/x/oauth2"`
`11`	`12`	`"golang.org/x/oauth2/github"`
`12`	`13`	`"golang.org/x/xerrors"`
`13`	`14`
	`15`	`+"github.com/coder/coder/coderd/database"`
`14`	`16`	`"github.com/coder/coder/codersdk"`
`15`	`17`	`)`
`16`	`18`
`@@ -138,7 +140,9 @@ func (c DeviceAuth) AuthorizeDevice(ctx context.Context) (codersdk.GitAuthDevi`
`138`	`140`	`}`
`139`	`141`
`140`	`142`	`typeExchangeDeviceCodeResponsestruct {`
`141`		`-*oauth2.Token`
	`143`	+AccessTokenstring`json:"access_token"`
	`144`	+RefreshTokenstring`json:"refresh_token"`
	`145`	+ExpiresInint`json:"expires_in"`
`142`	`146`	Errorstring`json:"error"`
`143`	`147`	ErrorDescriptionstring`json:"error_description"`
`144`	`148`	`}`
`@@ -175,7 +179,11 @@ func (c *DeviceAuth) ExchangeDeviceCode(ctx context.Context, deviceCode string)`
`175`	`179`	`ifbody.Error!="" {`
`176`	`180`	`returnnil,xerrors.New(body.Error)`
`177`	`181`	`}`
`178`		`-returnbody.Token,nil`
	`182`	`+return&oauth2.Token{`
	`183`	`+AccessToken:body.AccessToken,`
	`184`	`+RefreshToken:body.RefreshToken,`
	`185`	`+Expiry:database.Now().Add(time.Duration(body.ExpiresIn)*time.Second),`
	`186`	`+},nil`
`179`	`187`	`}`
`180`	`188`
`181`	`189`	`func (c*DeviceAuth)formatDeviceTokenURL(deviceCodestring) (string,error) {`

Lines changed: 1 addition & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -200,9 +200,7 @@ func TestGitAuthDevice(t *testing.T) {`
`200`	`200`	`require.Equal(t,"authorization_pending",sdkErr.Detail)`
`201`	`201`
`202`	`202`	`resp= gitauth.ExchangeDeviceCodeResponse{`
`203`		`-Token:&oauth2.Token{`
`204`		`-AccessToken:"hey",`
`205`		`-},`
	`203`	`+AccessToken:"hey",`
`206`	`204`	`}`
`207`	`205`
`208`	`206`	`err=client.GitAuthDeviceExchange(context.Background(),"test", codersdk.GitAuthDeviceExchange{`

Comments

(0)