merge v0.23.0-rc changes

tools/auth/patreon.go

@@ -8,6 +8,10 @@ import (
 	"golang.org/x/oauth2"
 )
 
+func init() {
+	Providers[NamePatreon] = wrapFactory(NewPatreonProvider)
+}
+
 var _ Provider = (*Patreon)(nil)
 
 // NamePatreon is the unique name of the Patreon provider.
@@ -15,19 +19,19 @@ const NamePatreon string = "patreon"
 
 // Patreon allows authentication via Patreon OAuth2.
 type Patreon struct {
-	*baseProvider
+	BaseProvider
 }
 
 // NewPatreonProvider creates new Patreon provider instance with some defaults.
 func NewPatreonProvider() *Patreon {
-	return &Patreon{&baseProvider{
+	return &Patreon{BaseProvider{
 		ctx:         context.Background(),
 		displayName: "Patreon",
 		pkce:        true,
 		scopes:      []string{"identity", "identity[email]"},
-		authUrl:     "https://www.patreon.com/oauth2/authorize",
-		tokenUrl:    "https://www.patreon.com/api/oauth2/token",
-		userApiUrl:  "https://www.patreon.com/api/oauth2/v2/identity?fields%5Buser%5D=full_name,email,vanity,image_url,is_email_verified",
+		authURL:     "https://www.patreon.com/oauth2/authorize",
+		tokenURL:    "https://www.patreon.com/api/oauth2/token",
+		userInfoURL: "https://www.patreon.com/api/oauth2/v2/identity?fields%5Buser%5D=full_name,email,vanity,image_url,is_email_verified",
 	}}
 }
 
@@ -37,7 +41,7 @@ func NewPatreonProvider() *Patreon {
 // https://docs.patreon.com/#get-api-oauth2-v2-identity
 // https://docs.patreon.com/#user-v2
 func (p *Patreon) 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 *Patreon) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 				Email           string `json:"email"`
 				Name            string `json:"full_name"`
 				Username        string `json:"vanity"`
-				AvatarUrl       string `json:"image_url"`
+				AvatarURL       string `json:"image_url"`
 				IsEmailVerified bool   `json:"is_email_verified"`
 			} `json:"attributes"`
 		} `json:"data"`
@@ -67,7 +71,7 @@ func (p *Patreon) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 		Id:           extracted.Data.Id,
 		Username:     extracted.Data.Attributes.Username,
 		Name:         extracted.Data.Attributes.Name,
-		AvatarUrl:    extracted.Data.Attributes.AvatarUrl,
+		AvatarURL:    extracted.Data.Attributes.AvatarURL,
 		RawUser:      rawUser,
 		AccessToken:  token.AccessToken,
 		RefreshToken: token.RefreshToken,