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

Telemetry: avoid errors when authorization failed for technical reasons (#9803)

Browse source
This commit is contained in:
andig 2023-09-09 12:52:05 +02:00 • committed by GitHub
parent 68ec274c00
commit 422922940b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
util/sponsor/auth.go
View file

@ -17,10 +17,16 @@ var (
ExpiresAt time.Time
)
const unavailable = "sponsorship unavailable"
func IsAuthorized() bool {
return len(Subject) > 0
}
func IsAuthorizedForApi() bool {
return IsAuthorized() && Subject != unavailable
}
// check and set sponsorship token
func ConfigureSponsorship(token string) error {
host := util.Getenv("GRPC_URI", cloud.Host)
@ -43,7 +49,7 @@ func ConfigureSponsorship(token string) error {
if err != nil {
if s, ok := status.FromError(err); ok && s.Code() != codes.Unknown {
Subject = "sponsorship unavailable"
Subject = unavailable
err = nil
} else {
err = fmt.Errorf("sponsortoken: %w", err)

2
util/telemetry/charge.go
View file

@ -30,7 +30,7 @@ var (
func Enabled() bool {
enabled, _ := settings.Bool(enabledSetting)
return enabled && sponsor.IsAuthorized() && instanceID != ""
return enabled && sponsor.IsAuthorizedForApi() && instanceID != ""
}
func Enable(enable bool) error {