merge v0.23.0-rc changes

tools/auth/google.go

@@ -8,6 +8,10 @@ import (
 	"golang.org/x/oauth2"
 )
 
+func init() {
+	Providers[NameGoogle] = wrapFactory(NewGoogleProvider)
+}
+
 var _ Provider = (*Google)(nil)
 
 // NameGoogle is the unique name of the Google provider.
@@ -15,12 +19,12 @@ const NameGoogle string = "google"
 
 // Google allows authentication via Google OAuth2.
 type Google struct {
-	*baseProvider
+	BaseProvider
 }
 
 // NewGoogleProvider creates new Google provider instance with some defaults.
 func NewGoogleProvider() *Google {
-	return &Google{&baseProvider{
+	return &Google{BaseProvider{
 		ctx:         context.Background(),
 		displayName: "Google",
 		pkce:        true,
@@ -28,15 +32,15 @@ func NewGoogleProvider() *Google {
 			"https://www.googleapis.com/auth/userinfo.profile",
 			"https://www.googleapis.com/auth/userinfo.email",
 		},
-		authUrl:    "https://accounts.google.com/o/oauth2/auth",
-		tokenUrl:   "https://accounts.google.com/o/oauth2/token",
-		userApiUrl: "https://www.googleapis.com/oauth2/v1/userinfo",
+		authURL:     "https://accounts.google.com/o/oauth2/auth",
+		tokenURL:    "https://accounts.google.com/o/oauth2/token",
+		userInfoURL: "https://www.googleapis.com/oauth2/v1/userinfo",
 	}}
 }
 
 // FetchAuthUser returns an AuthUser instance based the Google's user api.
 func (p *Google) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
-	data, err := p.FetchRawUserData(token)
+	data, err := p.FetchRawUserInfo(token)
 	if err != nil {
 		return nil, err
 	}
@@ -60,7 +64,7 @@ func (p *Google) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 	user := &AuthUser{
 		Id:           extracted.Id,
 		Name:         extracted.Name,
-		AvatarUrl:    extracted.Picture,
+		AvatarURL:    extracted.Picture,
 		RawUser:      rawUser,
 		AccessToken:  token.AccessToken,
 		RefreshToken: token.RefreshToken,