Use Type() method for OAuth tokens instead of accessing TokenType field. (#1537)
This covers the case where the TokenType field is empty, and thus
calling the Type() method will return "Bearer".
diff --git a/credentials/oauth/oauth.go b/credentials/oauth/oauth.go
index 5ba7ac0..f6d597a 100644
--- a/credentials/oauth/oauth.go
+++ b/credentials/oauth/oauth.go
@@ -80,7 +80,7 @@
return nil, err
}
return map[string]string{
- "authorization": token.TokenType + " " + token.AccessToken,
+ "authorization": token.Type() + " " + token.AccessToken,
}, nil
}
@@ -100,7 +100,7 @@
func (oa oauthAccess) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) {
return map[string]string{
- "authorization": oa.token.TokenType + " " + oa.token.AccessToken,
+ "authorization": oa.token.Type() + " " + oa.token.AccessToken,
}, nil
}
@@ -134,7 +134,7 @@
}
}
return map[string]string{
- "authorization": s.t.TokenType + " " + s.t.AccessToken,
+ "authorization": s.t.Type() + " " + s.t.AccessToken,
}, nil
}
diff --git a/interop/test_utils.go b/interop/test_utils.go
index c9068d8..36285d3 100644
--- a/interop/test_utils.go
+++ b/interop/test_utils.go
@@ -378,7 +378,7 @@
FillOauthScope: proto.Bool(true),
}
token := GetToken(serviceAccountKeyFile, oauthScope)
- kv := map[string]string{"authorization": token.TokenType + " " + token.AccessToken}
+ kv := map[string]string{"authorization": token.Type() + " " + token.AccessToken}
ctx := metadata.NewOutgoingContext(context.Background(), metadata.MD{"authorization": []string{kv["authorization"]}})
reply, err := tc.UnaryCall(ctx, req)
if err != nil {
