From 6d674728e9a34169657ad6ea17a2a02386a9d1d1 Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Sun, 9 Jul 2023 19:48:41 +0200
Subject: [PATCH] chore: remove unused tokensource property (#8888)

---
 charger/easee/identity.go | 39 ++++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/charger/easee/identity.go b/charger/easee/identity.go
index f50024535f..0c24b5e3b4 100644
--- a/charger/easee/identity.go
+++ b/charger/easee/identity.go
@@ -35,7 +35,6 @@ func (t *Token) AsOAuth2Token() *oauth2.Token {
 // tokenSource is an oauth2.TokenSource
 type tokenSource struct {
 	*request.Helper
-	oauth2.TokenSource
 }
 
 // TokenSource creates an Easee token source
@@ -54,38 +53,40 @@ func TokenSource(log *util.Logger, user, password string) (oauth2.TokenSource, e
 
 	uri := fmt.Sprintf("%s/%s", API, "accounts/login")
 	req, err := request.New(http.MethodPost, uri, request.MarshalJSON(data), request.JSONEncoding)
+	if err != nil {
+		return nil, err
+	}
 
-	if err == nil {
-		var token Token
-		if err = c.DoJSON(req, &token); err == nil {
-			token := token.AsOAuth2Token()
-			ts := oauth.RefreshTokenSource(token, c)
-			c.TokenSource = oauth2.ReuseTokenSourceWithExpiry(token, ts, 15*time.Minute)
-		}
+	var token Token
+	if err := c.DoJSON(req, &token); err != nil {
+		return nil, err
 	}
 
-	return c, err
+	oauthToken := token.AsOAuth2Token()
+	ts := oauth2.ReuseTokenSourceWithExpiry(oauthToken, oauth.RefreshTokenSource(oauthToken, c), 15*time.Minute)
+
+	return ts, nil
 }
 
-func (c *tokenSource) RefreshToken(token *oauth2.Token) (*oauth2.Token, error) {
+func (c *tokenSource) RefreshToken(oauthToken *oauth2.Token) (*oauth2.Token, error) {
 	data := struct {
 		AccessToken  string `json:"accessToken"`
 		RefreshToken string `json:"refreshToken"`
 	}{
-		AccessToken:  token.AccessToken,
-		RefreshToken: token.RefreshToken,
+		AccessToken:  oauthToken.AccessToken,
+		RefreshToken: oauthToken.RefreshToken,
 	}
 
 	uri := fmt.Sprintf("%s/%s", API, "accounts/refresh_token")
 	req, err := request.New(http.MethodPost, uri, request.MarshalJSON(data), request.JSONEncoding)
+	if err != nil {
+		return oauthToken, err
+	}
 
-	var res *oauth2.Token
-	if err == nil {
-		var refreshed Token
-		if err = c.DoJSON(req, &refreshed); err == nil {
-			res = refreshed.AsOAuth2Token()
-		}
+	var token Token
+	if err := c.DoJSON(req, &token); err != nil {
+		return oauthToken, err
 	}
 
-	return res, err
+	return token.AsOAuth2Token(), nil
 }