starting sync and tuning login feature

Author: saniales

cmd/arduino.go

@@ -436,17 +436,21 @@ func executeLoginCommand(cmd *cobra.Command, args []string) {
 	token, err := authConf.Token(usr, pwd)
 	if err != nil {
 		formatter.PrintError(err)
+		return
 	}
 
-	NetRC.NewMachine("arduino.cc", usr, token.Access, "arduino-cli")
+	NetRC.RemoveMachine("arduino.cc")
+	NetRC.NewMachine("arduino.cc", usr, token.Access, token.Refresh)
 	content, err := NetRC.MarshalText()
 	if err != nil {
 		formatter.PrintError(err)
+		return
 	}
 
 	err = ioutil.WriteFile(netRCFile, content, 0666)
 	if err != nil {
 		formatter.PrintError(err)
+		return
 	}
 
 	formatter.PrintResult(`Successfully logged into the system

cmd/arduino_sketch.go

@@ -32,7 +32,6 @@ package cmd
 import (
 	"context"
 	"encoding/base64"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io/ioutil"
@@ -96,21 +95,19 @@ func executeSketchSyncCommand(cmd *cobra.Command, args []string) error {
 
 	client := createClient.New(nil)
 	tok := "Bearer " + bearerToken
-	resp, err := client.SearchSketches(context.Background(), "", nil, nil, &tok)
+	resp, err := client.SearchSketches(context.Background(), createClient.SearchSketchesPath(), nil, nil, &tok)
 	if err != nil {
+		//formatter.Print(err)
 		formatter.PrintErrorMessage("Cannot get create sketches, sync failed")
 		return nil
 	}
 	defer resp.Body.Close()
-	content, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		formatter.PrintErrorMessage("Cannot get create sketches, sync failed")
-		return nil
-	}
 
-	var onlineSketches createClient.ArduinoCreateSketches
-	err = json.Unmarshal(content, resp)
+	onlineSketches, err := client.DecodeArduinoCreateSketches(resp)
 	if err != nil {
+		content, _ := ioutil.ReadAll(resp.Body)
+		formatter.PrintResult(content)
+		formatter.Print(err)
 		formatter.PrintErrorMessage("Cannot unmarshal response from create, sync failed")
 		return nil
 	}
@@ -293,7 +290,11 @@ func login() (string, error) {
 	}
 
 	netRCFile := filepath.Join(home, ".netrc")
-	NetRC, err := netrc.ParseFile(netRCFile)
+	file, err := os.OpenFile(netRCFile, os.O_CREATE|os.O_RDONLY, 0666)
+	if err != nil {
+		return "", err
+	}
+	NetRC, err := netrc.Parse(file)
 	if err != nil {
 		return "", err
 	}
@@ -308,7 +309,15 @@ func login() (string, error) {
 		return "", err
 	}
 
-	arduinoMachine.UpdatePassword(newToken.Access)
+	var token string
+	if newToken.TTL != 0 { //we haven't recently requested a valid token, which is in .netrc under "account", so we have to update it
+		arduinoMachine.UpdatePassword(newToken.Refresh)
+		arduinoMachine.UpdateAccount(newToken.Access)
+		token = newToken.Access
+	} else {
+		token = arduinoMachine.Account
+	}
+
 	content, err := NetRC.MarshalText()
 	if err == nil { //serialize new info
 		err := ioutil.WriteFile(netRCFile, content, 0666)
@@ -318,5 +327,5 @@ func login() (string, error) {
 	} else if GlobalFlags.Verbose > 0 {
 		formatter.Print(err.Error())
 	}
-	return newToken.Access, nil
+	return token, nil
 }

create_client_helpers/sketches.go

@@ -42,6 +42,12 @@ func CreateSketchesPath() string {
 	return fmt.Sprintf("/create/v1/sketches")
 }
 
+const (
+	devURL  = "api-dev.arduino.cc"
+	prodURL = "api.arduino.cc"
+	prod    = false
+)
+
 // CreateSketches Adds a new sketch.
 func (c *Client) CreateSketches(ctx context.Context, path string, payload *Sketch, authorization string) (*http.Response, error) {
 	req, err := c.NewCreateSketchesRequest(ctx, path, payload, authorization)
@@ -62,6 +68,11 @@ func (c *Client) NewCreateSketchesRequest(ctx context.Context, path string, payl
 	if scheme == "" {
 		scheme = "http"
 	}
+	if prod {
+		path = prodURL + path
+	} else {
+		path = devURL + path
+	}
 	u := url.URL{Host: c.Host, Scheme: scheme, Path: path}
 	req, err := http.NewRequest("PUT", u.String(), &body)
 	if err != nil {
@@ -95,6 +106,11 @@ func (c *Client) NewDeleteSketchesRequest(ctx context.Context, path string, auth
 	if scheme == "" {
 		scheme = "http"
 	}
+	if prod {
+		path = prodURL + path
+	} else {
+		path = devURL + path
+	}
 	u := url.URL{Host: c.Host, Scheme: scheme, Path: path}
 	req, err := http.NewRequest("DELETE", u.String(), nil)
 	if err != nil {
@@ -135,6 +151,11 @@ func (c *Client) NewEditSketchesRequest(ctx context.Context, path string, payloa
 	if scheme == "" {
 		scheme = "http"
 	}
+	if prod {
+		path = prodURL + path
+	} else {
+		path = devURL + path
+	}
 	u := url.URL{Host: c.Host, Scheme: scheme, Path: path}
 	req, err := http.NewRequest("POST", u.String(), &body)
 	if err != nil {
@@ -168,6 +189,11 @@ func (c *Client) NewSearchSketchesRequest(ctx context.Context, path string, offs
 	if scheme == "" {
 		scheme = "http"
 	}
+	if prod {
+		path = prodURL + path
+	} else {
+		path = devURL + path
+	}
 	u := url.URL{Host: c.Host, Scheme: scheme, Path: path}
 	values := u.Query()
 	if offset != nil {
@@ -211,6 +237,11 @@ func (c *Client) NewShowSketchesRequest(ctx context.Context, path string, author
 	if scheme == "" {
 		scheme = "http"
 	}
+	if prod {
+		path = prodURL + path
+	} else {
+		path = devURL + path
+	}
 	u := url.URL{Host: c.Host, Scheme: scheme, Path: path}
 	req, err := http.NewRequest("GET", u.String(), nil)
 	if err != nil {

create_client_helpers/user_types.go

@@ -30,6 +30,9 @@
 package createClient
 
 import (
+	"encoding/base64"
+	"fmt"
+
 	"github.com/bcmi-labs/arduino-modules/sketches"
 )
 
@@ -63,7 +66,9 @@ type Sketch struct {
 }
 
 func ConvertFrom(sketch sketches.Sketch) *Sketch {
-	ino := string(sketch.Ino.Data)
+	var temp []byte
+	base64.StdEncoding.Encode(temp, sketch.Ino.Data)
+	ino := string(temp)
 	ret := Sketch{
 		Name:   sketch.Name,
 		Folder: &sketch.Path,
@@ -78,12 +83,15 @@ func ConvertFrom(sketch sketches.Sketch) *Sketch {
 	}
 	ret.Files = make([]*File, len(sketch.Files))
 	for i, f := range sketch.Files {
-		data := string(f.Data)
+		base64.StdEncoding.Encode(temp, f.Data)
+		data := string(temp)
 		ret.Files[i] = &File{
 			Data: &data,
 			Name: f.Name,
 		}
 	}
+	fmt.Println(sketch.Metadata.CPU.Fqbn)
+	fmt.Println(*ret.Metadata.CPU.Fqbn)
 	return &ret
 }