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

Merge branch 'devel' of https://github.com/VulcanJS/Vulcan into devel

Browse source
This commit is contained in:
SachaG 2018-06-28 21:35:55 +02:00
commit a13e61d8b0
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/vulcan-lib/lib/server/apollo_server.js
View file

@ -26,6 +26,7 @@ import { _hashLoginToken, _tokenExpiration } from './accounts_helpers';
export let executableSchema; export let executableSchema;
registerSetting('apolloEngine.logLevel', 'INFO', 'Log level (one of INFO, DEBUG, WARN, ERROR'); registerSetting('apolloEngine.logLevel', 'INFO', 'Log level (one of INFO, DEBUG, WARN, ERROR');
registerSetting('apolloTracing', Meteor.isDevelopment, 'Tracing by Apollo. Default is true on development and false on prod', true);
// see https://github.com/apollographql/apollo-cache-control // see https://github.com/apollographql/apollo-cache-control
const engineApiKey = getSetting('apolloEngine.apiKey'); const engineApiKey = getSetting('apolloEngine.apiKey');
@ -145,7 +146,7 @@ const createApolloServer = (givenOptions = {}, givenConfig = {}) => {
} }
// enable tracing and caching // enable tracing and caching
options.tracing = true; options.tracing = getSetting('apolloTracing', Meteor.isDevelopment);
options.cacheControl = true; options.cacheControl = true;
// note: custom default resolver doesn't currently work // note: custom default resolver doesn't currently work

1
packages/vulcan-users/lib/modules/resolvers.js
View file

@ -39,7 +39,6 @@ const resolvers = {
// get selector and options from terms and perform Mongo query // get selector and options from terms and perform Mongo query
let {selector, options} = await Users.getParameters(terms); let {selector, options} = await Users.getParameters(terms);
options.limit = (terms.limit < 1 || terms.limit > 100) ? 100 : terms.limit;
options.skip = terms.offset; options.skip = terms.offset;
const users = await Connectors.find(Users, selector, options); const users = await Connectors.find(Users, selector, options);