hiro/apollo-server
1
0
Fork 0
mirror of https://github.com/vale981/apollo-server synced 2025-03-06 10:11:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

apollo-server-core: added formatApolloError arguments to subscription callback

Browse source
This commit is contained in:
Evans Hauser 2018-05-02 23:28:24 -07:00
parent a7772a01fb
commit e0332bb164
No known key found for this signature in database
GPG key ID: 88AF586817F52EEC
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
packages/apollo-server-core/src/ApolloServer.ts
View file

@ -19,7 +19,7 @@ import {
import { formatApolloErrors } from './errors'; import { formatApolloErrors } from './errors';
import { GraphQLServerOptions as GraphQLOptions } from './graphqlOptions'; import { GraphQLServerOptions as GraphQLOptions } from './graphqlOptions';
import { LogFunction } from './logging'; import { LogFunction, LogAction, LogStep } from './logging';
import { import {
Config, Config,
@ -212,7 +212,13 @@ export class ApolloServerBase<Request = RequestInit> {
onOperation: async (_: string, connection: ExecutionParams) => { onOperation: async (_: string, connection: ExecutionParams) => {
connection.formatResponse = (value: ExecutionResult) => ({ connection.formatResponse = (value: ExecutionResult) => ({
...value, ...value,
errors: value.errors && formatApolloErrors(value.errors), errors:
value.errors &&
formatApolloErrors(value.errors, {
formatter: this.requestOptions.formatError,
debug: this.requestOptions.debug,
logFunction: this.requestOptions.logFunction,
}),
}); });
let context: Context = this.context ? this.context : { connection }; let context: Context = this.context ? this.context : { connection };
@ -222,8 +228,11 @@ export class ApolloServerBase<Request = RequestInit> {
? await this.context({ connection }) ? await this.context({ connection })
: context; : context;
} catch (e) { } catch (e) {
console.error(e); throw formatApolloErrors([e], {
throw e; formatter: this.requestOptions.formatError,
debug: this.requestOptions.debug,
logFunction: this.requestOptions.logFunction,
})[0];
} }
return { ...connection, context }; return { ...connection, context };