Use httpClient field in context for oauth2 calls

markbates · Jun 24, 2016 · e3a162c · e3a162c
1 parent 772461b
commit e3a162c
Show file tree

Hide file tree

Showing 44 changed files with 58 additions and 48 deletions.
diff --git a/provider.go b/provider.go
@@ -1,7 +1,12 @@
 package goth
 
-import "fmt"
-import "golang.org/x/oauth2"
+import (
+	"fmt"
+	"net/http"
+
+	"golang.org/x/net/context"
+	"golang.org/x/oauth2"
+)
 
 // Provider needs to be implemented for each 3rd party authentication provider
 // e.g. Facebook, Twitter, etc...
@@ -47,3 +52,11 @@ func GetProvider(name string) (Provider, error) {
 func ClearProviders() {
 	providers = Providers{}
 }
+
+// ContextForClient provides a context for use with oauth2.
+func ContextForClient(h *http.Client) context.Context {
+	if h == nil {
+		return oauth2.NoContext
+	}
+	return context.WithValue(oauth2.NoContext, oauth2.HTTPClient, h)
+}
diff --git a/providers/amazon/amazon.go b/providers/amazon/amazon.go
@@ -138,7 +138,7 @@ func (p *Provider) RefreshTokenAvailable() bool {
 //RefreshToken get new access token based on the refresh token
 func (p *Provider) RefreshToken(refreshToken string) (*oauth2.Token, error) {
 	token := &oauth2.Token{RefreshToken: refreshToken}
-	ts := p.config.TokenSource(oauth2.NoContext, token)
+	ts := p.config.TokenSource(goth.ContextForClient(p.Client), token)
 	newToken, err := ts.Token()
 	if err != nil {
 		return nil, err

diff --git a/providers/amazon/session.go b/providers/amazon/session.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"strings"
 	"time"
 )
@@ -30,7 +29,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Amazon and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/bitbucket/bitbucket.go b/providers/bitbucket/bitbucket.go
@@ -181,7 +181,7 @@ func (p *Provider) RefreshTokenAvailable() bool {
 //RefreshToken get new access token based on the refresh token
 func (p *Provider) RefreshToken(refreshToken string) (*oauth2.Token, error) {
 	token := &oauth2.Token{RefreshToken: refreshToken}
-	ts := p.config.TokenSource(oauth2.NoContext, token)
+	ts := p.config.TokenSource(goth.ContextForClient(p.Client), token)
 	newToken, err := ts.Token()
 	if err != nil {
 		return nil, err

diff --git a/providers/bitbucket/session.go b/providers/bitbucket/session.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"strings"
 	"time"
 )
@@ -28,7 +27,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Bitbucket and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/box/box.go b/providers/box/box.go
@@ -129,7 +129,7 @@ func (p *Provider) RefreshTokenAvailable() bool {
 //RefreshToken get new access token based on the refresh token
 func (p *Provider) RefreshToken(refreshToken string) (*oauth2.Token, error) {
 	token := &oauth2.Token{RefreshToken: refreshToken}
-	ts := p.config.TokenSource(oauth2.NoContext, token)
+	ts := p.config.TokenSource(goth.ContextForClient(p.Client), token)
 	newToken, err := ts.Token()
 	if err != nil {
 		return nil, err

diff --git a/providers/box/session.go b/providers/box/session.go
@@ -30,7 +30,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Box and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/cloudfoundry/cf.go b/providers/cloudfoundry/cf.go
@@ -140,7 +140,7 @@ func (p *Provider) RefreshTokenAvailable() bool {
 //RefreshToken get new access token based on the refresh token
 func (p *Provider) RefreshToken(refreshToken string) (*oauth2.Token, error) {
 	token := &oauth2.Token{RefreshToken: refreshToken}
-	ctx := context.WithValue(oauth2.NoContext, oauth2.HTTPClient, p.httpClient())
+	ctx := context.WithValue(goth.ContextForClient(p.Client), oauth2.HTTPClient, p.httpClient())
 	ts := p.config.TokenSource(ctx, token)
 	newToken, err := ts.Token()
 	if err != nil {

diff --git a/providers/cloudfoundry/session.go b/providers/cloudfoundry/session.go
@@ -32,7 +32,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Cloud Foundry and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	ctx := context.WithValue(oauth2.NoContext, oauth2.HTTPClient, p.Client)
+	ctx := context.WithValue(goth.ContextForClient(p.Client), oauth2.HTTPClient, p.Client)
 	token, err := p.config.Exchange(ctx, params.Get("code"))
 	if err != nil {
 		return "", err

diff --git a/providers/digitalocean/digitalocean.go b/providers/digitalocean/digitalocean.go
@@ -149,7 +149,7 @@ func (p *Provider) RefreshTokenAvailable() bool {
 //RefreshToken get new access token based on the refresh token
 func (p *Provider) RefreshToken(refreshToken string) (*oauth2.Token, error) {
 	token := &oauth2.Token{RefreshToken: refreshToken}
-	ts := p.config.TokenSource(oauth2.NoContext, token)
+	ts := p.config.TokenSource(goth.ContextForClient(p.Client), token)
 	newToken, err := ts.Token()
 	if err != nil {
 		return nil, err

diff --git a/providers/digitalocean/session.go b/providers/digitalocean/session.go
@@ -30,7 +30,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with DigitalOcean and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/dropbox/dropbox.go b/providers/dropbox/dropbox.go
@@ -103,7 +103,7 @@ func (s *Session) GetAuthURL() (string, error) {
 // Authorize the session with Dropbox and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/facebook/session.go b/providers/facebook/session.go
@@ -4,7 +4,6 @@ import (
 	"encoding/json"
 	"errors"
 	"github.com/markbates/goth"
-	"golang.org/x/oauth2"
 	"strings"
 	"time"
 )
@@ -27,7 +26,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Facebook and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/github/session.go b/providers/github/session.go
@@ -25,7 +25,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Github and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/gitlab/gitlab.go b/providers/gitlab/gitlab.go
@@ -140,7 +140,7 @@ func (p *Provider) RefreshTokenAvailable() bool {
 //RefreshToken get new access token based on the refresh token
 func (p *Provider) RefreshToken(refreshToken string) (*oauth2.Token, error) {
 	token := &oauth2.Token{RefreshToken: refreshToken}
-	ts := p.config.TokenSource(oauth2.NoContext, token)
+	ts := p.config.TokenSource(goth.ContextForClient(p.Client), token)
 	newToken, err := ts.Token()
 	if err != nil {
 		return nil, err

diff --git a/providers/gitlab/session.go b/providers/gitlab/session.go
@@ -30,7 +30,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Gitlab and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/gplus/gplus.go b/providers/gplus/gplus.go
@@ -153,7 +153,7 @@ func (p *Provider) RefreshTokenAvailable() bool {
 //RefreshToken get new access token based on the refresh token
 func (p *Provider) RefreshToken(refreshToken string) (*oauth2.Token, error) {
 	token := &oauth2.Token{RefreshToken: refreshToken}
-	ts := p.config.TokenSource(oauth2.NoContext, token)
+	ts := p.config.TokenSource(goth.ContextForClient(p.Client), token)
 	newToken, err := ts.Token()
 	if err != nil {
 		return nil, err

diff --git a/providers/gplus/session.go b/providers/gplus/session.go
@@ -28,7 +28,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Google+ and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/heroku/heroku.go b/providers/heroku/heroku.go
@@ -124,7 +124,7 @@ func (p *Provider) RefreshTokenAvailable() bool {
 //RefreshToken get new access token based on the refresh token
 func (p *Provider) RefreshToken(refreshToken string) (*oauth2.Token, error) {
 	token := &oauth2.Token{RefreshToken: refreshToken}
-	ts := p.config.TokenSource(oauth2.NoContext, token)
+	ts := p.config.TokenSource(goth.ContextForClient(p.Client), token)
 	newToken, err := ts.Token()
 	if err != nil {
 		return nil, err

diff --git a/providers/heroku/session.go b/providers/heroku/session.go
@@ -30,7 +30,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Heroku and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/influxcloud/session.go b/providers/influxcloud/session.go
@@ -26,7 +26,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Github and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/instagram/session.go b/providers/instagram/session.go
@@ -25,7 +25,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Instagram and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/linkedin/session.go b/providers/linkedin/session.go
@@ -26,7 +26,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Linkedin and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/onedrive/onedrive.go b/providers/onedrive/onedrive.go
@@ -136,7 +136,7 @@ func (p *Provider) RefreshTokenAvailable() bool {
 //RefreshToken get new access token based on the refresh token
 func (p *Provider) RefreshToken(refreshToken string) (*oauth2.Token, error) {
 	token := &oauth2.Token{RefreshToken: refreshToken}
-	ts := p.config.TokenSource(oauth2.NoContext, token)
+	ts := p.config.TokenSource(goth.ContextForClient(p.Client), token)
 	newToken, err := ts.Token()
 	if err != nil {
 		return nil, err

diff --git a/providers/onedrive/session.go b/providers/onedrive/session.go
@@ -30,7 +30,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Box and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/paypal/paypal.go b/providers/paypal/paypal.go
@@ -174,7 +174,7 @@ func (p *Provider) RefreshTokenAvailable() bool {
 //RefreshToken get new access token based on the refresh token
 func (p *Provider) RefreshToken(refreshToken string) (*oauth2.Token, error) {
 	token := &oauth2.Token{RefreshToken: refreshToken}
-	ts := p.config.TokenSource(oauth2.NoContext, token)
+	ts := p.config.TokenSource(goth.ContextForClient(p.Client), token)
 	newToken, err := ts.Token()
 	if err != nil {
 		return nil, err

diff --git a/providers/paypal/session.go b/providers/paypal/session.go
@@ -30,7 +30,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Paypal and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/salesforce/salesforce.go b/providers/salesforce/salesforce.go
@@ -134,7 +134,7 @@ func (p *Provider) RefreshTokenAvailable() bool {
 //RefreshToken get new access token based on the refresh token
 func (p *Provider) RefreshToken(refreshToken string) (*oauth2.Token, error) {
 	token := &oauth2.Token{RefreshToken: refreshToken}
-	ts := p.config.TokenSource(oauth2.NoContext, token)
+	ts := p.config.TokenSource(goth.ContextForClient(p.Client), token)
 	newToken, err := ts.Token()
 	if err != nil {
 		return nil, err

diff --git a/providers/salesforce/session.go b/providers/salesforce/session.go
@@ -38,7 +38,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Salesforce and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 
 	if err != nil {
 		return "", err

diff --git a/providers/slack/session.go b/providers/slack/session.go
@@ -30,7 +30,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Slack and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/soundcloud/session.go b/providers/soundcloud/session.go
@@ -30,7 +30,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Soundcloud and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/soundcloud/soundcloud.go b/providers/soundcloud/soundcloud.go
@@ -139,7 +139,7 @@ func (p *Provider) RefreshTokenAvailable() bool {
 //RefreshToken get new access token based on the refresh token
 func (p *Provider) RefreshToken(refreshToken string) (*oauth2.Token, error) {
 	token := &oauth2.Token{RefreshToken: refreshToken}
-	ts := p.config.TokenSource(oauth2.NoContext, token)
+	ts := p.config.TokenSource(goth.ContextForClient(p.Client), token)
 	newToken, err := ts.Token()
 	if err != nil {
 		return nil, err

diff --git a/providers/spotify/session.go b/providers/spotify/session.go
@@ -29,7 +29,7 @@ func (s Session) GetAuthURL() (string, error) {
 // token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/spotify/spotify.go b/providers/spotify/spotify.go
@@ -173,7 +173,7 @@ func (p *Provider) RefreshTokenAvailable() bool {
 //RefreshToken get new access token based on the refresh token
 func (p *Provider) RefreshToken(refreshToken string) (*oauth2.Token, error) {
 	token := &oauth2.Token{RefreshToken: refreshToken}
-	ts := p.config.TokenSource(oauth2.NoContext, token)
+	ts := p.config.TokenSource(goth.ContextForClient(p.Client), token)
 	newToken, err := ts.Token()
 	if err != nil {
 		return nil, err

diff --git a/providers/stripe/session.go b/providers/stripe/session.go
@@ -31,7 +31,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Stripe and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/stripe/stripe.go b/providers/stripe/stripe.go
@@ -132,7 +132,7 @@ func (p *Provider) RefreshTokenAvailable() bool {
 //RefreshToken get new access token based on the refresh token
 func (p *Provider) RefreshToken(refreshToken string) (*oauth2.Token, error) {
 	token := &oauth2.Token{RefreshToken: refreshToken}
-	ts := p.config.TokenSource(oauth2.NoContext, token)
+	ts := p.config.TokenSource(goth.ContextForClient(p.Client), token)
 	newToken, err := ts.Token()
 	if err != nil {
 		return nil, err

diff --git a/providers/twitch/session.go b/providers/twitch/session.go
@@ -30,7 +30,7 @@ func (s Session) GetAuthURL() (string, error) {
 // token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}

diff --git a/providers/twitch/twitch.go b/providers/twitch/twitch.go
@@ -180,7 +180,7 @@ func (p *Provider) RefreshTokenAvailable() bool {
 //RefreshToken get new access token based on the refresh token
 func (p *Provider) RefreshToken(refreshToken string) (*oauth2.Token, error) {
 	token := &oauth2.Token{RefreshToken: refreshToken}
-	ts := p.config.TokenSource(oauth2.NoContext, token)
+	ts := p.config.TokenSource(goth.ContextForClient(p.Client), token)
 	newToken, err := ts.Token()
 	if err != nil {
 		return nil, err

diff --git a/providers/uber/session.go b/providers/uber/session.go
@@ -30,7 +30,7 @@ func (s Session) GetAuthURL() (string, error) {
 // Authorize the session with Uber and return the access token to be stored for future use.
 func (s *Session) Authorize(provider goth.Provider, params goth.Params) (string, error) {
 	p := provider.(*Provider)
-	token, err := p.config.Exchange(oauth2.NoContext, params.Get("code"))
+	token, err := p.config.Exchange(goth.ContextForClient(p.Client), params.Get("code"))
 	if err != nil {
 		return "", err
 	}