merge v0.23.0-rc changes

tools/auth/twitch.go

@@ -11,6 +11,10 @@ import (
 	"golang.org/x/oauth2/twitch"
 )
 
+func init() {
+	Providers[NameTwitch] = wrapFactory(NewTwitchProvider)
+}
+
 var _ Provider = (*Twitch)(nil)
 
 // NameTwitch is the unique name of the Twitch provider.
@@ -18,19 +22,19 @@ const NameTwitch string = "twitch"
 
 // Twitch allows authentication via Twitch OAuth2.
 type Twitch struct {
-	*baseProvider
+	BaseProvider
 }
 
 // NewTwitchProvider creates new Twitch provider instance with some defaults.
 func NewTwitchProvider() *Twitch {
-	return &Twitch{&baseProvider{
+	return &Twitch{BaseProvider{
 		ctx:         context.Background(),
 		displayName: "Twitch",
 		pkce:        true,
 		scopes:      []string{"user:read:email"},
-		authUrl:     twitch.Endpoint.AuthURL,
-		tokenUrl:    twitch.Endpoint.TokenURL,
-		userApiUrl:  "https://api.twitch.tv/helix/users",
+		authURL:     twitch.Endpoint.AuthURL,
+		tokenURL:    twitch.Endpoint.TokenURL,
+		userInfoURL: "https://api.twitch.tv/helix/users",
 	}}
 }
 
@@ -38,7 +42,7 @@ func NewTwitchProvider() *Twitch {
 //
 // API reference: https://dev.twitch.tv/docs/api/reference#get-users
 func (p *Twitch) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
-	data, err := p.FetchRawUserData(token)
+	data, err := p.FetchRawUserInfo(token)
 	if err != nil {
 		return nil, err
 	}
@@ -54,7 +58,7 @@ func (p *Twitch) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 			Login           string `json:"login"`
 			DisplayName     string `json:"display_name"`
 			Email           string `json:"email"`
-			ProfileImageUrl string `json:"profile_image_url"`
+			ProfileImageURL string `json:"profile_image_url"`
 		} `json:"data"`
 	}{}
 	if err := json.Unmarshal(data, &extracted); err != nil {
@@ -70,7 +74,7 @@ func (p *Twitch) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 		Name:         extracted.Data[0].DisplayName,
 		Username:     extracted.Data[0].Login,
 		Email:        extracted.Data[0].Email,
-		AvatarUrl:    extracted.Data[0].ProfileImageUrl,
+		AvatarURL:    extracted.Data[0].ProfileImageURL,
 		RawUser:      rawUser,
 		AccessToken:  token.AccessToken,
 		RefreshToken: token.RefreshToken,
@@ -81,16 +85,16 @@ func (p *Twitch) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 	return user, nil
 }
 
-// FetchRawUserData implements Provider.FetchRawUserData interface.
+// FetchRawUserInfo implements Provider.FetchRawUserInfo interface.
 //
 // This differ from baseProvider because Twitch requires the `Client-Id` header.
-func (p *Twitch) FetchRawUserData(token *oauth2.Token) ([]byte, error) {
-	req, err := http.NewRequest("GET", p.userApiUrl, nil)
+func (p *Twitch) FetchRawUserInfo(token *oauth2.Token) ([]byte, error) {
+	req, err := http.NewRequest("GET", p.userInfoURL, nil)
 	if err != nil {
 		return nil, err
 	}
 
 	req.Header.Set("Client-Id", p.clientId)
 
-	return p.sendRawUserDataRequest(req, token)
+	return p.sendRawUserInfoRequest(req, token)
 }