Release v1.2.1 #1
|
@ -56,7 +56,7 @@ func (c *CallbackHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
|
|||
scope := q.Get("scope")
|
||||
_ = scope
|
||||
|
||||
token, err := c.client.GetToken(code)
|
||||
token, err := c.client.GetToken(r.Context(), code)
|
||||
if err != nil {
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
|
|
|
@ -1,5 +1,7 @@
|
|||
package auth
|
||||
|
||||
import "context"
|
||||
|
||||
type Client struct {
|
||||
clientId string
|
||||
clientSecret string
|
||||
|
@ -21,8 +23,8 @@ func NewClient(clientId string, clientSecret string, redirectUri string) *Client
|
|||
// GetToken exchanges an authorization code for an access token.
|
||||
//
|
||||
// https://dev.twitch.tv/docs/authentication/getting-tokens-oidc/#oidc-authorization-code-grant-flow
|
||||
func (c *Client) GetToken(code string) (*Token, error) {
|
||||
return GetToken(&GetTokenParams{
|
||||
func (c *Client) GetToken(ctx context.Context, code string) (*Token, error) {
|
||||
return GetToken(ctx, &GetTokenParams{
|
||||
ClientId: c.clientId,
|
||||
ClientSecret: c.clientSecret,
|
||||
Code: code,
|
||||
|
@ -34,8 +36,8 @@ func (c *Client) GetToken(code string) (*Token, error) {
|
|||
// RefreshToken exchanges a refresh token for an access token.
|
||||
//
|
||||
// https://dev.twitch.tv/docs/authentication/refresh-tokens/
|
||||
func (c *Client) RefreshToken(token *Token) (*Token, error) {
|
||||
return GetToken(&GetTokenParams{
|
||||
func (c *Client) RefreshToken(ctx context.Context, token *Token) (*Token, error) {
|
||||
return GetToken(ctx, &GetTokenParams{
|
||||
ClientId: c.clientId,
|
||||
ClientSecret: c.clientSecret,
|
||||
Code: token.RefreshToken,
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package auth
|
||||
|
||||
import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"net/http"
|
||||
|
@ -47,13 +48,19 @@ type GetTokenParams struct {
|
|||
RedirectUri string `url:"redirect_uri"`
|
||||
}
|
||||
|
||||
func GetToken(params *GetTokenParams) (*Token, error) {
|
||||
func GetToken(ctx context.Context, params *GetTokenParams) (*Token, error) {
|
||||
v, err := query.Values(params)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
res, err := http.Post(TokenUrl, "application/x-www-form-urlencoded", strings.NewReader(v.Encode()))
|
||||
req, err := http.NewRequestWithContext(ctx, http.MethodPost, TokenUrl, strings.NewReader(v.Encode()))
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
|
||||
|
||||
res, err := http.DefaultClient.Do(req)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
package auth
|
||||
|
||||
import (
|
||||
"context"
|
||||
"sync"
|
||||
|
||||
"golang.org/x/oauth2"
|
||||
|
@ -28,7 +29,7 @@ func (ts *TokenSource) Token() (*oauth2.Token, error) {
|
|||
return ts.token.Underlying(), nil
|
||||
}
|
||||
|
||||
token, err := ts.client.RefreshToken(ts.token)
|
||||
token, err := ts.client.RefreshToken(context.Background(), ts.token)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue