@orion-js/graphql 3.5.1 → 3.5.3

package/lib/errorHandler.js

@@ -4,10 +4,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const crypto_1 = __importDefault(require("crypto"));
-const helpers_1 = require("@orion-js/helpers");
 const graphql_1 = require("graphql");
 function errorHandler(error, data) {
     const message = `Error in resolver "${data.name}" ${data.model ? `of model "${data.model.name}"` : ''}`;
+    const hash = crypto_1.default
+        .createHash('sha1')
+        .update(error.message, 'utf8')
+        .digest('hex')
+        .substring(0, 10);
+    error.hash = hash;
     if (error && error.isOrionError) {
         console.warn(message, error);
         throw new graphql_1.GraphQLError(error.message, {
@@ -16,19 +21,22 @@ function errorHandler(error, data) {
                 isOrionError: !!error.isOrionError,
                 isValidationError: !!error.isValidationError,
                 code: error.code,
+                hash,
                 info: error.getInfo()
             }
         });
     }
     else {
-        const hash = crypto_1.default
-            .createHash('sha1')
-            .update(error.message, 'utf8')
-            .digest('hex')
-            .substring(0, 10);
-        error.hash = hash;
         console.error(message, error);
-        throw new helpers_1.UserError('INTERNAL_SERVER_ERROR', 'Internal server error', { hash });
+        throw new graphql_1.GraphQLError(`${error.message} [${hash}]`, {
+            // originalError: error,
+            extensions: {
+                isOrionError: false,
+                isValidationError: false,
+                code: 'INTERNAL_SERVER_ERROR',
+                hash: hash
+            }
+        });
     }
 }
 exports.default = errorHandler;

package/lib/startGraphQL.test.js

@@ -157,6 +157,7 @@ describe('Test GraphQL Server', () => {
                     extensions: {
                         isOrionError: true,
                         isValidationError: true,
+                        hash: 'f3c9a8e163',
                         code: 'validationError',
                         info: {
                             error: 'validationError',
@@ -220,6 +221,7 @@ describe('Test GraphQL Server', () => {
                         isOrionError: true,
                         isValidationError: false,
                         code: 'code',
+                        hash: '6f9b9af3cd',
                         info: {
                             error: 'code',
                             message: 'message'
@@ -232,6 +234,63 @@ describe('Test GraphQL Server', () => {
             }
         });
     });
+    it('should return server errors correctly', async () => {
+        const resolvers = {
+            helloWorld: (0, resolvers_1.resolver)({
+                params: {
+                    name: {
+                        type: 'string'
+                    }
+                },
+                returns: 'string',
+                async resolve({ name }) {
+                    throw new Error('message');
+                    return `Hello ${name}`;
+                }
+            })
+        };
+        const app = (0, http_1.express)();
+        await (0, _1.startGraphQL)({
+            resolvers,
+            app
+        });
+        const response = await (0, supertest_1.default)(app)
+            .post('/graphql')
+            .send({
+            operationName: 'testOperation',
+            variables: {
+                name: 'Nico'
+            },
+            query: `query testOperation($name: String) {
+          helloWorld(name: $name)
+      }`
+        });
+        expect(response.statusCode).toBe(200);
+        const hash = '6f9b9af3cd';
+        expect(response.body).toEqual({
+            errors: [
+                {
+                    message: `message [${hash}]`,
+                    locations: [
+                        {
+                            line: 2,
+                            column: 11
+                        }
+                    ],
+                    path: ['helloWorld'],
+                    extensions: {
+                        isOrionError: false,
+                        isValidationError: false,
+                        code: 'INTERNAL_SERVER_ERROR',
+                        hash: hash
+                    }
+                }
+            ],
+            data: {
+                helloWorld: null
+            }
+        });
+    });
     it('Should make requests to schemas with typed models', async () => {
         let Params = class Params {
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orion-js/graphql",
-  "version": "3.5.1",
+  "version": "3.5.3",
   "main": "lib/index.js",
   "author": "nicolaslopezj",
   "license": "MIT",
@@ -16,13 +16,13 @@
     "@apollo/server": "^4.3.0",
     "@graphql-tools/schema": "^9.0.12",
     "@orion-js/env": "^3.5.0",
-    "@orion-js/helpers": "^3.5.0",
-    "@orion-js/http": "^3.5.0",
-    "@orion-js/models": "^3.5.0",
-    "@orion-js/resolvers": "^3.5.0",
+    "@orion-js/helpers": "^3.5.3",
+    "@orion-js/http": "^3.5.3",
+    "@orion-js/models": "^3.5.3",
+    "@orion-js/resolvers": "^3.5.3",
     "@orion-js/schema": "^3.5.0",
-    "@orion-js/services": "^3.5.0",
-    "@orion-js/typed-model": "^3.5.0",
+    "@orion-js/services": "^3.5.3",
+    "@orion-js/typed-model": "^3.5.3",
     "graphql-iso-date": "^3.6.1",
     "graphql-subscriptions": "2.0.0",
     "graphql-ws": "^5.11.2",
@@ -51,5 +51,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "17da2dda5b7604786e8b77fcbeb57a902958350e"
+  "gitHead": "34430096bb765afdc07b6f3c079915d424491b9c"
 }