From ca2ccfa90fef50358ab8e0d2b01733ccfab4c293 Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Sun, 2 May 2021 10:45:45 +0200
Subject: [PATCH] Refactor TokenRefresher interface

---
 internal/vehicle/bluelink/identity.go | 2 +-
 internal/vehicle/ford.go              | 4 +---
 internal/vehicle/id/refresh.go        | 2 +-
 internal/vehicle/nissan.go            | 2 +-
 internal/vehicle/vw/refresh.go        | 2 +-
 util/oauth/tokensource.go             | 4 ++--
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/internal/vehicle/bluelink/identity.go b/internal/vehicle/bluelink/identity.go
index 936a7d513..f262eeaa1 100644
--- a/internal/vehicle/bluelink/identity.go
+++ b/internal/vehicle/bluelink/identity.go
@@ -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",
diff --git a/internal/vehicle/ford.go b/internal/vehicle/ford.go
index e4eb98f86..78acb5cf3 100644
--- a/internal/vehicle/ford.go
+++ b/internal/vehicle/ford.go
@@ -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"},
diff --git a/internal/vehicle/id/refresh.go b/internal/vehicle/id/refresh.go
index 73dc6799a..b51a6dfd9 100644
--- a/internal/vehicle/id/refresh.go
+++ b/internal/vehicle/id/refresh.go
@@ -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{
diff --git a/internal/vehicle/nissan.go b/internal/vehicle/nissan.go
index 9f2e56059..3bf0f0564 100644
--- a/internal/vehicle/nissan.go
+++ b/internal/vehicle/nissan.go
@@ -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},
diff --git a/internal/vehicle/vw/refresh.go b/internal/vehicle/vw/refresh.go
index 7445d2093..cfa03b0a5 100644
--- a/internal/vehicle/vw/refresh.go
+++ b/internal/vehicle/vw/refresh.go
@@ -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},
diff --git a/util/oauth/tokensource.go b/util/oauth/tokensource.go
index c92276998..fd8bd7a06 100644
--- a/util/oauth/tokensource.go
+++ b/util/oauth/tokensource.go
@@ -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 {