Give better error when authentication expires

ammario · ammario · commit b7cd44fe2891 · 2020-10-07T20:02:07.000-05:00
Change-Id: Ie78ab93f709305891cb613a9f3d9c2ecd2c3e342
diff --git a/coder-sdk/error.go b/coder-sdk/error.go
@@ -2,6 +2,7 @@ package coder
 
 import (
 	"encoding/json"
+	"fmt"
 	"net/http"
 	"net/http/httputil"
 
@@ -18,19 +19,28 @@ type apiError struct {
 	} `json:"error"`
 }
 
-func bodyError(resp *http.Response) error {
-	byt, err := httputil.DumpResponse(resp, true)
+// HTTPError represents an error from the Coder API.
+type HTTPError struct {
+	*http.Response
+}
+
+func (e *HTTPError) Error() string {
+	dump, err := httputil.DumpResponse(e.Response, false)
 	if err != nil {
-		return xerrors.Errorf("dump response: %w", err)
+		return fmt.Sprintf("dump response: %+v", err)
 	}
 
 	var msg apiError
 	// Try to decode the payload as an error, if it fails or if there is no error message,
 	// return the response URL with the dump.
-	if err := json.NewDecoder(resp.Body).Decode(&msg); err != nil || msg.Err.Msg == "" {
-		return xerrors.Errorf("%s\n%s", resp.Request.URL, byt)
+	if err := json.NewDecoder(e.Response.Body).Decode(&msg); err != nil || msg.Err.Msg == "" {
+		return fmt.Sprintf("%s\n%s", e.Response.Request.URL, dump)
 	}
 
 	// If the payload was a in the expected error format with a message, include it.
-	return xerrors.Errorf("%s\n%s%s", resp.Request.URL, byt, msg.Err.Msg)
+	return fmt.Sprintf("%s\n%s%s", e.Response.Request.URL, dump, msg.Err.Msg)
+}
+
+func bodyError(resp *http.Response) error {
+	return &HTTPError{resp}
 }
diff --git a/internal/cmd/auth.go b/internal/cmd/auth.go
@@ -1,6 +1,8 @@
 package cmd
 
 import (
+	"context"
+	"net/http"
 	"net/url"
 
 	"golang.org/x/xerrors"
@@ -27,8 +29,24 @@ func newClient() (*coder.Client, error) {
 		return nil, xerrors.Errorf("url misformatted: %w try runing \"coder login\" with a valid URL", err)
 	}
 
-	return &coder.Client{
+	c := &coder.Client{
 		BaseURL: u,
 		Token:   sessionToken,
-	}, nil
+	}
+
+	// Make sure we can make a request so the final
+	// error is more clean.
+	_, err = c.Me(context.Background())
+	if err != nil {
+		var he *coder.HTTPError
+		if xerrors.As(err, &he) {
+			switch he.StatusCode {
+			case http.StatusUnauthorized:
+				return nil, xerrors.Errorf("not authenticated: try running \"coder login`\"")
+			}
+		}
+		return nil, err
+	}
+
+	return c, nil
 }
diff --git a/internal/cmd/shell.go b/internal/cmd/shell.go
@@ -71,7 +71,7 @@ func shell(_ *cobra.Command, cmdArgs []string) error {
 		if exitErr, ok := err.(wsep.ExitError); ok {
 			os.Exit(exitErr.Code)
 		}
-		return xerrors.Errorf("run command: %w", err)
+		flog.Fatal("%+v", err)
 	}
 	return nil
 }

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ func shell(_ *cobra.Command, cmdArgs []string) error {`
`71`	`71`	`if exitErr, ok := err.(wsep.ExitError); ok {`
`72`	`72`	`os.Exit(exitErr.Code)`
`73`	`73`	`}`
`74`		`- return xerrors.Errorf("run command: %w", err)`
	`74`	`+ flog.Fatal("%+v", err)`
`75`	`75`	`}`
`76`	`76`	`return nil`
`77`	`77`	`}`