return spec correct gql errors

sourcenetwork · Sep 19, 2024 · f112cfa · f112cfa
1 parent 5b58c19
commit f112cfa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/http/handler_store.go b/http/handler_store.go
@@ -285,9 +285,12 @@ type GraphQLResponse struct {
 }
 
 func (res GraphQLResponse) MarshalJSON() ([]byte, error) {
-	var errors []string
-	for _, err := range res.Errors {
-		errors = append(errors, err.Error())
+	errors := make([]map[string]any, len(res.Errors))
+	for i, err := range res.Errors {
+		errors[i] = map[string]any{"message": err.Error()}
+	}
+	if len(errors) == 0 {
+		return json.Marshal(map[string]any{"data": res.Data})
 	}
 	return json.Marshal(map[string]any{"data": res.Data, "errors": errors})
 }

diff --git a/http/utils.go b/http/utils.go
@@ -41,7 +41,11 @@ func responseJSON(rw http.ResponseWriter, status int, data any) {
 }
 
 func parseError(msg any) error {
-	switch msg {
+	err, ok := msg.(map[string]any)
+	if !ok {
+		return fmt.Errorf("%v", msg)
+	}
+	switch err["message"] {
 	case client.ErrDocumentNotFoundOrNotAuthorized.Error():
 		return client.ErrDocumentNotFoundOrNotAuthorized
 	case datastore.ErrTxnConflict.Error():