merge v0.23.0-rc changes

tools/auth/twitter.go

@@ -8,6 +8,10 @@ import (
 	"golang.org/x/oauth2"
 )
 
+func init() {
+	Providers[NameTwitter] = wrapFactory(NewTwitterProvider)
+}
+
 var _ Provider = (*Twitter)(nil)
 
 // NameTwitter is the unique name of the Twitter provider.
@@ -15,12 +19,12 @@ const NameTwitter string = "twitter"
 
 // Twitter allows authentication via Twitter OAuth2.
 type Twitter struct {
-	*baseProvider
+	BaseProvider
 }
 
 // NewTwitterProvider creates new Twitter provider instance with some defaults.
 func NewTwitterProvider() *Twitter {
-	return &Twitter{&baseProvider{
+	return &Twitter{BaseProvider{
 		ctx:         context.Background(),
 		displayName: "Twitter",
 		pkce:        true,
@@ -31,9 +35,9 @@ func NewTwitterProvider() *Twitter {
 			// (see https://developer.twitter.com/en/docs/twitter-api/users/lookup/api-reference/get-users-me)
 			"tweet.read",
 		},
-		authUrl:    "https://twitter.com/i/oauth2/authorize",
-		tokenUrl:   "https://api.twitter.com/2/oauth2/token",
-		userApiUrl: "https://api.twitter.com/2/users/me?user.fields=id,name,username,profile_image_url",
+		authURL:     "https://twitter.com/i/oauth2/authorize",
+		tokenURL:    "https://api.twitter.com/2/oauth2/token",
+		userInfoURL: "https://api.twitter.com/2/users/me?user.fields=id,name,username,profile_image_url",
 	}}
 }
 
@@ -41,7 +45,7 @@ func NewTwitterProvider() *Twitter {
 //
 // API reference: https://developer.twitter.com/en/docs/twitter-api/users/lookup/api-reference/get-users-me
 func (p *Twitter) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
-	data, err := p.FetchRawUserData(token)
+	data, err := p.FetchRawUserInfo(token)
 	if err != nil {
 		return nil, err
 	}
@@ -56,7 +60,7 @@ func (p *Twitter) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 			Id              string `json:"id"`
 			Name            string `json:"name"`
 			Username        string `json:"username"`
-			ProfileImageUrl string `json:"profile_image_url"`
+			ProfileImageURL string `json:"profile_image_url"`
 
 			// NB! At the time of writing, Twitter OAuth2 doesn't support returning the user email address
 			// (see https://twittercommunity.com/t/which-api-to-get-user-after-oauth2-authorization/162417/33)
@@ -71,7 +75,7 @@ func (p *Twitter) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 		Id:           extracted.Data.Id,
 		Name:         extracted.Data.Name,
 		Username:     extracted.Data.Username,
-		AvatarUrl:    extracted.Data.ProfileImageUrl,
+		AvatarURL:    extracted.Data.ProfileImageURL,
 		RawUser:      rawUser,
 		AccessToken:  token.AccessToken,
 		RefreshToken: token.RefreshToken,