krombel/oauth2
1
0
Fork 0
forked from remote/oauth2
Code Pull Requests 1 Activity

google: minor tweaks

Browse Source 
Change-Id: Ic0e6363b19bbfd40df6b7b15322abf43c9990688
This commit is contained in:
Patrick Jones
2020-12-15 08:53:28 -08:00
parent 4c1e0860ce
commit 08114d04f5
5 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
google/internal/externalaccount/basecredentials.go
View File

@@ -88,7 +88,11 @@ type tokenSource struct {
func (ts tokenSource) Token() (*oauth2.Token, error) {
conf := ts.conf
subjectToken, err := conf.parse().retrieveSubjectToken(conf)
typedCredSource := conf.parse()
if typedCredSource == nil {
return nil, fmt.Errorf("google: unable to parse credential source")
}
subjectToken, err := typedCredSource.retrieveSubjectToken(conf)
if err != nil {
return nil, err
}
@@ -118,10 +122,9 @@ func (ts tokenSource) Token() (*oauth2.Token, error) {
}
if stsResp.ExpiresIn < 0 {
return nil, fmt.Errorf("google/oauth2: got invalid expiry from security token service")
} else if stsResp.ExpiresIn > 0 {
} else if stsResp.ExpiresIn >= 0 {
accessToken.Expiry = now().Add(time.Duration(stsResp.ExpiresIn) * time.Second)
}
// TODO: For reviewers- what should I do if ExpiresIn is equal to 0? Would that correspond to a one-use token, or something else?
if stsResp.RefreshToken != "" {
accessToken.RefreshToken = stsResp.RefreshToken