merge v0.23.0-rc changes

tools/auth/discord.go

@@ -9,6 +9,10 @@ import (
 	"golang.org/x/oauth2"
 )
 
+func init() {
+	Providers[NameDiscord] = wrapFactory(NewDiscordProvider)
+}
+
 var _ Provider = (*Discord)(nil)
 
 // NameDiscord is the unique name of the Discord provider.
@@ -16,21 +20,21 @@ const NameDiscord string = "discord"
 
 // Discord allows authentication via Discord OAuth2.
 type Discord struct {
-	*baseProvider
+	BaseProvider
 }
 
 // NewDiscordProvider creates a new Discord provider instance with some defaults.
 func NewDiscordProvider() *Discord {
 	// https://discord.com/developers/docs/topics/oauth2
 	// https://discord.com/developers/docs/resources/user#get-current-user
-	return &Discord{&baseProvider{
+	return &Discord{BaseProvider{
 		ctx:         context.Background(),
 		displayName: "Discord",
 		pkce:        true,
 		scopes:      []string{"identify", "email"},
-		authUrl:     "https://discord.com/api/oauth2/authorize",
-		tokenUrl:    "https://discord.com/api/oauth2/token",
-		userApiUrl:  "https://discord.com/api/users/@me",
+		authURL:     "https://discord.com/api/oauth2/authorize",
+		tokenURL:    "https://discord.com/api/oauth2/token",
+		userInfoURL: "https://discord.com/api/users/@me",
 	}}
 }
 
@@ -38,7 +42,7 @@ func NewDiscordProvider() *Discord {
 //
 // API reference:  https://discord.com/developers/docs/resources/user#user-object
 func (p *Discord) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
-	data, err := p.FetchRawUserData(token)
+	data, err := p.FetchRawUserInfo(token)
 	if err != nil {
 		return nil, err
 	}
@@ -62,7 +66,7 @@ func (p *Discord) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 
 	// Build a full avatar URL using the avatar hash provided in the API response
 	// https://discord.com/developers/docs/reference#image-formatting
-	avatarUrl := fmt.Sprintf("https://cdn.discordapp.com/avatars/%s/%s.png", extracted.Id, extracted.Avatar)
+	avatarURL := fmt.Sprintf("https://cdn.discordapp.com/avatars/%s/%s.png", extracted.Id, extracted.Avatar)
 
 	// Concatenate the user's username and discriminator into a single username string
 	username := fmt.Sprintf("%s#%s", extracted.Username, extracted.Discriminator)
@@ -71,7 +75,7 @@ func (p *Discord) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 		Id:           extracted.Id,
 		Name:         username,
 		Username:     extracted.Username,
-		AvatarUrl:    avatarUrl,
+		AvatarURL:    avatarURL,
 		RawUser:      rawUser,
 		AccessToken:  token.AccessToken,
 		RefreshToken: token.RefreshToken,