Stefan/evcc-io
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactor TokenRefresher interface

Browse source
This commit is contained in:
andig 2021-05-02 10:45:45 +02:00
parent bf246f37ef
commit ca2ccfa90f
6 changed files with 7 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
internal/vehicle/bluelink/identity.go
View file

@ -290,7 +290,7 @@ func (v *Identity) exchangeCode(accCode string) (oauth.Token, error) {
}
// Refresh implements token refresh
func (v *Identity) Refresh(token *oauth2.Token) (*oauth2.Token, error) {
func (v *Identity) RefreshToken(token *oauth2.Token) (*oauth2.Token, error) {
headers := map[string]string{
"Authorization": "Basic " + v.config.BasicToken,
"Content-type": "application/x-www-form-urlencoded",

4
internal/vehicle/ford.go
View file

@ -108,10 +108,8 @@ func (v *Ford) login() (oauth.Token, error) {
return res, err
}
var _ oauth.TokenRefresher = (*Ford)(nil)
// Refresh implements the oauth.TokenRefresher interface
func (v *Ford) Refresh(token *oauth2.Token) (*oauth2.Token, error) {
func (v *Ford) RefreshToken(token *oauth2.Token) (*oauth2.Token, error) {
data := url.Values{
"client_id": []string{"9fb503e0-715b-47e8-adfd-ad4b7770f73b"},
"grant_type": []string{"refresh_token"},

2
internal/vehicle/id/refresh.go
View file

@ -20,7 +20,7 @@ func Refresher(log *util.Logger) oauth.TokenRefresher {
}
// Refresh is the oauth.TokenRefresher
func (tr *tokenRefresher) Refresh(token *oauth2.Token) (*oauth2.Token, error) {
func (tr *tokenRefresher) RefreshToken(token *oauth2.Token) (*oauth2.Token, error) {
uri := "https://login.apps.emea.vwapps.io/refresh/v1"
req, err := request.New(http.MethodGet, uri, nil, map[string]string{

2
internal/vehicle/nissan.go
View file

@ -228,7 +228,7 @@ func (v *Nissan) authFlow() (oauth.Token, error) {
return res, err
}
func (v *Nissan) Refresh(token *oauth2.Token) (*oauth2.Token, error) {
func (v *Nissan) RefreshToken(token *oauth2.Token) (*oauth2.Token, error) {
data := url.Values{
"client_id": []string{nissanClientID},
"client_secret": []string{nissanClientSecret},

2
internal/vehicle/vw/refresh.go
View file

@ -24,7 +24,7 @@ func refresher(log *util.Logger, clientID string) oauth.TokenRefresher {
}
// Refresh is the oauth.TokenRefresher
func (tr *tokenRefresher) Refresh(token *oauth2.Token) (*oauth2.Token, error) {
func (tr *tokenRefresher) RefreshToken(token *oauth2.Token) (*oauth2.Token, error) {
data := url.Values(map[string][]string{
"grant_type": {"refresh_token"},
"refresh_token": {token.RefreshToken},

4
util/oauth/tokensource.go
View file

@ -9,7 +9,7 @@ import (
)
type TokenRefresher interface {
Refresh(token *oauth2.Token) (*oauth2.Token, error)
RefreshToken(token *oauth2.Token) (*oauth2.Token, error)
}
type TokenSource struct {
@ -25,7 +25,7 @@ func (ts *TokenSource) Token() (*oauth2.Token, error) {
var err error
if time.Until(ts.token.Expiry) < time.Minute {
var token *oauth2.Token
if token, err = ts.refresher.Refresh(ts.token); err == nil {
if token, err = ts.refresher.RefreshToken(ts.token); err == nil {
if token.AccessToken == "" {
err = errors.New("token refresh failed to obtain access token")
} else {