Use organization ID in iot-client calls

polldo · polldo · commit 788b83882e5c · 2022-08-01T20:45:14.000+02:00
diff --git a/command/dashboard/create.go b/command/dashboard/create.go
@@ -34,7 +34,7 @@ type CreateParams struct {
 
 // Create allows to create a new dashboard.
 func Create(params *CreateParams, cred *config.Credentials) (*DashboardInfo, error) {
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return nil, err
 	}
diff --git a/command/dashboard/delete.go b/command/dashboard/delete.go
@@ -31,7 +31,7 @@ type DeleteParams struct {
 // Delete command is used to delete a dashboard
 // from Arduino IoT Cloud.
 func Delete(params *DeleteParams, cred *config.Credentials) error {
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return err
 	}
diff --git a/command/dashboard/extract.go b/command/dashboard/extract.go
@@ -34,7 +34,7 @@ type ExtractParams struct {
 // Extract command is used to extract a dashboard template
 // from a dashboard on Arduino IoT Cloud.
 func Extract(params *ExtractParams, cred *config.Credentials) (map[string]interface{}, error) {
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return nil, err
 	}
diff --git a/command/dashboard/list.go b/command/dashboard/list.go
@@ -25,7 +25,7 @@ import (
 // List command is used to list
 // the dashboards of Arduino IoT Cloud.
 func List(cred *config.Credentials) ([]DashboardInfo, error) {
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return nil, err
 	}
diff --git a/command/device/create.go b/command/device/create.go
@@ -63,7 +63,7 @@ func Create(params *CreateParams, cred *config.Credentials) (*DeviceInfo, error)
 		)
 	}
 
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return nil, err
 	}
diff --git a/command/device/creategeneric.go b/command/device/creategeneric.go
@@ -44,7 +44,7 @@ type DeviceGenericInfo struct {
 
 // CreateGeneric command is used to add a new generic device to Arduino IoT Cloud.
 func CreateGeneric(params *CreateGenericParams, cred *config.Credentials) (*DeviceGenericInfo, error) {
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return nil, err
 	}
diff --git a/command/device/createlora.go b/command/device/createlora.go
@@ -107,7 +107,7 @@ func CreateLora(params *CreateLoraParams, cred *config.Credentials) (*DeviceLora
 		return nil, err
 	}
 
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return nil, err
 	}
diff --git a/command/device/delete.go b/command/device/delete.go
@@ -43,7 +43,7 @@ func Delete(params *DeleteParams, cred *config.Credentials) error {
 		return errors.New("cannot use both ID and Tags. only one of them should be not nil")
 	}
 
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return err
 	}
