opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use Type() method for OAuth tokens instead of accessing TokenType field. (#1537)

Browse Source 
This covers the case where the TokenType field is empty, and thus
calling the Type() method will return "Bearer".
This commit is contained in:
Sean Harger
2017-09-25 11:38:05 -07:00
committed by dfawley
parent d4b75ebd4f
commit 956d689a24
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
credentials/oauth/oauth.go
View File

@ -80,7 +80,7 @@ func (j jwtAccess) GetRequestMetadata(ctx context.Context, uri ...string) (map[s
return nil, err return nil, err
} }
return map[string]string{ return map[string]string{
"authorization": token.TokenType + " " + token.AccessToken, "authorization": token.Type() + " " + token.AccessToken,
}, nil }, nil
} }
@ -100,7 +100,7 @@ func NewOauthAccess(token *oauth2.Token) credentials.PerRPCCredentials {
func (oa oauthAccess) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) { func (oa oauthAccess) GetRequestMetadata(ctx context.Context, uri ...string) (map[string]string, error) {
return map[string]string{ return map[string]string{
"authorization": oa.token.TokenType + " " + oa.token.AccessToken, "authorization": oa.token.Type() + " " + oa.token.AccessToken,
}, nil }, nil
} }
@ -134,7 +134,7 @@ func (s *serviceAccount) GetRequestMetadata(ctx context.Context, uri ...string)
} }
} }
return map[string]string{ return map[string]string{
"authorization": s.t.TokenType + " " + s.t.AccessToken, "authorization": s.t.Type() + " " + s.t.AccessToken,
}, nil }, nil
} }

2
interop/test_utils.go
View File

@ -378,7 +378,7 @@ func DoPerRPCCreds(tc testpb.TestServiceClient, serviceAccountKeyFile, oauthScop
FillOauthScope: proto.Bool(true), FillOauthScope: proto.Bool(true),
} }
token := GetToken(serviceAccountKeyFile, oauthScope) 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"]}}) ctx := metadata.NewOutgoingContext(context.Background(), metadata.MD{"authorization": []string{kv["authorization"]}})
reply, err := tc.UnaryCall(ctx, req) reply, err := tc.UnaryCall(ctx, req)
if err != nil { if err != nil {