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

google: update formatting and code structure

Browse Source 
Change-Id: I9c45c7848de4ab2e3a685f761c85b1c9405b6eb1
This commit is contained in:
Patrick Jones
2020-11-10 11:59:17 -08:00
parent 4bcf502a22
commit 74f89b5575
2 changed files with 31 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,7 +10,6 @@ import (
"fmt"
"golang.org/x/oauth2"
"io"
"io/ioutil"
"net/http"
"net/url"
"strconv"
@@ -33,35 +32,41 @@ func ExchangeToken(ctx context.Context, endpoint string, request *STSTokenExchan
fmt.Errorf("oauth2/google: failed to marshal additional options: %v", err)
return nil, err
}
data.Set("options", string(opts))
data.Set("options", string(opts))
authentication.InjectAuthentication(data, headers)
encodedData := data.Encode()
req, err := http.NewRequestWithContext(ctx, "POST", endpoint, strings.NewReader(encodedData))
if err != nil {
fmt.Errorf("oauth2/google: failed to properly build http request: %v", err)
return nil, err
}
for key, _ := range headers {
for _, val := range headers.Values(key) {
for key, list := range headers {
for _, val := range list {
req.Header.Add(key, val)
}
}
req.Header.Add("Content-Length", strconv.Itoa(len(encodedData)))
resp, err := client.Do(req)
if err != nil {
fmt.Errorf("oauth2/google: invalid response from Secure Token Server: %v", err)
return nil, err
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(io.LimitReader(resp.Body, 1<<20))
if err != nil {
fmt.Errorf("oauth2/google: invalid body in Secure Token Server response: %v", err)
}
bodyJson := json.NewDecoder(io.LimitReader(resp.Body, 1<<20))
var stsResp STSTokenExchangeResponse
err = json.Unmarshal(body, &stsResp)
if err != nil {
fmt.Errorf("oauth2/google: failed to unmarshal response body from Secure Token Server: %v", err)
for bodyJson.More() {
err = bodyJson.Decode(&stsResp)
if err != nil {
fmt.Errorf("oauth2/google: failed to unmarshal response body from Secure Token Server: %v", err)
return nil, err
}
}
return &stsResp, nil
}