From 6463e4cffda26a3c2f2275ec9774fb350ecb735b Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Sun, 2 May 2021 11:12:19 +0200
Subject: [PATCH] Align token source usage

---
 internal/charger/easee.go  |  2 +-
 internal/vehicle/id/api.go | 11 +++++------
 internal/vehicle/nissan.go |  6 +++---
 internal/vehicle/vw/api.go | 15 +++++++--------
 4 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/internal/charger/easee.go b/internal/charger/easee.go
index 728fdb61a5..dc4d1eebcf 100644
--- a/internal/charger/easee.go
+++ b/internal/charger/easee.go
@@ -65,7 +65,7 @@ func NewEasee(user, password, charger string, cache time.Duration) (*Easee, erro
 		return c, err
 	}
 
-	// replace transport client with authenticated client
+	// replace client transport with authenticated transport
 	c.Client.Transport = &oauth2.Transport{
 		Source: ts,
 		Base:   c.Client.Transport,
diff --git a/internal/vehicle/id/api.go b/internal/vehicle/id/api.go
index 152a4c1a34..9f5eef7d68 100644
--- a/internal/vehicle/id/api.go
+++ b/internal/vehicle/id/api.go
@@ -35,14 +35,13 @@ const (
 
 // NewAPI creates a new vehicle
 func NewAPI(log *util.Logger, identity oauth2.TokenSource) *API {
-	helper := request.NewHelper(log)
-	helper.Client.Transport = &oauth2.Transport{
-		Source: identity,
-		Base:   helper.Transport,
+	v := &API{
+		Helper: request.NewHelper(log),
 	}
 
-	v := &API{
-		Helper: helper,
+	v.Client.Transport = &oauth2.Transport{
+		Source: identity,
+		Base:   v.Client.Transport,
 	}
 
 	return v
diff --git a/internal/vehicle/nissan.go b/internal/vehicle/nissan.go
index 3bf0f05640..0394a69a6f 100644
--- a/internal/vehicle/nissan.go
+++ b/internal/vehicle/nissan.go
@@ -82,10 +82,10 @@ func NewNissanFromConfig(other map[string]interface{}) (api.Vehicle, error) {
 
 	token, err := v.authFlow()
 	if err == nil {
-		// replace transport client with authenticated client
-		v.Helper.Client.Transport = &oauth2.Transport{
+		// replace client transport with authenticated transport
+		v.Client.Transport = &oauth2.Transport{
 			Source: oauth.RefreshTokenSource((*oauth2.Token)(&token), v),
-			Base:   v.Helper.Client.Transport,
+			Base:   v.Client.Transport,
 		}
 	}
 
diff --git a/internal/vehicle/vw/api.go b/internal/vehicle/vw/api.go
index c22efdc475..6cfcaa1ff7 100644
--- a/internal/vehicle/vw/api.go
+++ b/internal/vehicle/vw/api.go
@@ -25,20 +25,19 @@ type API struct {
 }
 
 // NewAPI creates a new api client
-func NewAPI(log *util.Logger, identity *Identity, brand, country string) *API {
-	helper := request.NewHelper(log)
-	helper.Client.Transport = &oauth2.Transport{
-		Source: identity,
-		Base:   helper.Transport,
-	}
-
+func NewAPI(log *util.Logger, identity oauth2.TokenSource, brand, country string) *API {
 	v := &API{
-		Helper:  helper,
+		Helper:  request.NewHelper(log),
 		brand:   brand,
 		country: country,
 		baseURI: DefaultBaseURI,
 	}
 
+	v.Client.Transport = &oauth2.Transport{
+		Source: identity,
+		Base:   v.Client.Transport,
+	}
+
 	return v
 }