krombel/oauth2-old
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Support token expiration for Facebook OAuth 2.0.

Browse Source 
Facebook's OAuth 2.0 implementation seems to be broken and
returns expires_in value in expires. Fallback to expires field to
handle the expiration time for Facebook.
This commit is contained in:
Burcu Dogan
2014-10-21 10:43:33 -07:00
parent 7e2b7b4a79
commit 4b407cace1
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
oauth2.go
View File

@@ -25,6 +25,7 @@ type tokenRespBody struct {
TokenType string `json:"token_type"` TokenType string `json:"token_type"`
RefreshToken string `json:"refresh_token"` RefreshToken string `json:"refresh_token"`
ExpiresIn int64 `json:"expires_in"` // in seconds ExpiresIn int64 `json:"expires_in"` // in seconds
Expires int64 `json:"expires"` // in seconds. Facebook returns expires_in as expires.
IdToken string `json:"id_token"` IdToken string `json:"id_token"`
} }
@@ -223,6 +224,7 @@ func (c *Config) retrieveToken(v url.Values) (*Token, error) {
resp.TokenType = vals.Get("token_type") resp.TokenType = vals.Get("token_type")
resp.RefreshToken = vals.Get("refresh_token") resp.RefreshToken = vals.Get("refresh_token")
resp.ExpiresIn, _ = strconv.ParseInt(vals.Get("expires_in"), 10, 64) resp.ExpiresIn, _ = strconv.ParseInt(vals.Get("expires_in"), 10, 64)
resp.Expires, _ = strconv.ParseInt(vals.Get("expires"), 10, 64)
resp.IdToken = vals.Get("id_token") resp.IdToken = vals.Get("id_token")
default: default:
if err = json.Unmarshal(body, &resp); err != nil { if err = json.Unmarshal(body, &resp); err != nil {
@@ -239,11 +241,18 @@ func (c *Config) retrieveToken(v url.Values) (*Token, error) {
if resp.RefreshToken == "" { if resp.RefreshToken == "" {
token.RefreshToken = v.Get("refresh_token") token.RefreshToken = v.Get("refresh_token")
} }
if resp.ExpiresIn == 0 { if resp.ExpiresIn == 0 || resp.Expires == 0 {
token.Expiry = time.Time{} token.Expiry = time.Time{}
} else { }
if resp.ExpiresIn > 0 {
token.Expiry = time.Now().Add(time.Duration(resp.ExpiresIn) * time.Second) token.Expiry = time.Now().Add(time.Duration(resp.ExpiresIn) * time.Second)
} }
if resp.Expires > 0 {
// TODO(jbd): Facebook's OAuth2 implementation is broken and
// returns expires_in field in expires. Remove the fallback to expires,
// when Facebook fixes their implementation.
token.Expiry = time.Now().Add(time.Duration(resp.Expires) * time.Second)
}
if resp.IdToken != "" { if resp.IdToken != "" {
if token.Extra == nil { if token.Extra == nil {
token.Extra = make(map[string]string) token.Extra = make(map[string]string)