Fixes #1653: update docs and wrap error if not *gqlerror.Error

Signed-off-by: Steve Coffman <steve@khanacademy.org>
99designs · Oct 10, 2021 · 5cc337e · 5cc337e
1 parent a3d9e8c
commit 5cc337e
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/docs/content/reference/errors.md b/docs/content/reference/errors.md
@@ -114,7 +114,7 @@ server := handler.NewDefaultServer(MakeExecutableSchema(resolvers)
 server.SetRecoverFunc(func(ctx context.Context, err interface{}) error {
     // notify bug tracker...
 
-    return errors.New("Internal server error!")
+		return gqlerror.Errorf("Internal server error!")
 })
 ```
 
diff --git a/graphql/error.go b/graphql/error.go
@@ -10,19 +10,24 @@ import (
 type ErrorPresenterFunc func(ctx context.Context, err error) *gqlerror.Error
 
 func DefaultErrorPresenter(ctx context.Context, err error) *gqlerror.Error {
-	return err.(*gqlerror.Error)
+	var gqlErr *gqlerror.Error
+	if errors.As(err, &gqlErr) {
+		return gqlErr
+	}
+	gqlErr = gqlerror.WrapPath(nil, err)
+	return gqlErr
 }
 
 func ErrorOnPath(ctx context.Context, err error) error {
 	if err == nil {
 		return nil
 	}
-	var gqlerr *gqlerror.Error
-	if errors.As(err, &gqlerr) {
-		if gqlerr.Path == nil {
-			gqlerr.Path = GetPath(ctx)
+	var gqlErr *gqlerror.Error
+	if errors.As(err, &gqlErr) {
+		if gqlErr.Path == nil {
+			gqlErr.Path = GetPath(ctx)
 		}
-		return gqlerr
+		return gqlErr
 	}
 	return gqlerror.WrapPath(GetPath(ctx), err)
 }