Preston_PLB
/
oauth2
forked from Mirrors/oauth2
1
0
Fork 0
Code Pull Requests Activity

Nits. 

Change-Id: I80810189246ee1d7c2dba570b7ec72899b04d265
This commit is contained in:
Patrick Jones 2021-01-25 14:12:57 -08:00
parent 990173083e
commit 0cc2c09354
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -38,11 +38,12 @@ func (c *Config) TokenSource(ctx context.Context) oauth2.TokenSource {
if c.ServiceAccountImpersonationURL == "" { if c.ServiceAccountImpersonationURL == "" {
return oauth2.ReuseTokenSource(nil, ts) return oauth2.ReuseTokenSource(nil, ts)
} }
scopes := c.Scopes
ts.conf.Scopes = []string{"https://www.googleapis.com/auth/cloud-platform"} ts.conf.Scopes = []string{"https://www.googleapis.com/auth/cloud-platform"}
imp := impersonateTokenSource{ imp := impersonateTokenSource{
ctx: ctx, ctx: ctx,
url: c.ServiceAccountImpersonationURL, url: c.ServiceAccountImpersonationURL,
scopes: c.Scopes, scopes: scopes,
ts: oauth2.ReuseTokenSource(nil, ts), ts: oauth2.ReuseTokenSource(nil, ts),
} }
return oauth2.ReuseTokenSource(nil, imp) return oauth2.ReuseTokenSource(nil, imp)

3
google/internal/externalaccount/impersonate.go
View File

@ -43,11 +43,10 @@ func (its impersonateTokenSource) Token() (*oauth2.Token, error) {
Scope: its.scopes, Scope: its.scopes,
} }
b, err := json.Marshal(reqBody) b, err := json.Marshal(reqBody)
client := oauth2.NewClient(its.ctx, its.ts)
if err != nil { if err != nil {
return nil, fmt.Errorf("oauth2/google: unable to marshal request: %v", err) return nil, fmt.Errorf("oauth2/google: unable to marshal request: %v", err)
} }
client := oauth2.NewClient(its.ctx, its.ts)
req, err := http.NewRequest("POST", its.url, bytes.NewReader(b)) req, err := http.NewRequest("POST", its.url, bytes.NewReader(b))
if err != nil { if err != nil {
return nil, fmt.Errorf("oauth2/google: unable to create impersonation request: %v", err) return nil, fmt.Errorf("oauth2/google: unable to create impersonation request: %v", err)