refactor test

apple/apple.go

@@ -1,10 +1,11 @@
-package appleauth
+package apple
 
 import (
 	"time"
 
 	"github.com/dgrijalva/jwt-go"
-	auth "github.com/thaitanloi365/go-social-auth"
+	"github.com/thaitanloi365/go-social-auth/errs"
+	"github.com/thaitanloi365/go-social-auth/utils"
 )
 
 // TokenResponse response
@@ -72,26 +73,26 @@ func (c *Config) Login(token string) (*TokenResponse, error) {
 
 	}
 
-	err = auth.DecodeTypedWeakly(&claims, &result)
+	err = utils.DecodeTypedWeakly(&claims, &result)
 	if err != nil {
 		return nil, err
 	}
 
 	if c.Iss != "" {
 		if result.Iss != c.Iss {
-			return nil, auth.ErrIssuerInvalid
+			return nil, errs.ErrIssuerInvalid
 		}
 	}
 
 	if c.Aud != "" {
 		if result.Aud != c.Aud {
-			return nil, auth.ErrAudienceInvalid
+			return nil, errs.ErrAudienceInvalid
 		}
 	}
 
 	if !c.SkipExpiry {
 		if result.Exp < time.Now().Unix() {
-			return nil, auth.ErrTokenExpired
+			return nil, errs.ErrTokenExpired
 		}
 	}
 

apple/apple_test.go

