Bump Facebook API version and unmarshal user email

examples/facebook/main.go

@@ -42,6 +42,7 @@ func New(config *Config) *http.ServeMux {
 		ClientSecret: config.FacebookClientSecret,
 		RedirectURL:  "http://localhost:8080/facebook/callback",
 		Endpoint:     facebookOAuth2.Endpoint,
+		Scopes:       []string{"email"},
 	}
 	// state param cookies require HTTPS by default; disable for localhost development
 	stateConfig := gologin.DebugOnlyCookieConfig

facebook/login_test.go

@@ -15,8 +15,8 @@ import (
 )
 
 func TestFacebookHandler(t *testing.T) {
-	jsonData := `{"id": "54638001", "name": "Ivy Crimson"}`
-	expectedUser := &User{ID: "54638001", Name: "Ivy Crimson"}
+	jsonData := `{"id": "54638001", "name": "Ivy Crimson", "email": "ivy@harvard.edu"}`
+	expectedUser := &User{ID: "54638001", Name: "Ivy Crimson", Email: "ivy@harvard.edu"}
 	proxyClient, server := newFacebookTestServer(jsonData)
 	defer server.Close()
 	// oauth2 Client will use the proxy client's base Transport

facebook/server_test.go

@@ -13,7 +13,7 @@ import (
 // responds with the given json data. The caller must close the server.
 func newFacebookTestServer(jsonData string) (*http.Client, *httptest.Server) {
 	client, mux, server := testutils.TestServer()
-	mux.HandleFunc("/v2.4/me", func(w http.ResponseWriter, r *http.Request) {
+	mux.HandleFunc("/v2.9/me", func(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Content-Type", "application/json")
 		fmt.Fprintf(w, jsonData)
 	})

facebook/verify.go

@@ -6,14 +6,15 @@ import (
 	"github.com/dghubble/sling"
 )
 
-const facebookAPI = "https://graph.facebook.com/v2.4/"
+const facebookAPI = "https://graph.facebook.com/v2.9/"
 
 // User is a Facebook user.
 //
 // Note that user ids are unique to each app.
 type User struct {
-	ID   string `json:"id"`
-	Name string `json:"name"`
+	ID    string `json:"id"`
+	Name  string `json:"name"`
+	Email string `json:"email"`
 }
 
 // client is a Facebook client for obtaining the current User.
@@ -35,6 +36,6 @@ func (c *client) Me() (*User, *http.Response, error) {
 	// Facebook returns JSON as Content-Type text/javascript :(
 	// Set Accept header to receive proper Content-Type application/json
 	// so Sling will decode into the struct
-	resp, err := c.sling.New().Set("Accept", "application/json").Get("me").ReceiveSuccess(user)
+	resp, err := c.sling.New().Set("Accept", "application/json").Get("me?fields=name,email").ReceiveSuccess(user)
 	return user, resp, err
 }