internal/api -> pkg/api: make the api client public

After starting work on the desktop client, this was
a necessary to use the same client there.

Author: bradford-hamilton

cmd/root.go

@@ -6,12 +6,12 @@ import (
 	"os"
 	"time"
 
-	"github.com/cipherbin/cipher-bin-cli/internal/api"
+	"github.com/cipherbin/cipher-bin-cli/pkg/api"
 	"github.com/spf13/cobra"
 )
 
 // Version constant that represents the current build version
-const Version = "v.0.5.1"
+const Version = "v.0.5.2"
 
 // Email will be hydrated with it's value if a user runs the create cmd with the
 // flag --email (or -e)
@@ -34,7 +34,6 @@ var APIClient *api.Client
 
 func init() {
 	client := http.Client{Timeout: 15 * time.Second}
-
 	browserBaseURL := "https://cipherb.in"
 	apiBaseURL := "https://api.cipherb.in"
 

internal/api/api.go pkg/api/api.gointernal/api/api.go renamed to pkg/api/api.go

@@ -23,35 +23,28 @@ type CipherBinAPIClient interface {
 	Do(req *http.Request) (*http.Response, error)
 }
 
-// NewClient is a constructor for the ApiClient
+// NewClient is a constructor for the ApiClient and satifies the CipherBinAPIClient interface
 func NewClient(browserBaseURL, apiBaseURL string, client CipherBinAPIClient) (*Client, error) {
-	apiClient := &Client{
+	return &Client{
 		CipherBinAPIClient: client,
 		BrowserBaseURL:     browserBaseURL,
 		APIBaseURL:         apiBaseURL,
-	}
-
-	return apiClient, nil
+	}, nil
 }
 
-// PostMessage takes a msg of type *db.Message (this is what the server
-// uses and will expect) and posts it to the cipherbin api
+// PostMessage takes a msg of type *db.Message (this is what the server uses and will expect)
+// and posts it to the live cipherbin api
 func (c *Client) PostMessage(msg *db.Message) error {
 	payloadBytes, err := json.Marshal(msg)
 	if err != nil {
 		return err
 	}
 
-	req, err := http.NewRequest(
-		"POST",
-		fmt.Sprintf("%s%s", c.APIBaseURL, "/msg"),
-		bytes.NewBuffer(payloadBytes),
-	)
+	req, err := http.NewRequest("POST", c.APIBaseURL+"/msg", bytes.NewBuffer(payloadBytes))
 	if err != nil {
 		return err
 	}
 	defer req.Body.Close()
-
 	req.Header.Set("Content-Type", "application/json")
 
 	res, err := c.Do(req)
@@ -63,11 +56,10 @@ func (c *Client) PostMessage(msg *db.Message) error {
 	if res.StatusCode != http.StatusOK {
 		return fmt.Errorf("Error: response status: %d", res.StatusCode)
 	}
-
 	return nil
 }
 
-// GetMessage
+// GetMessage simply takes a cipherb.in public URL string and returns the appropriate encrypted message
 func (c *Client) GetMessage(url string) (*app.MessageResponse, error) {
 	req, err := http.NewRequest("GET", url, nil)
 	if err != nil {
@@ -83,14 +75,12 @@ func (c *Client) GetMessage(url string) (*app.MessageResponse, error) {
 	if res.StatusCode == http.StatusNotFound {
 		return nil, errors.New("Sorry, this message has either already been viewed and destroyed or it never existed at all")
 	}
-
 	if res.StatusCode != http.StatusOK {
 		return nil, fmt.Errorf("Error: response status: %d", res.StatusCode)
 	}
 
 	var r app.MessageResponse
-	err = json.NewDecoder(res.Body).Decode(&r)
-	if err != nil {
+	if err := json.NewDecoder(res.Body).Decode(&r); err != nil {
 		return nil, err
 	}