Merge pull request #21 from pusher/handle-login-errors-better

add handling for 401 and 404s

api/account.go

@@ -54,7 +54,11 @@ func basicAuthRequest(path string, username string, password string) ([]byte, er
 	}
 	defer resp.Body.Close()
 
-	if resp.StatusCode < 200 || 400 <= resp.StatusCode {
+	if resp.StatusCode == 401 {
+		return nil, fmt.Errorf("invalid username or password")
+	} else if resp.StatusCode == 404 {
+		return nil, fmt.Errorf("no api key associated with the account, please visit https://dashboard.pusher.com/accounts/edit to add one")
+	} else if resp.StatusCode < 200 || 400 <= resp.StatusCode {
 		return nil, fmt.Errorf("unexpected status code %d", resp.StatusCode)
 	}
 

api/token.go

@@ -22,7 +22,7 @@ func GetAllTokensForApp(appId string) ([]AppToken, error) {
 	tokens := []AppToken{}
 	err = json.Unmarshal([]byte(response), &tokens)
 	if err != nil {
-		return nil, errors.New("That app ID wasn't recognised as linked to your account.")
+		return nil, errors.New("that app ID wasn't recognised as linked to your account")
 	}
 	return tokens, nil
 }

commands/auth/login.go

@@ -33,10 +33,7 @@ var Login = &cobra.Command{
 		// check if the user/pass can get an API key
 		apikey, err := api.GetAPIKey(email, password)
 		if err != nil {
-			panic("Could not get API key: " + err.Error())
-		}
-		if apikey == "" {
-			fmt.Println("There is No API key associated with those account details. Make sure you've set up your API key in the Admin Dashboard, and that are your details are correct.")
+			fmt.Println("Couldn't get API key: " + err.Error())
 			return
 		}
 		fmt.Println("Got your API key!")