merge v0.23.0-rc changes

tools/auth/livechat.go

@@ -8,6 +8,10 @@ import (
 	"golang.org/x/oauth2"
 )
 
+func init() {
+	Providers[NameLivechat] = wrapFactory(NewLivechatProvider)
+}
+
 var _ Provider = (*Livechat)(nil)
 
 // NameLivechat is the unique name of the Livechat provider.
@@ -15,19 +19,19 @@ const NameLivechat = "livechat"
 
 // Livechat allows authentication via Livechat OAuth2.
 type Livechat struct {
-	*baseProvider
+	BaseProvider
 }
 
 // NewLivechatProvider creates new Livechat provider instance with some defaults.
 func NewLivechatProvider() *Livechat {
-	return &Livechat{&baseProvider{
+	return &Livechat{BaseProvider{
 		ctx:         context.Background(),
 		displayName: "LiveChat",
 		pkce:        true,
 		scopes:      []string{}, // default scopes are specified from the provider dashboard
-		authUrl:     "https://accounts.livechat.com/",
-		tokenUrl:    "https://accounts.livechat.com/token",
-		userApiUrl:  "https://accounts.livechat.com/v2/accounts/me",
+		authURL:     "https://accounts.livechat.com/",
+		tokenURL:    "https://accounts.livechat.com/token",
+		userInfoURL: "https://accounts.livechat.com/v2/accounts/me",
 	}}
 }
 
@@ -35,7 +39,7 @@ func NewLivechatProvider() *Livechat {
 //
 // API reference: https://developers.livechat.com/docs/authorization
 func (p *Livechat) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
-	data, err := p.FetchRawUserData(token)
+	data, err := p.FetchRawUserInfo(token)
 	if err != nil {
 		return nil, err
 	}
@@ -50,7 +54,7 @@ func (p *Livechat) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 		Name          string `json:"name"`
 		Email         string `json:"email"`
 		EmailVerified bool   `json:"email_verified"`
-		AvatarUrl     string `json:"avatar_url"`
+		AvatarURL     string `json:"avatar_url"`
 	}{}
 	if err := json.Unmarshal(data, &extracted); err != nil {
 		return nil, err
@@ -59,7 +63,7 @@ func (p *Livechat) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 	user := &AuthUser{
 		Id:           extracted.Id,
 		Name:         extracted.Name,
-		AvatarUrl:    extracted.AvatarUrl,
+		AvatarURL:    extracted.AvatarURL,
 		RawUser:      rawUser,
 		AccessToken:  token.AccessToken,
 		RefreshToken: token.RefreshToken,