merge v0.23.0-rc changes

tools/auth/oidc.go

@@ -8,6 +8,12 @@ import (
 	"golang.org/x/oauth2"
 )
 
+func init() {
+	Providers[NameOIDC] = wrapFactory(NewOIDCProvider)
+	Providers[NameOIDC+"2"] = wrapFactory(NewOIDCProvider)
+	Providers[NameOIDC+"3"] = wrapFactory(NewOIDCProvider)
+}
+
 var _ Provider = (*OIDC)(nil)
 
 // NameOIDC is the unique name of the OpenID Connect (OIDC) provider.
@@ -15,12 +21,12 @@ const NameOIDC string = "oidc"
 
 // OIDC allows authentication via OpenID Connect (OIDC) OAuth2 provider.
 type OIDC struct {
-	*baseProvider
+	BaseProvider
 }
 
 // NewOIDCProvider creates new OpenID Connect (OIDC) provider instance with some defaults.
 func NewOIDCProvider() *OIDC {
-	return &OIDC{&baseProvider{
+	return &OIDC{BaseProvider{
 		ctx:         context.Background(),
 		displayName: "OIDC",
 		pkce:        true,
@@ -35,8 +41,10 @@ func NewOIDCProvider() *OIDC {
 // FetchAuthUser returns an AuthUser instance based the provider's user api.
 //
 // API reference: https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims
+//
+// @todo consider adding support for reading the user data from the id_token.
 func (p *OIDC) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
-	data, err := p.FetchRawUserData(token)
+	data, err := p.FetchRawUserInfo(token)
 	if err != nil {
 		return nil, err
 	}
@@ -62,7 +70,7 @@ func (p *OIDC) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 		Id:           extracted.Id,
 		Name:         extracted.Name,
 		Username:     extracted.Username,
-		AvatarUrl:    extracted.Picture,
+		AvatarURL:    extracted.Picture,
 		RawUser:      rawUser,
 		AccessToken:  token.AccessToken,
 		RefreshToken: token.RefreshToken,