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

chore: refactor forced token refresh
Some checks failed
Release / Demo (push) Has been cancelled
Details
Release / call-build-workflow (push) Has been cancelled
Details
Release / Publish Docker :release (push) Has been cancelled
Details
Release / Github & APT (push) Has been cancelled
Details
Release / Hassio Addon (push) Has been cancelled
Details

Browse source
This commit is contained in:
andig 2023-07-18 16:15:39 +02:00
parent 41ec772c84
commit b0d2c2f2d1
1 changed files with 16 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
util/oauth/helper.go
View file

@ -11,6 +11,9 @@ import (
func Refresh(log *util.Logger, token *oauth2.Token, ts oauth2.TokenSource, optMaxTokenLifetime ...time.Duration) {
var failed int
// limit lifetime of initial token
limitTokenLife(token, optMaxTokenLifetime...)
for range time.Tick(5 * time.Minute) {
if _, err := ts.Token(); err != nil {
t, err := ts.Token()
@ -26,13 +29,21 @@ func Refresh(log *util.Logger, token *oauth2.Token, ts oauth2.TokenSource, optMa
failed = 0
// limit lifetime of new tokens
if len(optMaxTokenLifetime) == 1 && t.Expiry != token.Expiry {
if t.Expiry != token.Expiry {
token = t
maxTokenLifetime := optMaxTokenLifetime[0]
if time.Until(token.Expiry) > maxTokenLifetime {
token.Expiry = time.Now().Add(maxTokenLifetime)
}
limitTokenLife(token, optMaxTokenLifetime...)
}
}
}
}
func limitTokenLife(token *oauth2.Token, optMaxTokenLifetime ...time.Duration) {
if len(optMaxTokenLifetime) != 1 {
return
}
maxTokenLifetime := optMaxTokenLifetime[0]
if time.Until(token.Expiry) > maxTokenLifetime {
token.Expiry = time.Now().Add(maxTokenLifetime)
}
}