Merge pull request #62 from Tonkpils/show-error-message

Display error message received from fetch current endpoint

Author: kytrinyx

api.go

@@ -48,11 +48,6 @@ func FetchAssignments(config configuration.Config, path string) (as []Assignment
 		return
 	}
 
-	if resp.StatusCode != http.StatusOK {
-		err = fmt.Errorf("Error fetching assignments. HTTP Status Code: %d", resp.StatusCode)
-		return
-	}
-
 	body, err := ioutil.ReadAll(resp.Body)
 	resp.Body.Close()
 
@@ -61,6 +56,18 @@ func FetchAssignments(config configuration.Config, path string) (as []Assignment
 		return
 	}
 
+	if resp.StatusCode != http.StatusOK {
+		var apiError struct { Error string `json:"error"` }
+		err = json.Unmarshal(body, &apiError)
+		if err != nil {
+			err = fmt.Errorf("Error parsing API response: [%v]", err)
+			return
+		}
+
+		err = fmt.Errorf("Error fetching assignments. HTTP Status Code: %d\n%s", resp.StatusCode, apiError.Error)
+		return
+	}
+
 	var fr struct {
 		Assignments []Assignment
 	}

api_test.go

@@ -35,7 +35,7 @@ var fetchHandler = func(rw http.ResponseWriter, r *http.Request) {
 		return
 	}
 	if apiKey != "myApiKey" {
-		rw.WriteHeader(http.StatusForbidden)
+		rw.WriteHeader(http.StatusUnauthorized)
 		fmt.Fprintf(rw, `{"error": "Unable to identify user"}`)
 		return
 	}
@@ -80,6 +80,7 @@ func TestFetchWithIncorrectKey(t *testing.T) {
 
 	assert.Error(t, err)
 	assert.Equal(t, len(assignments), 0)
+	assert.Contains(t, fmt.Sprintf("%s", err), "Unable to identify user")
 
 	server.Close()
 }