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

google: fix more nits and return early in one error case. 

Change-Id: Idafbe36f4add6998e57878fec84a1080ac962511
This commit is contained in:
Patrick Jones 2020-11-03 15:37:42 -08:00
parent 01ea6373cb
commit 801e5611ae
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
google/internal/externalaccount/sts_exchange.go
View File

@ -1,4 +1,4 @@
// Copyright 2015 The Go Authors. All rights reserved. // Copyright 2020 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
@ -29,15 +29,15 @@ func ExchangeToken(ctx context.Context, endpoint string, request *STSTokenExchan
data.Set("subject_token", request.SubjectToken) data.Set("subject_token", request.SubjectToken)
data.Set("scope", strings.Join(request.Scope, " ")) data.Set("scope", strings.Join(request.Scope, " "))
opts, err := json.Marshal(options) opts, err := json.Marshal(options)
if err == nil { if err != nil {
data.Set("options", string(opts))
} else {
fmt.Errorf("oauth2/google: failed to marshal additional options: %v", err) fmt.Errorf("oauth2/google: failed to marshal additional options: %v", err)
return nil, err
} }
data.Set("options", string(opts))
authentication.InjectAuthentication(data, headers) authentication.InjectAuthentication(data, headers)
encodedData := data.Encode() encodedData := data.Encode()
req, err := http.NewRequest("POST", endpoint, strings.NewReader(encodedData)) req, err := http.NewRequestWithContext(ctx, "POST", endpoint, strings.NewReader(encodedData))
if err != nil { if err != nil {
fmt.Errorf("oauth2/google: failed to properly build http request: %v", err) fmt.Errorf("oauth2/google: failed to properly build http request: %v", err)
} }
@ -60,7 +60,7 @@ func ExchangeToken(ctx context.Context, endpoint string, request *STSTokenExchan
var stsResp STSTokenExchangeResponse var stsResp STSTokenExchangeResponse
err = json.Unmarshal(body, &stsResp) err = json.Unmarshal(body, &stsResp)
if err != nil { if err != nil {
fmt.Errorf("oauth2/google: failed to unmarshal response body from STS server: %v", err) fmt.Errorf("oauth2/google: failed to unmarshal response body from Secure Token Server: %v", err)
} }
return &stsResp, nil return &stsResp, nil
} }

4
google/internal/externalaccount/sts_exchange_test.go
View File

@ -1,4 +1,4 @@
// Copyright 2015 The Go Authors. All rights reserved. // Copyright 2020 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style // Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file. // license that can be found in the LICENSE file.
@ -75,7 +75,7 @@ func TestExchangeToken(t *testing.T) {
resp, err := ExchangeToken(context.Background(), ts.URL, &tokenRequest, auth, headers, nil) resp, err := ExchangeToken(context.Background(), ts.URL, &tokenRequest, auth, headers, nil)
if err != nil { if err != nil {
t.Errorf("ExchangeToken failed with error: %s", err) t.Fatalf("ExchangeToken failed with error: %s", err)
} }
if diff := cmp.Diff(expectedToken, *resp); diff != "" { if diff := cmp.Diff(expectedToken, *resp); diff != "" {