merge v0.23.0-rc changes

tools/auth/strava.go

@@ -9,6 +9,10 @@ import (
 	"golang.org/x/oauth2"
 )
 
+func init() {
+	Providers[NameStrava] = wrapFactory(NewStravaProvider)
+}
+
 var _ Provider = (*Strava)(nil)
 
 // NameStrava is the unique name of the Strava provider.
@@ -16,21 +20,21 @@ const NameStrava string = "strava"
 
 // Strava allows authentication via Strava OAuth2.
 type Strava struct {
-	*baseProvider
+	BaseProvider
 }
 
 // NewStravaProvider creates new Strava provider instance with some defaults.
 func NewStravaProvider() *Strava {
-	return &Strava{&baseProvider{
+	return &Strava{BaseProvider{
 		ctx:         context.Background(),
 		displayName: "Strava",
 		pkce:        true,
 		scopes: []string{
 			"profile:read_all",
 		},
-		authUrl:    "https://www.strava.com/oauth/authorize",
-		tokenUrl:   "https://www.strava.com/api/v3/oauth/token",
-		userApiUrl: "https://www.strava.com/api/v3/athlete",
+		authURL:     "https://www.strava.com/oauth/authorize",
+		tokenURL:    "https://www.strava.com/api/v3/oauth/token",
+		userInfoURL: "https://www.strava.com/api/v3/athlete",
 	}}
 }
 
@@ -38,7 +42,7 @@ func NewStravaProvider() *Strava {
 //
 // API reference: https://developers.strava.com/docs/authentication/
 func (p *Strava) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
-	data, err := p.FetchRawUserData(token)
+	data, err := p.FetchRawUserInfo(token)
 	if err != nil {
 		return nil, err
 	}
@@ -53,7 +57,7 @@ func (p *Strava) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 		FirstName       string `json:"firstname"`
 		LastName        string `json:"lastname"`
 		Username        string `json:"username"`
-		ProfileImageUrl string `json:"profile"`
+		ProfileImageURL string `json:"profile"`
 
 		// At the time of writing, Strava OAuth2 doesn't support returning the user email address
 		// Email string `json:"email"`
@@ -65,7 +69,7 @@ func (p *Strava) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 	user := &AuthUser{
 		Name:         extracted.FirstName + " " + extracted.LastName,
 		Username:     extracted.Username,
-		AvatarUrl:    extracted.ProfileImageUrl,
+		AvatarURL:    extracted.ProfileImageURL,
 		RawUser:      rawUser,
 		AccessToken:  token.AccessToken,
 		RefreshToken: token.RefreshToken,