change oauth library, add and tests oauth callback

Author: Duke

auth_test.go

@@ -2,12 +2,14 @@ package auth
 
 import (
 	"bytes"
-	"log"
 	"net/http"
+	"net/http/httptest"
 	"net/url"
 	"strings"
 	"testing"
 
+	"github.com/stretchr/testify/mock"
+
 	. "gopkg.in/check.v1"
 )
 
@@ -18,17 +20,18 @@ type AuthSuite struct{}
 var _ = Suite(&AuthSuite{})
 
 func (s *AuthSuite) TestNewAuth(c *C) {
-	providers := []Provider{Provider{Name: "Duke", Key: "CsE34", Secret: "Aeee", Scope: "email", RedirectURL: "/d"}}
+	providers := []Provider{Provider{Name: "Duke", Key: "CsE34", Secret: "Aeee", Scopes: []string{"email"}, RedirectURL: "/d"}}
+
 	auth := NewAuth()
 	auth.NewProviders(providers)
 
 	client := *auth.Providers["Duke"]
 
-	c.Assert(client.Auth.ClientId, Equals, providers[0].Key)
+	c.Assert(client.Auth.ClientID, Equals, providers[0].Key)
 }
 
 func (s *AuthSuite) TestAuthorizerOAuthRedirect(c *C) {
-	provider := Provider{Name: "facebook", Key: "CsE34", Secret: "Aeee", Scope: "email", RedirectURL: "/d"}
+	provider := Provider{Name: "facebook", Key: "CsE34", Secret: "Aeee", Scopes: []string{"email"}, RedirectURL: "/d"}
 	providerRedirectTo := "/?client_id=CsE34&redirect_uri=%2Fd&response_type=code&scope=email"
 
 	auth := NewAuth()
@@ -107,18 +110,32 @@ func (s *AuthSuite) TestOAuthCallbackWithoutCode(c *C) {
 
 func (s *AuthSuite) TestOAuthCallback(c *C) {
 	oauthServer := mockHTTP(func(w http.ResponseWriter, r *http.Request) {
-		log.Println(r.URL)
 		w.WriteHeader(200)
-		w.Write([]byte(`{"access_token": "abc123", "refresh_token": "323", "expires_in": 0}`))
+		if r.URL.String() == "/token" {
+			w.Write([]byte("access_token=90d64460d14870c08c81352a05dedd3465940a7c&scope=user&token_type=bearer"))
+		} else {
+			w.Write([]byte(`{"name": "Test"}`))
+		}
 	})
 
+	h := mockUserHelper()
+
 	provider := Provider{Name: "facebook", UserInfoURL: oauthServer.URL, TokenURL: oauthServer.URL + "/token"}
 	auth := NewAuth()
 	auth.NewProvider(provider)
+	auth.Helper = h
 
 	data := url.Values{}
 	data.Set("code", "123")
-	r := httpTest(auth.OAuthCallback("facebook"), "POST", strings.NewReader(data.Encode()), "application/x-www-form-urlencoded")
+
+	h.On("FindUserFromOAuth", "facebook", mock.AnythingOfType("*auth.User"), mock.AnythingOfType("*http.Response")).Return("e3123", nil)
+	handle := func(w http.ResponseWriter, r *http.Request) {
+		id, err := auth.OAuthCallback("facebook", w, r)
+		c.Assert(id, Equals, "e3123")
+		c.Assert(err, Not(NotNil))
+	}
+
+	r := httpTest(handle, "POST", strings.NewReader(data.Encode()), "application/x-www-form-urlencoded")
 	c.Assert(r.Code, Equals, http.StatusOK)
 }
 

helper_test.go

@@ -30,6 +30,16 @@ func (h *userHelper) FindUserDataByEmail(email string) (string, bool) {
 	return args.String(0), args.Bool(1)
 }
 
+func (h *userHelper) FindUserByToken(token string) (string, bool) {
+	args := h.Called(token)
+	return args.String(0), args.Bool(1)
+}
+
+func (h *userHelper) FindUserFromOAuth(provider string, user *User, r *http.Response) (string, error) {
+	args := h.Called(provider, user, r)
+	return args.String(0), args.Error(1)
+}
+
 func mockUserHelper() *userHelper {
 	return new(userHelper)
 }

http.go

@@ -2,10 +2,9 @@ package auth
 
 import (
 	"encoding/json"
-	"log"
 	"net/http"
 
-	"code.google.com/p/goauth2/oauth"
+	oauth "golang.org/x/oauth2"
 )
 
 type emailPasswordParams struct {
@@ -70,53 +69,38 @@ func (a *Auth) SignIn(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-// The oauth endpoint callback, configured on provider, Send provider name as params and method will return http handle
+// The oauth endpoint callback, configured on provider, Send provider name as params
+// OAuthCallback will receive code params from provider and get user information
 //
 //	```
-//	GET   /auth/callback/google     auth.OAuthCallback("google")
-//	GET   /auth/callback/facebook   auth.OAuthCallback("facebook")
+//	GET   /auth/google/callback     http.HandlerFunc -> auth.OAuthCallback("google", w, r)
+
+//	GET   /auth/facebook/callback   http.HandlerFunc -> auth.OAuthCallback("facebook", w, r)
 //	```
-func (a *Auth) OAuthCallback(providerName string) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		// userId, err := a.oAuthUser(providerName, request)
-		a.oAuthUser(providerName, w, r)
-		//if err != nil {
-		//http.Redirect(w, request, b.URLS.SignIn, http.StatusTemporaryRedirect)
-		//} else {
-		//b.login(request, w, strconv.FormatInt(userId, 10))
-		//}
-	}
+func (a *Auth) OAuthCallback(providerName string, w http.ResponseWriter, r *http.Request) (string, error) {
+	return a.oAuthUser(providerName, w, r)
 }
 
-// OAuthCallback receive code params from provider and get user information
-func (a *Auth) oAuthUser(providerName string, w http.ResponseWriter, r *http.Request) {
-	provider := a.Providers[providerName]
+func (a *Auth) oAuthUser(providerName string, w http.ResponseWriter, r *http.Request) (userID string, err error) {
 	code := r.FormValue("code")
-	t := &oauth.Transport{Config: provider.Auth}
-
-	token, errx := t.Exchange(code)
-	log.Println(t.Token)
-	log.Println(t.TokenCache)
-	log.Println("TOKEN", code, token, errx)
-
-	// response, err := t.Client().Get(provider.UserInfoURL)
-	//if err != nil {
-	//	log.Println(err)
-
-	//	w.WriteHeader(http.StatusBadRequest)
-	//	return
-	//}
-	//defer response.Body.Close()
+	provider := a.Providers[providerName]
+	token, err := provider.Auth.Exchange(oauth.NoContext, code)
+	if err != nil {
+		return
+	}
+	client := provider.Auth.Client(oauth.NoContext, token)
+	response, err := client.Get(provider.UserInfoURL)
+	if err != nil {
+		return
+	}
+	defer response.Body.Close()
 
-	//log.Println(ioutil.ReadAll(response.Body))
-	//
-	// 	var user User
-	// 	decoder := json.NewDecoder(responseAuth.Body)
-	// 	user.Token = NewUserToken()
-	// 	err := decoder.Decode(&user)
-	// 	if err != nil {
-	// 		panic(err)
-	// 	}
-	//
-	// 	return b.UserSetupFn(provider, &user, responseAuth)
+	var user User
+	decoder := json.NewDecoder(response.Body)
+	err = decoder.Decode(&user)
+	// user.Token = NewUserToken()
+	if err != nil {
+		return
+	}
+	return a.Helper.FindUserFromOAuth(providerName, &user, response)
 }

provider.go

@@ -1,6 +1,6 @@
 package auth
 
-import "code.google.com/p/goauth2/oauth"
+import oauth "golang.org/x/oauth2"
 
 // Provider is a oauth2 provider, like facebook or google
 // 	Name is the provider name, the package use it as a index.
@@ -19,7 +19,7 @@ type Provider struct {
 	TokenURL    string
 	AuthURL     string
 	UserInfoURL string
-	Scope       string
+	Scopes      []string
 }
 
 // Email/Password default provider
@@ -41,12 +41,14 @@ func (b *Auth) NewProviders(providers []Provider) {
 
 func (a *Auth) NewProvider(p Provider) {
 	config := &oauth.Config{
-		ClientId:     p.Key,
+		ClientID:     p.Key,
 		ClientSecret: p.Secret,
 		RedirectURL:  p.RedirectURL,
-		Scope:        p.Scope,
-		AuthURL:      p.AuthURL,
-		TokenURL:     p.TokenURL,
+		Scopes:       p.Scopes,
+		Endpoint: oauth.Endpoint{
+			AuthURL:  p.AuthURL,
+			TokenURL: p.TokenURL,
+		},
 	}
 
 	provider := new(builderConfig)

user.go

@@ -1,5 +1,14 @@
 package auth
 
+import (
+	"encoding/base64"
+	"math/rand"
+	"net/http"
+	"strconv"
+	"strings"
+	"time"
+)
+
 // UserHelper interface has some important method to auth works
 //
 // PasswordByEmail func(email string) (string, bool)