Commit1c8ee5c

authored

fix(coderd): support string type for oidc response's expires_in json property (#20152)

1 parent91d4f8b commit1c8ee5cCopy full SHA for 1c8ee5c

File tree

+10

-4

lines changed

+10

-4

lines changed

Lines changed: 10 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -222,8 +222,9 @@ func (src jwtTokenSource) Token() (oauth2.Token, error) {`
`222`	`222`	RefreshTokenstring`json:"refresh_token,omitempty"`
`223`	`223`
`224`	`224`	`// Extra fields returned by the refresh that are needed`
`225`		-IDTokenstring`json:"id_token"`
`226`		-ExpiresInint64`json:"expires_in"`// relative seconds from now
	`225`	+IDTokenstring`json:"id_token"`
	`226`	+ExpiresIn json.Number`json:"expires_in"`// relative seconds from now, use Number since Azure AD might return string
	`227`	`+`
`227`	`228`	`// error fields`
`228`	`229`	`// https://datatracker.ietf.org/doc/html/rfc6749#section-5.2`
`229`	`230`	ErrorCodestring`json:"error"`
`@@ -256,8 +257,13 @@ func (src jwtTokenSource) Token() (oauth2.Token, error) {`
`256`	`257`	`RefreshToken:tokenRes.RefreshToken,`
`257`	`258`	`}`
`258`	`259`
`259`		`-ifsecs:=tokenRes.ExpiresIn;secs>0 {`
`260`		`-newToken.Expiry=time.Now().Add(time.Duration(secs)*time.Second)`
	`260`	`+expiresIn,convertErr:=tokenRes.ExpiresIn.Int64()`
	`261`	`+ifconvertErr!=nil {`
	`262`	`+returnnil,xerrors.Errorf("oauth2: cannot convert expires_in to int64: %w",convertErr)`
	`263`	`+}`
	`264`	`+`
	`265`	`+ifexpiresIn>0 {`
	`266`	`+newToken.Expiry=time.Now().Add(time.Duration(expiresIn)*time.Second)`
`261`	`267`	`}`
`262`	`268`
`263`	`269`	`// ID token is a JWT token. We can decode it to get the expiry.`

Comments

(0)