diff --git a/command/device/list.go b/command/device/list.go
@@ -33,7 +33,7 @@ type ListParams struct {
 // List command is used to list
 // the devices of Arduino IoT Cloud.
 func List(params *ListParams, cred *config.Credentials) ([]DeviceInfo, error) {
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return nil, err
 	}
diff --git a/command/device/listfrequency.go b/command/device/listfrequency.go
@@ -34,7 +34,7 @@ type FrequencyPlanInfo struct {
 // ListFrequencyPlans command is used to list
 // the supported LoRa frequency plans.
 func ListFrequencyPlans(cred *config.Credentials) ([]FrequencyPlanInfo, error) {
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return nil, err
 	}
diff --git a/command/ota/massupload.go b/command/ota/massupload.go
@@ -71,7 +71,7 @@ func MassUpload(params *MassUploadParams, cred *config.Credentials) ([]Result, e
 		return nil, fmt.Errorf("%s: %w", "cannot generate .ota file", err)
 	}
 
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return nil, err
 	}
diff --git a/command/ota/upload.go b/command/ota/upload.go
@@ -45,7 +45,7 @@ type UploadParams struct {
 // Upload command is used to upload a firmware OTA,
 // on a device of Arduino IoT Cloud.
 func Upload(params *UploadParams, cred *config.Credentials) error {
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return err
 	}
diff --git a/command/tag/create.go b/command/tag/create.go
@@ -35,7 +35,7 @@ type CreateTagsParams struct {
 // CreateTags allows to create or overwrite tags
 // on a resource of Arduino IoT Cloud.
 func CreateTags(params *CreateTagsParams, cred *config.Credentials) error {
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return err
 	}
diff --git a/command/tag/delete.go b/command/tag/delete.go
@@ -35,7 +35,7 @@ type DeleteTagsParams struct {
 // DeleteTags command is used to delete tags of a device
 // from Arduino IoT Cloud.
 func DeleteTags(params *DeleteTagsParams, cred *config.Credentials) error {
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return err
 	}
diff --git a/command/thing/bind.go b/command/thing/bind.go
@@ -33,7 +33,7 @@ type BindParams struct {
 // Bind command is used to bind a thing to a device
 // on Arduino IoT Cloud.
 func Bind(params *BindParams, cred *config.Credentials) error {
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return err
 	}
diff --git a/command/thing/clone.go b/command/thing/clone.go
@@ -33,7 +33,7 @@ type CloneParams struct {
 
 // Clone allows to create a new thing from an already existing one.
 func Clone(params *CloneParams, cred *config.Credentials) (*ThingInfo, error) {
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return nil, err
 	}
diff --git a/command/thing/create.go b/command/thing/create.go
@@ -34,7 +34,7 @@ type CreateParams struct {
 
 // Create allows to create a new thing.
 func Create(params *CreateParams, cred *config.Credentials) (*ThingInfo, error) {
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return nil, err
 	}
diff --git a/command/thing/delete.go b/command/thing/delete.go
@@ -43,7 +43,7 @@ func Delete(params *DeleteParams, cred *config.Credentials) error {
 		return errors.New("cannot use both ID and Tags. only one of them should be not nil")
 	}
 
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return err
 	}
diff --git a/command/thing/extract.go b/command/thing/extract.go
@@ -34,7 +34,7 @@ type ExtractParams struct {
 // Extract command is used to extract a thing template
 // from a thing on Arduino IoT Cloud.
 func Extract(params *ExtractParams, cred *config.Credentials) (map[string]interface{}, error) {
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return nil, err
 	}
diff --git a/command/thing/list.go b/command/thing/list.go
@@ -36,7 +36,7 @@ type ListParams struct {
 // List command is used to list
 // the things of Arduino IoT Cloud.
 func List(params *ListParams, cred *config.Credentials) ([]ThingInfo, error) {
-	iotClient, err := iot.NewClient(cred.Client, cred.Secret)
+	iotClient, err := iot.NewClient(cred)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/iot/client.go b/internal/iot/client.go
@@ -23,6 +23,7 @@ import (
 	"os"
 
 	"github.com/antihax/optional"
+	"github.com/arduino/arduino-cloud-cli/internal/config"
 	iotclient "github.com/arduino/iot-client-go"
 )
 
@@ -33,10 +34,10 @@ type Client struct {
 }
 
 // NewClient returns a new client implementing the Client interface.
-// It needs a ClientID and SecretID for cloud authentication.
-func NewClient(clientID, secretID string) (*Client, error) {
+// It needs client Credentials for cloud authentication.
+func NewClient(cred *config.Credentials) (*Client, error) {
 	cl := &Client{}
-	err := cl.setup(clientID, secretID)
+	err := cl.setup(cred.Client, cred.Secret, cred.Organization)
 	if err != nil {
 		err = fmt.Errorf("instantiate new iot client: %w", err)
 		return nil, err
@@ -350,7 +351,7 @@ func (cl *Client) DashboardDelete(id string) error {
 	return nil
 }
 
-func (cl *Client) setup(client, secret string) error {
+func (cl *Client) setup(client, secret, organization string) error {
 	// Get the access token in exchange of client_id and client_secret
 	tok, err := token(client, secret)
 	if err != nil {
@@ -363,7 +364,11 @@ func (cl *Client) setup(client, secret string) error {
 
 	// Create an instance of the iot-api Go client, we pass an empty config
 	// because defaults are ok
-	cl.api = iotclient.NewAPIClient(iotclient.NewConfiguration())
+	config := iotclient.NewConfiguration()
+	if organization != "" {
+		config.DefaultHeader = map[string]string{"X-Organization": organization}
+	}
+	cl.api = iotclient.NewAPIClient(config)
 
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ type CreateParams struct {`
`34`	`34`
`35`	`35`	`// Create allows to create a new dashboard.`
`36`	`36`	`func Create(params CreateParams, cred config.Credentials) (*DashboardInfo, error) {`
`37`		`- iotClient, err := iot.NewClient(cred.Client, cred.Secret)`
	`37`	`+ iotClient, err := iot.NewClient(cred)`
`38`	`38`	`if err != nil {`
`39`	`39`	`return nil, err`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ type DeleteParams struct {`
`31`	`31`	`// Delete command is used to delete a dashboard`
`32`	`32`	`// from Arduino IoT Cloud.`
`33`	`33`	`func Delete(params DeleteParams, cred config.Credentials) error {`
`34`		`- iotClient, err := iot.NewClient(cred.Client, cred.Secret)`
	`34`	`+ iotClient, err := iot.NewClient(cred)`
`35`	`35`	`if err != nil {`
`36`	`36`	`return err`
`37`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ type ExtractParams struct {`
`34`	`34`	`// Extract command is used to extract a dashboard template`
`35`	`35`	`// from a dashboard on Arduino IoT Cloud.`
`36`	`36`	`func Extract(params ExtractParams, cred config.Credentials) (map[string]interface{}, error) {`
`37`		`- iotClient, err := iot.NewClient(cred.Client, cred.Secret)`
	`37`	`+ iotClient, err := iot.NewClient(cred)`
`38`	`38`	`if err != nil {`
`39`	`39`	`return nil, err`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ import (`
`25`	`25`	`// List command is used to list`
`26`	`26`	`// the dashboards of Arduino IoT Cloud.`
`27`	`27`	`func List(cred *config.Credentials) ([]DashboardInfo, error) {`
`28`		`- iotClient, err := iot.NewClient(cred.Client, cred.Secret)`
	`28`	`+ iotClient, err := iot.NewClient(cred)`
`29`	`29`	`if err != nil {`
`30`	`30`	`return nil, err`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func Create(params CreateParams, cred config.Credentials) (*DeviceInfo, error)`
`63`	`63`	`)`
`64`	`64`	`}`
`65`	`65`
`66`		`- iotClient, err := iot.NewClient(cred.Client, cred.Secret)`
	`66`	`+ iotClient, err := iot.NewClient(cred)`
`67`	`67`	`if err != nil {`
`68`	`68`	`return nil, err`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ type DeviceGenericInfo struct {`
`44`	`44`
`45`	`45`	`// CreateGeneric command is used to add a new generic device to Arduino IoT Cloud.`
`46`	`46`	`func CreateGeneric(params CreateGenericParams, cred config.Credentials) (*DeviceGenericInfo, error) {`
`47`		`- iotClient, err := iot.NewClient(cred.Client, cred.Secret)`
	`47`	`+ iotClient, err := iot.NewClient(cred)`
`48`	`48`	`if err != nil {`
`49`	`49`	`return nil, err`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func CreateLora(params CreateLoraParams, cred config.Credentials) (*DeviceLora`
`107`	`107`	`return nil, err`
`108`	`108`	`}`
`109`	`109`
`110`		`- iotClient, err := iot.NewClient(cred.Client, cred.Secret)`
	`110`	`+ iotClient, err := iot.NewClient(cred)`
`111`	`111`	`if err != nil {`
`112`	`112`	`return nil, err`
`113`	`113`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func Delete(params DeleteParams, cred config.Credentials) error {`
`43`	`43`	`return errors.New("cannot use both ID and Tags. only one of them should be not nil")`
`44`	`44`	`}`
`45`	`45`
`46`		`- iotClient, err := iot.NewClient(cred.Client, cred.Secret)`
	`46`	`+ iotClient, err := iot.NewClient(cred)`
`47`	`47`	`if err != nil {`
`48`	`48`	`return err`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ type ListParams struct {`
`33`	`33`	`// List command is used to list`
`34`	`34`	`// the devices of Arduino IoT Cloud.`
`35`	`35`	`func List(params ListParams, cred config.Credentials) ([]DeviceInfo, error) {`
`36`		`- iotClient, err := iot.NewClient(cred.Client, cred.Secret)`
	`36`	`+ iotClient, err := iot.NewClient(cred)`
`37`	`37`	`if err != nil {`
`38`	`38`	`return nil, err`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ type FrequencyPlanInfo struct {`
`34`	`34`	`// ListFrequencyPlans command is used to list`
`35`	`35`	`// the supported LoRa frequency plans.`
`36`	`36`	`func ListFrequencyPlans(cred *config.Credentials) ([]FrequencyPlanInfo, error) {`
`37`		`- iotClient, err := iot.NewClient(cred.Client, cred.Secret)`
	`37`	`+ iotClient, err := iot.NewClient(cred)`
`38`	`38`	`if err != nil {`
`39`	`39`	`return nil, err`
`40`	`40`	`}`