third_codes/oauth2
1
0
Fork 0
mirror of https://github.com/golang/oauth2.git synced 2025-07-21 00:00:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:golang/oauth2

Browse Source
This commit is contained in:
Burcu Dogan 2014-09-03 11:51:08 -07:00
commit cf75ced13b
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
jwt.go
View File

@ -10,6 +10,8 @@ import (
"encoding/json" "encoding/json"
"encoding/pem" "encoding/pem"
"errors" "errors"
"fmt"
"io/ioutil"
"net/http" "net/http"
"net/url" "net/url"
"strings" "strings"
@ -95,7 +97,7 @@ func (c *JWTConfig) NewTransportWithUser(user string) *Transport {
// fetchToken retrieves a new access token and updates the existing token // fetchToken retrieves a new access token and updates the existing token
// with the newly fetched credentials. // with the newly fetched credentials.
func (c *JWTConfig) FetchToken(existing *Token) (token *Token, err error) { func (c *JWTConfig) FetchToken(existing *Token) (*Token, error) {
if existing == nil { if existing == nil {
existing = &Token{} existing = &Token{}
} }
@ -115,7 +117,7 @@ func (c *JWTConfig) FetchToken(existing *Token) (token *Token, err error) {
payload, err := jws.Encode(defaultHeader, claimSet, c.key) payload, err := jws.Encode(defaultHeader, claimSet, c.key)
if err != nil { if err != nil {
return return nil, err
} }
v := url.Values{} v := url.Values{}
v.Set("grant_type", defaultGrantType) v.Set("grant_type", defaultGrantType)
@ -124,22 +126,23 @@ func (c *JWTConfig) FetchToken(existing *Token) (token *Token, err error) {
// Make a request with assertion to get a new token. // Make a request with assertion to get a new token.
resp, err := c.Client.PostForm(c.aud.String(), v) resp, err := c.Client.PostForm(c.aud.String(), v)
if err != nil { if err != nil {
return nil, err return nil, fmt.Errorf("oauth2: cannot fetch token: %v", err)
} }
defer resp.Body.Close() defer resp.Body.Close()
if resp.StatusCode != 200 { body, err := ioutil.ReadAll(resp.Body)
// TODO(jbd): Provide more context about the response. if err != nil {
return nil, errors.New("Cannot fetch token, response: " + resp.Status) return nil, fmt.Errorf("oauth2: cannot fetch token: %v", err)
}
if c := resp.StatusCode; c < 200 || c > 299 {
return nil, fmt.Errorf("oauth2: cannot fetch token: %v\nResponse: %s", resp.Status, body)
} }
b := &tokenRespBody{} b := &tokenRespBody{}
err = json.NewDecoder(resp.Body).Decode(b) if err := json.Unmarshal(body, b); err != nil {
if err != nil { return nil, fmt.Errorf("oauth2: cannot fetch token: %v", err)
return nil, err
} }
token = &Token{ token := &Token{
AccessToken: b.AccessToken, AccessToken: b.AccessToken,
TokenType: b.TokenType, TokenType: b.TokenType,
Subject: existing.Subject, Subject: existing.Subject,
@ -150,14 +153,14 @@ func (c *JWTConfig) FetchToken(existing *Token) (token *Token, err error) {
claimSet := &jws.ClaimSet{} claimSet := &jws.ClaimSet{}
claimSet, err = jws.Decode(b.IdToken) claimSet, err = jws.Decode(b.IdToken)
if err != nil { if err != nil {
return return nil, fmt.Errorf("oauth2: cannot fetch token: %v", err)
} }
token.Expiry = time.Unix(claimSet.Exp, 0) token.Expiry = time.Unix(claimSet.Exp, 0)
return return token, nil
} }
token.Expiry = time.Now().Add(time.Duration(b.ExpiresIn) * time.Second) token.Expiry = time.Now().Add(time.Duration(b.ExpiresIn) * time.Second)
return return token, nil
} }
// parseKey converts the binary contents of a private key file // parseKey converts the binary contents of a private key file

5
oauth2.go
View File

@ -160,11 +160,6 @@ func (c *Config) AuthCodeURL(state string) (authURL string) {
// initialize the new transport with a token, so after creation, // initialize the new transport with a token, so after creation,
// you need to set a valid token (or an expired token with a valid // you need to set a valid token (or an expired token with a valid
// refresh token) in order to be able to do authorized requests. // refresh token) in order to be able to do authorized requests.
//
// Example:
// t, _ := c.NewTransport()
// t.SetToken(validToken)
//
func (c *Config) NewTransport() *Transport { func (c *Config) NewTransport() *Transport {
return NewTransport(c.Transport, c, nil) return NewTransport(c.Transport, c, nil)
} }