[Draft] Transition to graphql-modules v1

examples/accounts-boost/src/microservice/app-server.ts

@@ -6,16 +6,17 @@ import { mergeSchemas } from '@graphql-tools/merge';
 import { makeExecutableSchema } from '@graphql-tools/schema';
 import { introspectSchema, makeRemoteExecutableSchema } from '@graphql-tools/wrap';
 import fetch from 'node-fetch';
+import { AuthenticatedDirective, context } from '@accounts/graphql-api';
 
 const accountsServerUri = 'http://localhost:4003/';
 
 (async () => {
-  const accounts = (
-    await accountsBoost({
-      tokenSecret: 'terrible secret',
-      micro: true, // setting micro to true will instruct `@accounts/boost` to only verify access tokens without any additional session logic
-    })
-  ).graphql();
+  const accounts = await accountsBoost({
+    tokenSecret: 'terrible secret',
+    micro: true, // setting micro to true will instruct `@accounts/boost` to only verify access tokens without any additional session logic
+  });
+
+  const accountsApp = accounts.graphql();
 
   // // Note: the following steps are optional and only required if you want to stitch the remote accounts schema with your apps schema.
 
@@ -91,9 +92,19 @@ const accountsServerUri = 'http://localhost:4003/';
   const apolloServer = await new ApolloServer({
     schema: mergeSchemas({
       schemas: [executableLocalSchema, executableRemoteSchema],
-      schemaDirectives: accounts.schemaDirectives as any,
+      schemaDirectives: {
+        // In order for the `@auth` directive to work
+        auth: AuthenticatedDirective,
+      } as any,
     }),
-    context: ({ req }) => accounts.context({ req }),
+    context: ({ req, connection }) => {
+      return context(
+        { req, connection },
+        {
+          accountsServer: accounts.accountsServer,
+        }
+      );
+    },
   }).listen();
 
   console.log(`GraphQL server running at ${apolloServer.url}`);

examples/accounts-boost/src/monolithic/app-server.ts

@@ -1,13 +1,13 @@
 import accountsBoost, { authenticated } from '@accounts/boost';
+import { AuthenticatedDirective, context } from '@accounts/graphql-api';
 import { mergeTypeDefs, mergeResolvers } from '@graphql-tools/merge';
 import { ApolloServer } from 'apollo-server';
 
 (async () => {
-  const accounts = (
-    await accountsBoost({
-      tokenSecret: 'terrible secret',
-    })
-  ).graphql();
+  const accounts = await accountsBoost({
+    tokenSecret: 'terrible secret',
+  });
+  const accountsApp = accounts.graphql();
 
   const typeDefs = `
     type PrivateType @auth {
@@ -46,13 +46,20 @@ import { ApolloServer } from 'apollo-server';
   };
 
   const apolloServer = new ApolloServer({
-    typeDefs: mergeTypeDefs([typeDefs, accounts.typeDefs]),
-    resolvers: mergeResolvers([accounts.resolvers, resolvers]),
+    typeDefs: mergeTypeDefs([typeDefs, ...accountsApp.typeDefs]),
+    resolvers: mergeResolvers([accountsApp.resolvers, resolvers]),
     schemaDirectives: {
       // In order for the `@auth` directive to work
-      ...accounts.schemaDirectives,
+      auth: AuthenticatedDirective,
+    },
+    context: ({ req, connection }) => {
+      return context(
+        { req, connection },
+        {
+          accountsServer: accounts.accountsServer,
+        }
+      );
     },
-    context: ({ req }) => accounts.context({ req }),
   } as any)
     .listen()
     .then((res) => {

examples/graphql-server-typescript/package.json

@@ -16,10 +16,10 @@
     "@accounts/password": "^0.32.0",
     "@accounts/rest-express": "^0.32.0",
     "@accounts/server": "^0.32.0",
-    "@graphql-modules/core": "0.7.17",
     "@graphql-tools/merge": "6.2.5",
     "apollo-server": "2.16.0",
     "graphql": "14.6.0",
+    "graphql-modules": "1.4.2",
     "mongoose": "5.9.25",
     "tslib": "2.1.0"
   },

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

@@ -1,12 +1,17 @@
 import { DatabaseManager } from '@accounts/database-manager';
-import { AccountsModule } from '@accounts/graphql-api';
+import {
+  AuthenticatedDirective,
+  context,
+  createAccountsCoreModule,
+  createAccountsPasswordModule,
+} from '@accounts/graphql-api';
 import MongoDBInterface from '@accounts/mongo';
 import { AccountsPassword } from '@accounts/password';
 import { AccountsServer, ServerHooks } from '@accounts/server';
-import { ApolloServer, makeExecutableSchema } 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';
 
 const start = async () => {
   // Create database connection
@@ -56,11 +61,6 @@ const start = async () => {
     // If you throw an error here it will be returned to the client.
   });
 
-  // Creates resolvers, type definitions, and schema directives used by accounts-js
-  const accountsGraphQL = AccountsModule.forRoot({
-    accountsServer,
-  });
-
   const typeDefs = gql`
     type PrivateType @auth {
       field: String
@@ -77,18 +77,14 @@ const start = async () => {
       lastName: String!
     }
 
-    type Query {
+    extend type Query {
       # Example of how to get the userId from the context and return the current logged in user or null
       me: User
       publicField: String
       # You can only query this if you are logged in
       privateField: String @auth
       privateType: PrivateType
     }
-
-    type Mutation {
-      _: String
-    }
   `;
 
   const resolvers = {
@@ -108,18 +104,32 @@ const start = async () => {
     },
   };
 
-  const schema = makeExecutableSchema({
-    typeDefs: mergeTypeDefs([typeDefs, accountsGraphQL.typeDefs]),
-    resolvers: mergeResolvers([accountsGraphQL.resolvers, resolvers]),
-    schemaDirectives: {
-      ...accountsGraphQL.schemaDirectives,
-    },
-  });
+  // Creates resolvers, type definitions, and schema directives used by accounts-js
+  const schema = createApplication({
+    modules: [
+      createAccountsCoreModule({ accountsServer }),
+      createAccountsPasswordModule({ accountsPassword }),
+      createModule({
+        id: 'myApp',
+        typeDefs,
+        resolvers,
+      }),
+    ],
+  }).createSchemaForApollo();
+
+  SchemaDirectiveVisitor.visitSchemaDirectives(schema, {
+    auth: AuthenticatedDirective,
+  } as any);
 
   // Create the Apollo Server that takes a schema and configures internal stuff
   const server = new ApolloServer({
     schema,
-    context: accountsGraphQL.context,
+    /*schemaDirectives: {
+      auth: AuthenticatedDirective,
+    } as any,*/
+    context: ({ req, connection }) => {
+      return context({ req, connection }, { accountsServer });
+    },
   });
 
   server.listen(4000).then(({ url }) => {

package.json

@@ -80,6 +80,7 @@
     "prettier": "2.2.0",
     "typescript": "3.9.5"
   },
+  "resolutions": {},
   "collective": {
     "type": "opencollective",
     "url": "https://opencollective.com/accounts-js",

packages/boost/package.json

@@ -31,9 +31,9 @@
     "@accounts/graphql-api": "^0.32.0",
     "@accounts/server": "^0.32.0",
     "@accounts/types": "^0.32.0",
-    "@graphql-modules/core": "0.7.17",
     "apollo-server": "^2.9.3",
     "graphql": "14.6.0",
+    "graphql-modules": "1.4.2",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.20",
     "tslib": "2.1.0"

packages/boost/src/index.ts

@@ -1,12 +1,18 @@
 import { DatabaseManager } from '@accounts/database-manager';
-import { AccountsModule, authenticated } from '@accounts/graphql-api';
+import {
+  createAccountsCoreModule,
+  createAccountsPasswordModule,
+  authenticated,
+  context,
+} from '@accounts/graphql-api';
 import { AccountsServer, AccountsServerOptions } from '@accounts/server';
 import { AuthenticationService } from '@accounts/types';
 import { ApolloServer } from 'apollo-server';
 import { verify } from 'jsonwebtoken';
 import { get, isString, merge } from 'lodash';
+import { Application, createApplication } from 'graphql-modules';
 
-export { AccountsModule };
+export { createAccountsCoreModule, createAccountsPasswordModule };
 
 export { AccountsServerOptions };
 
@@ -107,21 +113,29 @@ const defaultAccountsBoostListenOptions: AccountsBoostListenOptions = {
 export class AccountsBoost {
   public accountsServer: AccountsServer;
   public apolloServer: ApolloServer;
-  public accountsGraphQL: typeof AccountsModule;
+  public accountsGraphQL: Application;
   private options: AccountsBoostOptions;
 
   constructor(options: AccountsBoostOptions, services: { [key: string]: AuthenticationService }) {
     this.accountsServer = new AccountsServer(options, services);
     this.options = options;
-    this.accountsGraphQL = AccountsModule.forRoot({
-      accountsServer: this.accountsServer,
+    this.accountsGraphQL = createApplication({
+      modules: [createAccountsCoreModule({ accountsServer: this.accountsServer })],
     });
 
-    const { schema, context } = this.accountsGraphQL;
+    const { schema } = this.accountsGraphQL;
 
     this.apolloServer = new ApolloServer({
       schema,
-      context,
+      context: ({ req, connection }) => {
+        return context(
+          { req, connection },
+          {
+            accountsServer: this.accountsServer,
+          }
+        );
+      },
+      //schemaDirectives
     });
   }
 
@@ -135,7 +149,7 @@ export class AccountsBoost {
     return res;
   }
 
-  public graphql(): typeof AccountsModule {
+  public graphql(): Application {
     // Cache `this.accountsGraphQL` to avoid regenerating the schema if the user calls `accountsBoost.graphql()` multple times.
     if (this.accountsGraphQL) {
       return this.accountsGraphQL;

packages/graphql-api/codegen.yml

@@ -11,6 +11,7 @@ generates:
     config:
       noNamespaces: true
       noSchemaStitching: true
+      contextType: ./modules/accounts/#AccountsContextGraphQLModules
     plugins:
       - add:
           content: '/* eslint-disable */'

packages/graphql-api/package.json

@@ -36,13 +36,11 @@
     "@accounts/password": "^0.32.0",
     "@accounts/server": "^0.32.0 || ^0.33.0",
     "@accounts/types": "^0.32.0",
-    "@graphql-modules/core": "0.7.17",
-    "graphql": "^14.6.0 || ^15.0.0",
-    "graphql-tag": "^2.10.0"
+    "graphql-modules": "^1.0.0",
+    "graphql": "^14.6.0 || ^15.0.0"
   },
   "dependencies": {
-    "@graphql-tools/merge": "6.2.13",
-    "@graphql-tools/utils": "7.9.0",
+    "@graphql-tools/utils": "7.10.0",
     "request-ip": "2.1.3",
     "tslib": "2.1.0"
   },
@@ -57,10 +55,10 @@
     "@graphql-codegen/typescript-operations": "1.17.16",
     "@graphql-codegen/typescript-resolvers": "1.19.1",
     "@graphql-codegen/typescript-type-graphql": "1.18.4",
-    "@graphql-modules/core": "0.7.17",
     "@types/jest": "26.0.23",
     "@types/request-ip": "0.0.35",
     "graphql": "14.6.0",
+    "graphql-modules": "1.4.2",
     "jest": "26.6.3",
     "ts-jest": "26.5.6",
     "ts-node": "9.1.1"