Update graphql-server-typescript example to use graphql-modules

examples/graphql-server-typescript/src/index.ts

@@ -8,13 +8,10 @@ import {
 import MongoDBInterface from '@accounts/mongo';
 import { AccountsPassword } from '@accounts/password';
 import { AccountsServer, ServerHooks } from '@accounts/server';
-import { ApolloServer, makeExecutableSchema, SchemaDirectiveVisitor } from 'apollo-server';
+import { ApolloServer, SchemaDirectiveVisitor } from 'apollo-server';
 import gql from 'graphql-tag';
-import { mergeResolvers, mergeTypeDefs } from '@graphql-tools/merge';
 import mongoose from 'mongoose';
 import { createApplication, createModule } from 'graphql-modules';
-import { parse } from 'graphql';
-import { printSchemaWithDirectives, getResolversFromSchema } from '@graphql-tools/utils';
 
 const start = async () => {
   // Create database connection
@@ -105,54 +102,31 @@ const start = async () => {
         field: () => 'private',
       }),
     },
-    User: {
-      firstName(user, args, ctx) {
-        console.log('UserResolvers');
-        console.log(user);
-        return user.firstName;
-      },
-    },
   };
 
-  /*
-  const myModule = createModule({
-    id: 'mine',
-    typeDefs,
-    resolvers,
-  });
-  */
-
   // Creates resolvers, type definitions, and schema directives used by accounts-js
-  const accountsSchema = createApplication({
+  const schema = createApplication({
     modules: [
       createAccountsCoreModule({ accountsServer }),
       createAccountsPasswordModule({ accountsPassword }),
-      //myModule,
+      createModule({
+        id: 'myApp',
+        typeDefs,
+        resolvers,
+      }),
     ],
   }).createSchemaForApollo();
 
-  const accountsTypeDefs = parse(printSchemaWithDirectives(accountsSchema));
-  const accountsResolvers = getResolversFromSchema(accountsSchema);
-
-  const schema = makeExecutableSchema({
-    typeDefs: mergeTypeDefs([typeDefs, accountsTypeDefs]),
-    resolvers: mergeResolvers([accountsResolvers as any, resolvers]),
-    schemaDirectives: {
-      // In order for the `@auth` directive to work
-      auth: AuthenticatedDirective,
-    } as any,
-  });
-
-  /*
-  SchemaDirectiveVisitor.visitSchemaDirectives(accountsSchema, {
+  SchemaDirectiveVisitor.visitSchemaDirectives(schema, {
     auth: AuthenticatedDirective,
   } as any);
-  */
 
   // Create the Apollo Server that takes a schema and configures internal stuff
   const server = new ApolloServer({
     schema,
-    //schema: accountsSchema,
+    /*schemaDirectives: {
+      auth: AuthenticatedDirective,
+    } as any,*/
     context: ({ req, connection }) => {
       return context({ req, connection }, { accountsServer });
     },

packages/graphql-api/src/modules/accounts/index.ts

@@ -9,7 +9,6 @@ import getMutationTypeDefs from './schema/mutation';
 import getSchemaDef from './schema/schema-def';
 import { Query } from './resolvers/query';
 import { Mutation } from './resolvers/mutation';
-import { User as UserResolvers, LoginResult as LoginResultResolvers } from './resolvers/user';
 import makeSchema from './schema/schema';
 //import { AuthenticatedDirective } from '../../utils/authenticated-directive';
 //import { context } from '../../utils';
@@ -60,10 +59,6 @@ export const createAccountsCoreModule = (config: AccountsCoreModuleConfig) =>
     resolvers: {
       [config.rootQueryName || 'Query']: Query,
       [config.rootMutationName || 'Mutation']: Mutation,
-      //FIXME: remove me
-      User: UserResolvers,
-      //FIXME: remove me
-      LoginResult: LoginResultResolvers,
     },
     providers: [
       {

packages/graphql-api/src/modules/accounts/resolvers/mutation.ts

@@ -3,15 +3,12 @@ import { MutationResolvers } from '../../../models';
 
 export const Mutation: MutationResolvers = {
   authenticate: async (_, args, ctx) => {
-    //FIXME: remove console.logs
-    console.log('authenticateResolvers');
     const { serviceName, params } = args;
     const { injector, infos } = ctx;
 
     const authenticated = await injector
       .get(AccountsServer)
       .loginWithService(serviceName, params, infos);
-    console.log(authenticated.user);
     return authenticated;
   },
   verifyAuthentication: async (_, args, ctx) => {