client: propagate deviceID option to FactoryReset call

Danielius1922 · Daniel Adam · commit 48d29f285e4f · 2024-02-03T18:46:19.000+01:00
diff --git a/client/disownDevice.go b/client/disownDevice.go
@@ -42,14 +42,14 @@ func (c *Client) DisownDevice(ctx context.Context, deviceID string, opts ...Comm
 	}
 	defer c.removeTemporaryDeviceFromCache(ctx, d)
 
+	if c.useDeviceIDInQuery {
+		cfg.opts = append(cfg.opts, coap.WithDeviceID(deviceID))
+	}
+
 	ok := d.IsSecured()
 	if !ok {
 		return d.FactoryReset(ctx, links, cfg.opts...)
 	}
 
-	if c.useDeviceIDInQuery {
-		cfg.opts = append(cfg.opts, coap.WithDeviceID(deviceID))
-	}
-
 	return d.Disown(ctx, links, cfg.opts...)
 }

Original file line number	Diff line number	Diff line change
`@@ -42,14 +42,14 @@ func (c *Client) DisownDevice(ctx context.Context, deviceID string, opts ...Comm`
`42`	`42`	`}`
`43`	`43`	`defer c.removeTemporaryDeviceFromCache(ctx, d)`
`44`	`44`
	`45`	`+ if c.useDeviceIDInQuery {`
	`46`	`+ cfg.opts = append(cfg.opts, coap.WithDeviceID(deviceID))`
	`47`	`+ }`
	`48`	`+`
`45`	`49`	`ok := d.IsSecured()`
`46`	`50`	`if !ok {`
`47`	`51`	`return d.FactoryReset(ctx, links, cfg.opts...)`
`48`	`52`	`}`
`49`	`53`
`50`		`- if c.useDeviceIDInQuery {`
`51`		`- cfg.opts = append(cfg.opts, coap.WithDeviceID(deviceID))`
`52`		`- }`
`53`		`-`
`54`	`54`	`return d.Disown(ctx, links, cfg.opts...)`
`55`	`55`	`}`