@@ -1,4 +1,4 @@
-package appleauth
+package apple
 
 import (
 	"fmt"

errs.go → errs/errs.go

@@ -1,4 +1,4 @@
-package auth
+package errs
 
 // Error err
 type Error struct {

facebook/err.go

@@ -1,4 +1,4 @@
-package facebookauth
+package facebook
 
 // Err err
 type Err struct {

facebook/facebook.go

@@ -1,4 +1,4 @@
-package facebookauth
+package facebook
 
 import (
 	"encoding/json"
@@ -8,10 +8,10 @@ import (
 	"net/url"
 	"strings"
 
-	auth "github.com/thaitanloi365/go-social-auth"
+	"github.com/thaitanloi365/go-social-auth/errs"
+	"github.com/thaitanloi365/go-social-auth/utils"
 )
 
-// TokenResponse response
 type TokenResponse struct {
 	ID        string `json:"id"`
 	Email     string `json:"email"`
@@ -20,43 +20,77 @@ type TokenResponse struct {
 	Name      string `json:"name"`
 }
 
-// Config config
+type debugTokenResponse struct {
+	Data struct {
+		AppID               string `json:"app_id"`
+		Type                string `json:"type"`
+		Application         string `json:"application"`
+		DataAccessExpiresAt int    `json:"data_access_expires_at"`
+		ExpiresAt           int    `json:"expires_at"`
+		IsValid             bool   `json:"is_valid"`
+		Metadata            struct {
+			AuthType string `json:"auth_type"`
+		} `json:"metadata"`
+		Scopes []string `json:"scopes"`
+		UserID string   `json:"user_id"`
+	} `json:"data"`
+}
+
 type Config struct {
 	Scopes []string `json:"scopes"`
 	URL    string   `json:"url"`
+	AppID  string   `json:"app_id"`
 }
 
-// New new
 func New() *Config {
 	return &Config{
 		URL:    "https://graph.facebook.com",
 		Scopes: []string{"id", "email", "first_name", "last_name", "name"},
 	}
 }
 
-// WithURL override url
 func (c *Config) WithURL(url string) *Config {
 	c.URL = url
 	return c
 }
 
-// WithScopes override scopes
+func (c *Config) WithAppID(id string) *Config {
+	c.AppID = id
+	return c
+}
 func (c *Config) WithScopes(scopes []string) *Config {
 	c.Scopes = scopes
 	return c
 }
 
-func isValidFacebookToken(accessToken string) bool {
-	// TODO fixed me https://developers.facebook.com/tools/explorer/?method=GET&path=debug_token%3Finput_token%3D%257Binput-token%257D&version=v6.0
+func (c *Config) isValidFacebookToken(accessToken string) bool {
+	if c.AppID != "" {
+		var url = fmt.Sprintf("%s/debug_token?input_token=%s&access_token=%s", c.URL, url.QueryEscape(accessToken), url.QueryEscape(accessToken))
+		resp, err := http.Get(url)
+		if err != nil {
+			return false
+		}
+		defer resp.Body.Close()
+
+		responseData, err := ioutil.ReadAll(resp.Body)
+		if err != nil {
+			return false
+		}
+
+		var debugToken debugTokenResponse
+		if err = json.Unmarshal(responseData, &debugToken); err == nil {
+			return debugToken.Data.AppID == c.AppID
+		}
 
+	}
 	return true
 }
 
 // Login login
 func (c *Config) Login(accessToken string) (*TokenResponse, error) {
 	var result TokenResponse
-	if !isValidFacebookToken(accessToken) {
-		return nil, auth.ErrTokenInvalid
+	if !c.isValidFacebookToken(accessToken) {
+		return nil, errs.ErrTokenInvalid
 	}
 	var scopes = strings.Join(c.Scopes, ",")
 	var url = fmt.Sprintf("%s/me?fields=%s&access_token=%s", c.URL, scopes, url.QueryEscape(accessToken))
@@ -79,7 +113,7 @@ func (c *Config) Login(accessToken string) (*TokenResponse, error) {
 
 	if value, ok := responseMap["error"].(map[string]interface{}); ok {
 		var e Err
-		err = auth.DecodeTypedWeakly(&value, &e)
+		err = utils.DecodeTypedWeakly(&value, &e)
 		if err != nil {
 			return nil, err
 		}
@@ -91,7 +125,7 @@ func (c *Config) Login(accessToken string) (*TokenResponse, error) {
 		return nil, fmt.Errorf("%s", value.(string))
 	}
 
-	err = auth.DecodeTypedWeakly(&responseMap, &result)
+	err = utils.DecodeTypedWeakly(&responseMap, &result)
 	if err != nil {
 		return nil, err
 	}

facebook/facebook_test.go

@@ -1,19 +1,17 @@
-package facebookauth
+package facebook
 
 import (
-	"fmt"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/thaitanloi365/go-social-auth/utils"
 )
 
 func TestLoginFacebook(t *testing.T) {
-	// var token = "EAACejEGlyekBAKoV7PZAIo3qj8e7VcQZCihlW0E9GnjlioIcIt8vEnAb9KNJcpi8zSCZA0H42ZAa7YvGz3ctgqMj78fZARYCBiPikLZBZCsAiGakXA2iXUT8JPVIoGlI0ot2fWlgk6ZAxzbZB1j5qWNden5pwN27GyHwh5XSizffDxVAl1PZCZAVfquLE6MfGcs2iP0ZC5UbNumE7NM50obI0HkPQS90pt0LYSdbsKf2qtBIZBAZDZD"
-	var token = "asdf"
-	var facebookauth = New()
+	var token = "EAAC2I0ITd0MBAARDwFhCZCY9WI7vTgkiQ5jjiRFyxKiO2vPeYvD2AzIR9TQoHoSZAkLWCttZCEtjV9bd4jWZBMvvFhkniPyYrG8HTSCIUPdcuo9JBpqVY2dOM4nskUK1vFeVPx5fTrtmoQOd3j0qZA98pzW1tT1584MUDuBkCtJQBBQhjtVgH3WZAde0BZCZANQjAbdp7WvIxhZCoV94rvUXz"
+	var facebookauth = New().WithAppID("200262548682563")
 	result, err := facebookauth.Login(token)
-	if err != nil {
-		fmt.Println("eeee", err)
-		panic(err.Error())
-	}
+	assert.NoError(t, err)
 
-	fmt.Println("result", result)
+	utils.PrintJSON(result)
 }

go.mod

@@ -5,4 +5,5 @@ go 1.14
 require (
 	github.com/dgrijalva/jwt-go v3.2.0+incompatible
 	github.com/mitchellh/mapstructure v1.3.2
+	github.com/stretchr/testify v1.7.0
 )

go.sum

@@ -1,7 +1,15 @@
-github.com/dgrijalva/jwt-go v1.0.2 h1:KPldsxuKGsS2FPWsNeg9ZO18aCrGKujPoWXn2yo+KQM=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/mitchellh/mapstructure v1.3.1 h1:cCBH2gTD2K0OtLlv/Y5H01VQCqmlDxz30kS5Y5bqfLA=
-github.com/mitchellh/mapstructure v1.3.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.3.2 h1:mRS76wmkOn3KkKAyXDu42V+6ebnXWIztFSYGN7GeoRg=
 github.com/mitchellh/mapstructure v1.3.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

google/google.go

@@ -1,10 +1,11 @@
-package googleauth
+package google
 
 import (
 	"time"
 
 	"github.com/dgrijalva/jwt-go"
-	auth "github.com/thaitanloi365/go-social-auth"
+	"github.com/thaitanloi365/go-social-auth/errs"
+	"github.com/thaitanloi365/go-social-auth/utils"
 )
 
 // SignInProvider provider
@@ -112,20 +113,20 @@ func (c *Config) Login(token string) (*TokenResponse, error) {
 
 	}
 
-	err = auth.DecodeTypedWeakly(&claims, &result)
+	err = utils.DecodeTypedWeakly(&claims, &result)
 	if err != nil {
 		return nil, err
 	}
 
 	if c.Iss != "" {
 		if result.Iss != c.Iss {
-			return nil, auth.ErrIssuerInvalid
+			return nil, errs.ErrIssuerInvalid
 		}
 	}
 
 	if c.Aud != "" {
 		if result.Aud != c.Aud {
-			return nil, auth.ErrAudienceInvalid
+			return nil, errs.ErrAudienceInvalid
 		}
 	}
 
@@ -154,7 +155,7 @@ func (c *Config) Login(token string) (*TokenResponse, error) {
 
 	if !c.SkipExpiry {
 		if response.Exp < time.Now().Unix() {
-			return nil, auth.ErrTokenExpired
+			return nil, errs.ErrTokenExpired
 		}
 	}
 

google/google_test.go

@@ -1,18 +1,18 @@
-package googleauth
+package google
 
 import (
-	"fmt"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/thaitanloi365/go-social-auth/utils"
 )
 
 func TestLoginGoogle(t *testing.T) {
-	// var token = "eyJhbGciOiJSUzI1NiIsImtpZCI6IjgyMmM1NDk4YTcwYjc0MjQ5NzI2ZDhmYjYxODlkZWI3NGMzNWM4MGEiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL3NlY3VyZXRva2VuLmdvb2dsZS5jb20vbm90aWZpY2F0aW9uLWRlbW8tMjVjMTEiLCJhdWQiOiJub3RpZmljYXRpb24tZGVtby0yNWMxMSIsImF1dGhfdGltZSI6MTU5MDQyODAzMiwidXNlcl9pZCI6ImdidWZ6eHdTOTBYOHpsS2FmeWtQWnlxZU1BaDEiLCJzdWIiOiJnYnVmenh3UzkwWDh6bEthZnlrUFp5cWVNQWgxIiwiaWF0IjoxNTkwNDI4MDMyLCJleHAiOjE1OTA0MzE2MzIsInBob25lX251bWJlciI6Iis4NDM3ODMwNjg5MyIsImZpcmViYXNlIjp7ImlkZW50aXRpZXMiOnsicGhvbmUiOlsiKzg0Mzc4MzA2ODkzIl19LCJzaWduX2luX3Byb3ZpZGVyIjoicGhvbmUifX0.YnB0CruLFP5ZhLVI_FqoewI_7HjO6UZuy8bO1KR2aSzbYArFUZKY_o3_hw2Za6MVjprW8nOFWGmk0wWyQW-7SZ1OUn1QNyWideDnwxQ4blaNIO_84gdgmpwdfx99n-hNRG1fvNAr3tVPFiMa5rSwopIfmJzCBP9j-aoZbqumw3HJwtDxNvZvha_Gj_Nu97Jk0Y87oJelD6AFiHVXJzlZ3qStluMR1gujzdo8jrf4eGOWW3H9Vvp_jZlYh6iQ8ddvnj-muP_kCjCZbRwo0bMKQvzVqvNpSqf0ewaHu1pgRYhUNTo8MAR4wt2wJcecEiauXSZru2CFCqICG_1QpdFiSg"
-	var token = "eyJhbGciOiJSUzI1NiIsImtpZCI6Ijk2MGE3ZThlODM0MWVkNzUyZjEyYjE4NmZhMTI5NzMxZmUwYjA0YzAiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJodHRwczovL2FjY291bnRzLmdvb2dsZS5jb20iLCJhenAiOiI3NzQ0MzgwNzU0NTYtZnJhdWNiaWtjdnA2bTc3ZGJmdTdmMGVodWo5YWY5OXIuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJhdWQiOiI3NzQ0MzgwNzU0NTYtZnJhdWNiaWtjdnA2bTc3ZGJmdTdmMGVodWo5YWY5OXIuYXBwcy5nb29nbGV1c2VyY29udGVudC5jb20iLCJzdWIiOiIxMTI5NDUzNDI4MTQyNjI2NDc5NTgiLCJlbWFpbCI6InJlbGlhMDEyM0BnbWFpbC5jb20iLCJlbWFpbF92ZXJpZmllZCI6dHJ1ZSwiYXRfaGFzaCI6IkQ4NW5rZ1Bva2EtRUxwNmFCdW1MZWciLCJub25jZSI6ImU0a2F0V1pfZmxWV0FtNGFWcUZnNlB1Q2RCaFJNbzFjNG1rZmNNeFg5SzAiLCJuYW1lIjoiVmlldCBBbmggUkVMSUEiLCJwaWN0dXJlIjoiaHR0cHM6Ly9saDMuZ29vZ2xldXNlcmNvbnRlbnQuY29tL2EtL0FPaDE0R2pKcFhCVmRCMmw2TGlWcFpTYUt0dlREdmR4Ym9zR3RsLVlKbjRqR1E9czk2LWMiLCJnaXZlbl9uYW1lIjoiVmlldCBBbmgiLCJmYW1pbHlfbmFtZSI6IlJFTElBIiwibG9jYWxlIjoiZW4iLCJpYXQiOjE1OTA0NjAyOTQsImV4cCI6MTU5MDQ2Mzg5NH0.TBUjrzIXeMniQPInUnDKZOfmPu5l2dFQvwJBjRfWKYZqBG2cfGOvckvJx_YGYHZ2BYt1E97bDQrQUO4EuZwNwPFP7omx4fVxHoDi_2DGz45OdiZSA9qGnTJ1VTEeOk8ZCfQsxvsUl8ey0oTTVVrRtkPZhVkZ6Z-9I7ApDUzpMNoV_kMy933cJLeFTHSz6Z4hP5ZfVtjdHFPS4ZchlxUgGJpb6i_7v4Uo07pqfh7dTaj28e-p1z0c5bwms0EpfdyA4KlsjFfgpyLp2wY6XIYSY579x0nBI2TEb9qN9m-CDmbNryr8IAKkJJyYkpyGeLiPNPoQoEUnXIjGlNwqqmo2sQ"
+	var token = "eyJhbGciOiJSUzI1NiIsImtpZCI6IjExMmU0YjUyYWI4MzMwMTdkMzg1Y2UwZDBiNGM2MDU4N2VkMjU4NDIiLCJ0eXAiOiJKV1QifQ.eyJpc3MiOiJhY2NvdW50cy5nb29nbGUuY29tIiwiYXpwIjoiNDk1MzU4Nzc1MTY3LTB2M210dGlpZjcxcWVsaTlsYmQwYW0xYTNoM241N29zLmFwcHMuZ29vZ2xldXNlcmNvbnRlbnQuY29tIiwiYXVkIjoiNDk1MzU4Nzc1MTY3LTB2M210dGlpZjcxcWVsaTlsYmQwYW0xYTNoM241N29zLmFwcHMuZ29vZ2xldXNlcmNvbnRlbnQuY29tIiwic3ViIjoiMTA3NzU1OTE1MTU2MDkwMDM5NjA3IiwiZW1haWwiOiJ0aGFpdGFubG9pMzY1QGdtYWlsLmNvbSIsImVtYWlsX3ZlcmlmaWVkIjp0cnVlLCJhdF9oYXNoIjoiUGc3MVExQlk4SVhTbzNlS1BlVjdVZyIsIm5hbWUiOiJ04bqlbiBs4bujaSB0aMOhaSIsInBpY3R1cmUiOiJodHRwczovL2xoMy5nb29nbGV1c2VyY29udGVudC5jb20vYS0vQU9oMTRHaUFxS1lBaHhLQnhTQ0lYT2NJbkJvMDNJdkVtNG03V09uVDQxV0I4QT1zOTYtYyIsImdpdmVuX25hbWUiOiJ04bqlbiBs4bujaSIsImZhbWlseV9uYW1lIjoidGjDoWkiLCJsb2NhbGUiOiJ2aSIsImlhdCI6MTYyNDcyNTY5MiwiZXhwIjoxNjI0NzI5MjkyLCJqdGkiOiI3OWVlOGM3YzRiN2RmMDc2MTJhM2IxMGZkN2RlNzc1NDk4NmQ3M2IwIn0.NmBqBEvybQtoUWwtRw0X29iYOsbqvuO5uC18CJERXsWhKpHSce5Thw52SnKkH31gYM3zN7v8IVgZVodGg-JdwYEi92O9djiQCWy5-AEZXQMi9SCM1NdrcZ4kdEWZ5MpA-b8RYFRQG3H5wBv1b3Mbo6hweb0V5nT9MIkoMpsEfXrbgziJpvLgsM_t_JJ1ZXqwMpbL6OOP5isp4okVakePBLOdZsCKgJyuHli3wMNZDdUSyTpg--ZQkRwoM8Ch3fdaPl6F9EeK5Dj5upaHljuyVA00tqJ1yNBO-4V6qg38NpEa0vW2ZlPdl33XZF_qIP0etqsU9JyqAN9EuzjgmY3ksA"
 	var googleauth = New().WithIssuer("").WithExpiry(true)
 	result, err := googleauth.Login(token)
-	if err != nil {
-		panic(err)
-	}
 
-	fmt.Println("result", result)
+	assert.NoError(t, err)
+
+	utils.PrintJSON(result)
 }

decoder.go → utils/decoder.go

@@ -1,8 +1,17 @@
-package auth
+package utils
 
-import "github.com/mitchellh/mapstructure"
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/mitchellh/mapstructure"
+)
+
+func PrintJSON(in interface{}) {
+	data, _ := json.MarshalIndent(in, "", "    ")
+	fmt.Println(string(data))
+}
 
-// DecodeTypedWeakly deacode typed weakly
 func DecodeTypedWeakly(in interface{}, out interface{}) error {
 	decoder, err := mapstructure.NewDecoder(&mapstructure.DecoderConfig{
 		TagName:          "json",