[#654] updated OAuth2 providers to return the access token and raw user data

tools/auth/twitch.go

@@ -1,6 +1,7 @@
 package auth
 
 import (
+	"encoding/json"
 	"errors"
 	"net/http"
 
@@ -29,9 +30,20 @@ func NewTwitchProvider() *Twitch {
 }
 
 // FetchAuthUser returns an AuthUser instance based the Twitch's user api.
+//
+// API reference: https://dev.twitch.tv/docs/api/reference#get-users
 func (p *Twitch) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
-	// https://dev.twitch.tv/docs/api/reference#get-users
-	rawData := struct {
+	data, err := p.FetchRawUserData(token)
+	if err != nil {
+		return nil, err
+	}
+
+	rawUser := map[string]any{}
+	if err := json.Unmarshal(data, &rawUser); err != nil {
+		return nil, err
+	}
+
+	extracted := struct {
 		Data []struct {
 			Id              string `json:"id"`
 			Login           string `json:"login"`
@@ -40,21 +52,22 @@ func (p *Twitch) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 			ProfileImageUrl string `json:"profile_image_url"`
 		} `json:"data"`
 	}{}
-
-	if err := p.FetchRawUserData(token, &rawData); err != nil {
+	if err := json.Unmarshal(data, &extracted); err != nil {
 		return nil, err
 	}
 
-	if len(rawData.Data) == 0 {
+	if len(extracted.Data) == 0 {
 		return nil, errors.New("Failed to fetch AuthUser data")
 	}
 
 	user := &AuthUser{
-		Id:        rawData.Data[0].Id,
-		Name:      rawData.Data[0].DisplayName,
-		Username:  rawData.Data[0].Login,
-		Email:     rawData.Data[0].Email,
-		AvatarUrl: rawData.Data[0].ProfileImageUrl,
+		Id:          extracted.Data[0].Id,
+		Name:        extracted.Data[0].DisplayName,
+		Username:    extracted.Data[0].Login,
+		Email:       extracted.Data[0].Email,
+		AvatarUrl:   extracted.Data[0].ProfileImageUrl,
+		RawUser:     rawUser,
+		AccessToken: token.AccessToken,
 	}
 
 	return user, nil
@@ -63,13 +76,13 @@ func (p *Twitch) FetchAuthUser(token *oauth2.Token) (*AuthUser, error) {
 // FetchRawUserData implements Provider.FetchRawUserData interface.
 //
 // This differ from baseProvider because Twitch requires the `Client-Id` header.
-func (p *Twitch) FetchRawUserData(token *oauth2.Token, result any) error {
+func (p *Twitch) FetchRawUserData(token *oauth2.Token) ([]byte, error) {
 	req, err := http.NewRequest("GET", p.userApiUrl, nil)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	req.Header.Set("Client-Id", p.clientId)
 
-	return p.sendRawUserDataRequest(req, token, result)
+	return p.sendRawUserDataRequest(req, token)
 }