fix(plugin): Call the default error mapper function if present

Sytten · Nov 10, 2020 · 0c32c1b · 0c32c1b
1 parent 7c27851
commit 0c32c1b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -5,7 +5,6 @@ import { ShieldContext, ShieldRule } from './rules';
 type HashFunction = (arg: { root: any; args: any }) => string;
 
 type ErrorMapper = (
-  err: Error,
   parent: any,
   args: any,
   ctx: ShieldContext,

diff --git a/src/plugin.ts b/src/plugin.ts
@@ -92,7 +92,11 @@ export const nexusShield = (settings: ShieldPluginSettings) => {
           : true;
 
         if (!allowed) {
-          throw options.defaultError;
+          let error = options.defaultError;
+          if (typeof error === 'function') {
+            error = await error(root, args, ctx, info);
+          }
+          throw error;
         }
 
         // Resolver

diff --git a/tests/fixtures/server.ts b/tests/fixtures/server.ts
@@ -28,7 +28,7 @@ const schema = makeSchema({
   outputs: false,
   plugins: [
     nexusShield({
-      defaultError: new ForbiddenError('DEFAULT'),
+      defaultError: () => new ForbiddenError('DEFAULT'),
       defaultRule: allow,
     }),
   ],