improve auth handling

Signed-off-by: Markus Blaschke <[email protected]>

Author: mblaschke

shellyplug/prober.gen1.go

@@ -13,7 +13,7 @@ import (
 func (sp *ShellyPlug) collectFromTargetGen1(target discovery.DiscoveryTarget, logger *zap.SugaredLogger, infoLabels, targetLabels prometheus.Labels) {
 	shellyProber := shellyprober.ShellyProberGen1{
 		Target: target,
-		Client: sp.client.Clone(),
+		Client: sp.cloneRestyClient(),
 		Ctx:    sp.ctx,
 		Cache:  globalCache,
 	}

shellyplug/prober.gen2.go

@@ -24,7 +24,7 @@ func (sp *ShellyPlug) collectFromTargetGen2(target discovery.DiscoveryTarget, lo
 
 	shellyProber := shellyprober.ShellyProberGen2{
 		Target: target,
-		Client: sp.client.Clone(),
+		Client: sp.cloneRestyClient(),
 		Ctx:    sp.ctx,
 		Cache:  globalCache,
 	}

shellyplug/prober.go

@@ -27,6 +27,11 @@ type (
 		logger   *zap.SugaredLogger
 		registry *prometheus.Registry
 
+		auth struct {
+			username string
+			password string
+		}
+
 		targets struct {
 			list []discovery.DiscoveryTarget
 			lock sync.RWMutex
@@ -80,9 +85,20 @@ func (sp *ShellyPlug) SetTimeout(timeout time.Duration) {
 }
 
 func (sp *ShellyPlug) SetHttpAuth(username, password string) {
-	sp.client.SetDisableWarn(true)
-	sp.client.SetBasicAuth(username, password)
-	sp.client.SetDigestAuth(username, password)
+	sp.auth.username = username
+	sp.auth.password = password
+}
+
+func (sp *ShellyPlug) cloneRestyClient() *resty.Client {
+	client := sp.client.Clone()
+
+	if sp.auth.username != "" {
+		client.SetDisableWarn(true)
+		client.SetBasicAuth(sp.auth.username, sp.auth.password)
+		client.SetDigestAuth(sp.auth.username, sp.auth.password)
+	}
+
+	return client
 }
 
 func (sp *ShellyPlug) SetTargets(targets []discovery.DiscoveryTarget) {