diff --git a/cli/device/list.go b/cli/device/list.go
index d7d9597f..99a339a4 100644
--- a/cli/device/list.go
+++ b/cli/device/list.go
@@ -92,6 +92,11 @@ func (r listResult) Data() interface{} {
return r.devices
}
+func cleanStrings(serial string) string {
+ serial = strings.Trim(serial, "\n")
+ return strings.Trim(serial, " ")
+}
+
func (r listResult) String() string {
if len(r.devices) == 0 {
return "No devices found."
@@ -100,11 +105,11 @@ func (r listResult) String() string {
t.SetHeader("Name", "ID", "Board", "FQBN", "SerialNumber", "Status", "Tags")
for _, device := range r.devices {
t.AddRow(
- device.Name,
+ cleanStrings(device.Name),
device.ID,
device.Board,
device.FQBN,
- device.Serial,
+ cleanStrings(device.Serial),
dereferenceString(device.Status),
strings.Join(device.Tags, ","),
)
diff --git a/internal/iot/client.go b/internal/iot/client.go
index ece0d015..788a4e05 100644
--- a/internal/iot/client.go
+++ b/internal/iot/client.go
@@ -560,15 +560,15 @@ func (cl *Client) TemplateApply(ctx context.Context, id, thingId, prefix, device
return dev, nil
}
-func (cl *Client) setup(client, secret, organization string) error {
+func (cl *Client) setup(client, secret, organizationId string) error {
baseURL := GetArduinoAPIBaseURL()
// Configure a token source given the user's credentials.
- cl.token = NewUserTokenSource(client, secret, baseURL)
+ cl.token = NewUserTokenSource(client, secret, baseURL, organizationId)
config := iotclient.NewConfiguration()
- if organization != "" {
- config.AddDefaultHeader("X-Organization", organization)
+ if organizationId != "" {
+ config.AddDefaultHeader("X-Organization", organizationId)
}
config.Servers = iotclient.ServerConfigurations{
{
diff --git a/internal/iot/token.go b/internal/iot/token.go
index ebca7536..07f83bd7 100644
--- a/internal/iot/token.go
+++ b/internal/iot/token.go
@@ -39,10 +39,13 @@ func GetArduinoAPIBaseURL() string {
}
// Build a new token source to forge api JWT tokens based on provided credentials
-func NewUserTokenSource(client, secret, baseURL string) oauth2.TokenSource {
+func NewUserTokenSource(client, secret, baseURL, organizationId string) oauth2.TokenSource {
// We need to pass the additional "audience" var to request an access token.
additionalValues := url.Values{}
additionalValues.Add("audience", "https://api2.arduino.cc/iot")
+ if organizationId != "" {
+ additionalValues.Add("organization_id", organizationId)
+ }
// Set up OAuth2 configuration.
config := cc.Config{
ClientID: client,
diff --git a/internal/ota-api/client.go b/internal/ota-api/client.go
index 1c4bd52f..9c2536d9 100644
--- a/internal/ota-api/client.go
+++ b/internal/ota-api/client.go
@@ -49,7 +49,7 @@ type OtaApiClient struct {
func NewClient(credentials *config.Credentials) *OtaApiClient {
host := iot.GetArduinoAPIBaseURL()
- tokenSource := iot.NewUserTokenSource(credentials.Client, credentials.Secret, host)
+ tokenSource := iot.NewUserTokenSource(credentials.Client, credentials.Secret, host, credentials.Organization)
return &OtaApiClient{
client: &http.Client{},
src: tokenSource,
diff --git a/internal/storage-api/client.go b/internal/storage-api/client.go
index fb00a792..c3d4e1f2 100644
--- a/internal/storage-api/client.go
+++ b/internal/storage-api/client.go
@@ -57,7 +57,7 @@ func getArduinoAPIBaseURL() string {
func NewClient(credentials *config.Credentials) *StorageApiClient {
host := getArduinoAPIBaseURL()
iothost := iot.GetArduinoAPIBaseURL()
- tokenSource := iot.NewUserTokenSource(credentials.Client, credentials.Secret, iothost)
+ tokenSource := iot.NewUserTokenSource(credentials.Client, credentials.Secret, iothost, credentials.Organization)
return &StorageApiClient{
client: &http.Client{},
src: tokenSource,
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy