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

google: Address additional comments for CredentialsParams support.

This commit is contained in:
Andy Zhao 2021-04-23 10:25:37 -07:00
parent 3a734b4293
commit eb92ab4a21
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
google/default.go
View File

@ -46,7 +46,7 @@ type DefaultCredentials = Credentials
// with a credentials file for building a Credentials object. // with a credentials file for building a Credentials object.
type CredentialsParams struct { type CredentialsParams struct {
// Scopes is the list OAuth scopes. Required. // Scopes is the list OAuth scopes. Required.
// Example: cloud-platform // Example: https://www.googleapis.com/auth/cloud-platform
Scopes []string Scopes []string
// Subject is the user email used for domain wide delegation (see // Subject is the user email used for domain wide delegation (see
@ -164,16 +164,16 @@ func FindDefaultCredentials(ctx context.Context, scopes ...string) (*Credentials
// CredentialsFromJSONWithParams obtains Google credentials from a JSON value. The JSON can // CredentialsFromJSONWithParams obtains Google credentials from a JSON value. The JSON can
// represent either a Google Developers Console client_credentials.json file (as in ConfigFromJSON), // represent either a Google Developers Console client_credentials.json file (as in ConfigFromJSON),
// a Google Developers service account key file, a gCloud-style user credentials file (a.k.a. // a Google Developers service account key file, a gcloud user credentials file (a.k.a. refresh
// refresh token JSON), or the JSON configuration file for workload identity federation in // token JSON), or the JSON configuration file for workload identity federation in non-Google cloud
// non-Google cloud platforms (see https://cloud.google.com/iam/docs/how-to#using-workload-identity-federation). // platforms (see https://cloud.google.com/iam/docs/how-to#using-workload-identity-federation).
func CredentialsFromJSONWithParams(ctx context.Context, jsonData []byte, params CredentialsParams) (*Credentials, error) { func CredentialsFromJSONWithParams(ctx context.Context, jsonData []byte, params CredentialsParams) (*Credentials, error) {
// Make defensive copy of the slices in params. // Make defensive copy of the slices in params.
params = params.deepCopy() params = params.deepCopy()
// First, attempt to parse jsonData as a Google Developers Console client_credentials.json. // First, attempt to parse jsonData as a Google Developers Console client_credentials.json.
config, err := ConfigFromJSON(jsonData, params.Scopes...) config, _ := ConfigFromJSON(jsonData, params.Scopes...)
if err == nil { if config != nil {
return &Credentials{ return &Credentials{
ProjectID: "", ProjectID: "",
TokenSource: authhandler.TokenSource(ctx, config, params.State, params.AuthHandler), TokenSource: authhandler.TokenSource(ctx, config, params.State, params.AuthHandler),
@ -183,7 +183,7 @@ func CredentialsFromJSONWithParams(ctx context.Context, jsonData []byte, params
// Otherwise, parse jsonData as one of the other supported credentials files. // Otherwise, parse jsonData as one of the other supported credentials files.
var f credentialsFile var f credentialsFile
if err = json.Unmarshal(jsonData, &f); err != nil { if err := json.Unmarshal(jsonData, &f); err != nil {
return nil, err return nil, err
} }
ts, err := f.tokenSource(ctx, params) ts, err := f.tokenSource(ctx, params)