Skip to content

Commit

Permalink
chore: remove unused tokensource property (#8888)
Browse files Browse the repository at this point in the history
  • Loading branch information
andig authored Jul 9, 2023
1 parent 6e6c04c commit 6d67472
Showing 1 changed file with 20 additions and 19 deletions.
39 changes: 20 additions & 19 deletions charger/easee/identity.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
}

0 comments on commit 6d67472

Please sign in to comment.