Move error handling to util.go

Author: Artur Kh

authorizations.go

@@ -3,12 +3,10 @@ package main
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"net/http"
 	"strings"
-	"time"
 )
 
 type AuthorizationRequest struct {
@@ -18,15 +16,13 @@ type AuthorizationRequest struct {
 }
 
 type AuthorizationResponse struct {
-	Id    int
-	URL   string
 	Token string
 }
 
 func Authorize(username, password string) (string, error) {
 	payload := AuthorizationRequest{
 		[]string{"gist"},
-		fmt.Sprintf("go-gist (%d)", time.Now().Unix()),
+		"go-gist", //fmt.Sprintf("go-gist (%d)", time.Now().Unix()),
 		"https://github.com/khrt/go-gist",
 	}
 
@@ -70,22 +66,7 @@ func Authorize(username, password string) (string, error) {
 	}
 
 	if resp.StatusCode != 201 {
-		var e map[string]json.RawMessage
-		if err := json.Unmarshal(body, &e); err != nil {
-			return "", err
-		}
-
-		message := string(e["message"])
-
-		if e["errors"] != nil {
-			var ee []map[string]string
-			if err := json.Unmarshal(e["errors"], &ee); err != nil {
-				return "", err
-			}
-			message += fmt.Sprintf(" (%s %s)", ee[0]["resource"], ee[0]["code"])
-		}
-
-		return "", errors.New(message)
+		return "", GistParseError(body)
 	}
 
 	var auth AuthorizationResponse

gist.go

@@ -3,8 +3,6 @@ package main
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
-	"fmt"
 	"io/ioutil"
 	"net/http"
 )
@@ -134,11 +132,7 @@ func doRequest(req *http.Request) ([]byte, error) {
 	}
 
 	if resp.StatusCode != 200 && resp.StatusCode != 201 {
-		var f interface{}
-		if err := json.Unmarshal(body, &f); err != nil {
-			return nil, err
-		}
-		return nil, errors.New(fmt.Sprintf("%v", f.(map[string]interface{})["message"]))
+		return nil, GistParseError(body)
 	}
 
 	return body, nil

go-gist.go

@@ -39,7 +39,7 @@ func main() {
 	}
 
 	if err != nil {
-		fmt.Fprintf(os.Stderr, "error: %v\n", err)
+		fmt.Fprintf(os.Stderr, "Error: %v\n", err)
 		os.Exit(1)
 	}
 }

util.go

@@ -0,0 +1,32 @@
+package main
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"strings"
+)
+
+func GistParseError(body []byte) error {
+	var err map[string]json.RawMessage
+	if err := json.Unmarshal(body, &err); err != nil {
+		return err
+	}
+
+	message := string(err["message"])
+
+	if err["errors"] != nil {
+		var errs []map[string]string
+		if err := json.Unmarshal(err["errors"], &errs); err != nil {
+			return err
+		}
+
+		var messages []string
+		for _, m := range errs {
+			messages = append(messages, fmt.Sprintf("%s %s", m["resource"], m["code"]))
+		}
+		message += " (" + strings.Join(messages, ",") + ")"
+	}
+
+	return errors.New(message)
+}