Merge pull request #81 from buu700/fix-gae-context

orian: Fix a problem with not getting the correct Context on App Engine

config.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"golang.org/x/crypto/bcrypt"
+	"golang.org/x/net/context"
 )
 
 // Config holds all the configuration for both authboss and it's modules.
@@ -113,6 +114,8 @@ type Config struct {
 	// Mailer is the mailer being used to send e-mails out. Authboss defines two loggers for use
 	// LogMailer and SMTPMailer, the default is a LogMailer to io.Discard.
 	Mailer Mailer
+	// ContextProvider provides a context for a given request
+	ContextProvider func(*http.Request) context.Context
 }
 
 // Defaults sets the configuration's default values.
@@ -163,4 +166,7 @@ func (c *Config) Defaults() {
 
 	c.LogWriter = NewDefaultLogger()
 	c.Mailer = LogMailer(ioutil.Discard)
+	c.ContextProvider = func(req *http.Request) context.Context {
+		return context.TODO()
+	}
 }

internal/response/bindata.go

@@ -287,14 +287,14 @@ func AssetNames() []string {
 
 // _bindata is a table, holding each asset generator, mapped to its name.
 var _bindata = map[string]func() (*asset, error){
-	"confirm_email.html.tpl": confirm_emailHtmlTpl,
+	"confirm_email.html.tpl":    confirm_emailHtmlTpl,
-	"confirm_email.txt.tpl": confirm_emailTxtTpl,
+	"confirm_email.txt.tpl":     confirm_emailTxtTpl,
-	"login.html.tpl": loginHtmlTpl,
+	"login.html.tpl":            loginHtmlTpl,
-	"recover.html.tpl": recoverHtmlTpl,
+	"recover.html.tpl":          recoverHtmlTpl,
 	"recover_complete.html.tpl": recover_completeHtmlTpl,
-	"recover_email.html.tpl": recover_emailHtmlTpl,
+	"recover_email.html.tpl":    recover_emailHtmlTpl,
-	"recover_email.txt.tpl": recover_emailTxtTpl,
+	"recover_email.txt.tpl":     recover_emailTxtTpl,
-	"register.html.tpl": registerHtmlTpl,
+	"register.html.tpl":         registerHtmlTpl,
 }
 
 // AssetDir returns the file names below a certain
@@ -336,15 +336,16 @@ type bintree struct {
 	Func     func() (*asset, error)
 	Children map[string]*bintree
 }
+
 var _bintree = &bintree{nil, map[string]*bintree{
-	"confirm_email.html.tpl": &bintree{confirm_emailHtmlTpl, map[string]*bintree{}},
+	"confirm_email.html.tpl":    &bintree{confirm_emailHtmlTpl, map[string]*bintree{}},
-	"confirm_email.txt.tpl": &bintree{confirm_emailTxtTpl, map[string]*bintree{}},
+	"confirm_email.txt.tpl":     &bintree{confirm_emailTxtTpl, map[string]*bintree{}},
-	"login.html.tpl": &bintree{loginHtmlTpl, map[string]*bintree{}},
+	"login.html.tpl":            &bintree{loginHtmlTpl, map[string]*bintree{}},
-	"recover.html.tpl": &bintree{recoverHtmlTpl, map[string]*bintree{}},
+	"recover.html.tpl":          &bintree{recoverHtmlTpl, map[string]*bintree{}},
 	"recover_complete.html.tpl": &bintree{recover_completeHtmlTpl, map[string]*bintree{}},
-	"recover_email.html.tpl": &bintree{recover_emailHtmlTpl, map[string]*bintree{}},
+	"recover_email.html.tpl":    &bintree{recover_emailHtmlTpl, map[string]*bintree{}},
-	"recover_email.txt.tpl": &bintree{recover_emailTxtTpl, map[string]*bintree{}},
+	"recover_email.txt.tpl":     &bintree{recover_emailTxtTpl, map[string]*bintree{}},
-	"register.html.tpl": &bintree{registerHtmlTpl, map[string]*bintree{}},
+	"register.html.tpl":         &bintree{registerHtmlTpl, map[string]*bintree{}},
 }}
 
 // RestoreAsset restores an asset under the given directory
@@ -393,4 +394,3 @@ func _filePath(dir, name string) string {
 	cannonicalName := strings.Replace(name, "\\", "/", -1)
 	return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
 }
-

oauth2.go

@@ -3,6 +3,7 @@ package authboss
 import (
 	"net/url"
 
+	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 )
 
@@ -35,5 +36,5 @@ database/driver.Valuer.
 type OAuth2Provider struct {
 	OAuth2Config     *oauth2.Config
 	AdditionalParams url.Values
-	Callback         func(oauth2.Config, *oauth2.Token) (Attributes, error)
+	Callback         func(context.Context, oauth2.Config, *oauth2.Token) (Attributes, error)
 }

oauth2/oauth2.go

@@ -168,12 +168,12 @@ func (o *OAuth2) oauthCallback(ctx *authboss.Context, w http.ResponseWriter, r *
 
 	// Get the code
 	code := r.FormValue("code")
-	token, err := exchanger(cfg.OAuth2Config, oauth2.NoContext, code)
+	token, err := exchanger(cfg.OAuth2Config, o.Config.ContextProvider(r), code)
 	if err != nil {
 		return fmt.Errorf("Could not validate oauth2 code: %v", err)
 	}
 
-	user, err := cfg.Callback(*cfg.OAuth2Config, token)
+	user, err := cfg.Callback(o.Config.ContextProvider(r), *cfg.OAuth2Config, token)
 	if err != nil {
 		return err
 	}

oauth2/oauth2_test.go

@@ -143,7 +143,7 @@ func TestOAuthSuccess(t *testing.T) {
 		Expiry:       expiry,
 	}
 
-	fakeCallback := func(_ oauth2.Config, _ *oauth2.Token) (authboss.Attributes, error) {
+	fakeCallback := func(_ context.Context, _ oauth2.Config, _ *oauth2.Token) (authboss.Attributes, error) {
 		return authboss.Attributes{
 			authboss.StoreOAuth2UID: "uid",
 			authboss.StoreEmail:     "email",

oauth2/providers.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"net/http"
 
+	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 	"gopkg.in/authboss.v0"
 )
@@ -22,8 +23,8 @@ type googleMeResponse struct {
 var clientGet = (*http.Client).Get
 
 // Google is a callback appropriate for use with Google's OAuth2 configuration.
-func Google(cfg oauth2.Config, token *oauth2.Token) (authboss.Attributes, error) {
+func Google(ctx context.Context, cfg oauth2.Config, token *oauth2.Token) (authboss.Attributes, error) {
-	client := cfg.Client(oauth2.NoContext, token)
+	client := cfg.Client(ctx, token)
 	resp, err := clientGet(client, googleInfoEndpoint)
 	if err != nil {
 		return nil, err
@@ -49,8 +50,8 @@ type facebookMeResponse struct {
 }
 
 // Facebook is a callback appropriate for use with Facebook's OAuth2 configuration.
-func Facebook(cfg oauth2.Config, token *oauth2.Token) (authboss.Attributes, error) {
+func Facebook(ctx context.Context, cfg oauth2.Config, token *oauth2.Token) (authboss.Attributes, error) {
-	client := cfg.Client(oauth2.NoContext, token)
+	client := cfg.Client(ctx, token)
 	resp, err := clientGet(client, facebookInfoEndpoint)
 	if err != nil {
 		return nil, err

oauth2/providers_test.go

@@ -7,6 +7,7 @@ import (
 	"testing"
 	"time"
 
+	"golang.org/x/net/context"
 	"golang.org/x/oauth2"
 	"gopkg.in/authboss.v0"
 )
@@ -31,7 +32,7 @@ func TestGoogle(t *testing.T) {
 		Expiry:       time.Now().Add(60 * time.Minute),
 	}
 
-	user, err := Google(cfg, tok)
+	user, err := Google(context.TODO(), cfg, tok)
 	if err != nil {
 		t.Error(err)
 	}
@@ -64,7 +65,7 @@ func TestFacebook(t *testing.T) {
 		Expiry:       time.Now().Add(60 * time.Minute),
 	}
 
-	user, err := Facebook(cfg, tok)
+	user, err := Facebook(context.TODO(), cfg, tok)
 	if err != nil {
 		t.Error(err)
 	}