google: update formatting and code structure

Change-Id: I9c45c7848de4ab2e3a685f761c85b1c9405b6eb1
This commit is contained in:
Patrick Jones
2020-11-10 11:59:17 -08:00
parent 801e5611ae
commit 5908a54aa5
2 changed files with 31 additions and 23 deletions

View File

@@ -34,7 +34,7 @@ var tokenRequest = STSTokenExchangeRequest{
SubjectTokenType: "urn:ietf:params:oauth:token-type:jwt",
}
var requestbody = "audience=32555940559.apps.googleusercontent.com&grant_type=urn%3Aietf%3Aparams%3Aoauth%3Agrant-type%3Atoken-exchange&requested_token_type=urn%3Aietf%3Aparams%3Aoauth%3Atoken-type%3Aaccess_token&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fdevstorage.full_control&subject_token=Sample.Subject.Token&subject_token_type=urn%3Aietf%3Aparams%3Aoauth%3Atoken-type%3Ajwt"
var requestbody = "audience=32555940559.apps.googleusercontent.com&grant_type=urn%3Aietf%3Aparams%3Aoauth%3Agrant-type%3Atoken-exchange&options=null&requested_token_type=urn%3Aietf%3Aparams%3Aoauth%3Atoken-type%3Aaccess_token&scope=https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fdevstorage.full_control&subject_token=Sample.Subject.Token&subject_token_type=urn%3Aietf%3Aparams%3Aoauth%3Atoken-type%3Ajwt"
var responseBody = `{"access_token":"Sample.Access.Token","issued_token_type":"urn:ietf:params:oauth:token-type:access_token","token_type":"Bearer","expires_in":3600,"scope":"https://www.googleapis.com/auth/cloud-platform"}`
var expectedToken = STSTokenExchangeResponse{
AccessToken: "Sample.Access.Token",
@@ -48,34 +48,37 @@ var expectedToken = STSTokenExchangeResponse{
func TestExchangeToken(t *testing.T) {
ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
if r.Method != "POST" {
t.Errorf("Unexpected request method, %v is found", r.Method)
}
if r.URL.String() != "/" {
t.Errorf("Unexpected request URL, %v is found.", r.URL)
t.Errorf("Unexpected request URL, %v is found", r.URL)
}
headerAuth := r.Header.Get("Authorization")
if headerAuth != "Basic cmJyZ25vZ25yaG9uZ28zYmk0Z2I5Z2hnOWc6bm90c29zZWNyZXQ=" {
t.Errorf("Unexpected autohrization header, %v is found.", headerAuth)
t.Errorf("Unexpected autohrization header, %v is found", headerAuth)
}
headerContentType := r.Header.Get("Content-Type")
if headerContentType != "application/x-www-form-urlencoded" {
t.Errorf("Unexpected Content-Type header, %v is found.", headerContentType)
t.Errorf("Unexpected Content-Type header, %v is found", headerContentType)
}
body, err := ioutil.ReadAll(r.Body)
if err != nil {
t.Errorf("Failed reading request body: %s.", err)
t.Errorf("Failed reading request body: %v.", err)
}
if string(body) != requestbody {
t.Errorf("Unexpected exchange payload, %v is found.", string(body))
t.Errorf("Unexpected exchange payload, %v is found", string(body))
}
w.Header().Set("Content-Type", "application/json")
w.Write([]byte(responseBody))
}))
headers := make(map[string][]string)
headers["Content-Type"] = []string{"application/x-www-form-urlencoded"}
headers := http.Header{}
headers.Add("Content-Type", "application/x-www-form-urlencoded")
resp, err := ExchangeToken(context.Background(), ts.URL, &tokenRequest, auth, headers, nil)
if err != nil {
t.Fatalf("ExchangeToken failed with error: %s", err)
t.Fatalf("ExchangeToken failed with error: %v", err)
}
if diff := cmp.Diff(expectedToken, *resp); diff != "" {
@@ -90,10 +93,10 @@ func TestExchangeToken_Err(t *testing.T) {
w.Write([]byte("what's wrong with this response?"))
}))
headers := make(map[string][]string)
headers["Content-Type"] = []string{"application/x-www-form-urlencoded"}
headers := http.Header{}
headers.Add("Content-Type", "application/x-www-form-urlencoded")
_, err := ExchangeToken(context.Background(), ts.URL, &tokenRequest, auth, headers, nil)
if err == nil {
t.Errorf("Expected handled error; instead got nil.")
}
}
}