Merge pull request #127 from dsumer/master

Fix: Retrieve Twitter and GitHub usernames via OAuth

Author: kangmingtay

api/provider/github.go

@@ -22,6 +22,7 @@ type githubProvider struct {
 }
 
 type githubUser struct {
+	UserName  string `json:"login"`
 	Email     string `json:"email"`
 	Name      string `json:"name"`
 	AvatarURL string `json:"avatar_url"`
@@ -75,6 +76,7 @@ func (g githubProvider) GetUserData(ctx context.Context, tok *oauth2.Token) (*Us
 
 	data := &UserProvidedData{
 		Metadata: map[string]string{
+			userNameKey:  u.UserName,
 			nameKey:      u.Name,
 			avatarURLKey: u.AvatarURL,
 		},

api/provider/provider.go

@@ -8,6 +8,7 @@ import (
 )
 
 const (
+	userNameKey  = "user_name"
 	avatarURLKey = "avatar_url"
 	nameKey      = "full_name"
 	aliasKey     = "slug"

api/provider/twitter.go

@@ -16,7 +16,7 @@ import (
 
 const (
 	requestURL      = "https://api.twitter.com/oauth/request_token"
-	authorizeURL    = "https://api.twitter.com/oauth/authorize"
+	authenticateURL = "https://api.twitter.com/oauth/authenticate"
 	tokenURL        = "https://api.twitter.com/oauth/access_token"
 	endpointProfile = "https://api.twitter.com/1.1/account/verify_credentials.json"
 )
@@ -32,6 +32,7 @@ type TwitterProvider struct {
 }
 
 type twitterUser struct {
+	UserName  string `json:"screen_name"`
 	Name      string `json:"name"`
 	AvatarURL string `json:"profile_image_url"`
 	Email     string `json:"email"`
@@ -78,6 +79,7 @@ func (t TwitterProvider) FetchUserData(ctx context.Context, tok *oauth.AccessTok
 
 	data := &UserProvidedData{
 		Metadata: map[string]string{
+			userNameKey:  u.UserName,
 			nameKey:      u.Name,
 			avatarURLKey: u.AvatarURL,
 		},
@@ -107,7 +109,7 @@ func newConsumer(provider *TwitterProvider) *oauth.Consumer {
 		provider.Secret,
 		oauth.ServiceProvider{
 			RequestTokenUrl:   requestURL,
-			AuthorizeTokenUrl: authorizeURL,
+			AuthorizeTokenUrl: authenticateURL,
 			AccessTokenUrl:    tokenURL,
 		})
 	return c