merge v0.23.0-rc changes

tools/auth/vk.go

@@ -13,6 +13,10 @@ import (
 	"golang.org/x/oauth2/vk"
 )
 
+func init() {
+	Providers[NameVK] = wrapFactory(NewVKProvider)
+}
+
 var _ Provider = (*VK)(nil)
 
 // NameVK is the unique name of the VK provider.
@@ -20,21 +24,21 @@ const NameVK string = "vk"
 
 // VK allows authentication via VK OAuth2.
 type VK struct {
-	*baseProvider
+	BaseProvider
 }
 
 // NewVKProvider creates new VK provider instance with some defaults.
 //
 // Docs: https://dev.vk.com/api/oauth-parameters
 func NewVKProvider() *VK {
-	return &VK{&baseProvider{
+	return &VK{BaseProvider{
 		ctx:         context.Background(),
 		displayName: "ВКонтакте",
 		pkce:        false, // VK currently doesn't support PKCE and throws an error if PKCE params are send
 		scopes:      []string{"email"},
-		authUrl:     vk.Endpoint.AuthURL,
-		tokenUrl:    vk.Endpoint.TokenURL,
-		userApiUrl:  "https://api.vk.com/method/users.get?fields=photo_max,screen_name&v=5.131",
+		authURL:     vk.Endpoint.AuthURL,
+		tokenURL:    vk.Endpoint.TokenURL,
+		userInfoURL: "https://api.vk.com/method/users.get?fields=photo_max,screen_name&v=5.131",
 	}}
 }
 
@@ -42,7 +46,7 @@ func NewVKProvider() *VK {
 //
 // API reference: https://dev.vk.com/method/users.get
 func (p *VK) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
-	data, err := p.FetchRawUserData(token)
+	data, err := p.FetchRawUserInfo(token)
 	if err != nil {
 		return nil, err
 	}
@@ -58,7 +62,7 @@ func (p *VK) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 			FirstName string `json:"first_name"`
 			LastName  string `json:"last_name"`
 			Username  string `json:"screen_name"`
-			AvatarUrl string `json:"photo_max"`
+			AvatarURL string `json:"photo_max"`
 		} `json:"response"`
 	}{}
 
@@ -74,7 +78,7 @@ func (p *VK) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 		Id:           strconv.Itoa(extracted.Response[0].Id),
 		Name:         strings.TrimSpace(extracted.Response[0].FirstName + " " + extracted.Response[0].LastName),
 		Username:     extracted.Response[0].Username,
-		AvatarUrl:    extracted.Response[0].AvatarUrl,
+		AvatarURL:    extracted.Response[0].AvatarURL,
 		RawUser:      rawUser,
 		AccessToken:  token.AccessToken,
 		RefreshToken: token.RefreshToken,