diff options
author | Niall Sheridan <nsheridan@gmail.com> | 2016-09-03 20:56:02 +0100 |
---|---|---|
committer | Niall Sheridan <nsheridan@gmail.com> | 2016-09-03 21:16:02 +0100 |
commit | 84e4e2d56d3e2878741a2d03a98d4739db8dbd50 (patch) | |
tree | df9d3e92071291fd154f149072e470d8cecbfd11 /vendor/golang.org/x/oauth2/google | |
parent | eb9015e8f6f92e3e4421ddaf74ad20960723596c (diff) |
Update dependencies
Also tweak travis config
Diffstat (limited to 'vendor/golang.org/x/oauth2/google')
-rw-r--r-- | vendor/golang.org/x/oauth2/google/google.go | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vendor/golang.org/x/oauth2/google/google.go b/vendor/golang.org/x/oauth2/google/google.go index 82399b0..a48d5bf 100644 --- a/vendor/golang.org/x/oauth2/google/google.go +++ b/vendor/golang.org/x/oauth2/google/google.go @@ -89,6 +89,7 @@ func JWTConfigFromJSON(jsonKey []byte, scope ...string) (*jwt.Config, error) { Email string `json:"client_email"` PrivateKey string `json:"private_key"` PrivateKeyID string `json:"private_key_id"` + TokenURL string `json:"token_uri"` } if err := json.Unmarshal(jsonKey, &key); err != nil { return nil, err @@ -98,7 +99,10 @@ func JWTConfigFromJSON(jsonKey []byte, scope ...string) (*jwt.Config, error) { PrivateKey: []byte(key.PrivateKey), PrivateKeyID: key.PrivateKeyID, Scopes: scope, - TokenURL: JWTTokenURL, + TokenURL: key.TokenURL, + } + if config.TokenURL == "" { + config.TokenURL = JWTTokenURL } return config, nil } |