fix: the import of the api schema in withApollo and pages.api.index a…

…fter module upgrade (#1295)

src/api-client/schema.ts

@@ -0,0 +1,27 @@
+const schema = (authDirective, redactedDirective) => {
+  const typeDefs = require('../api/typeDefs');
+  const resolvers = require('../api/resolvers');
+
+  const { makeExecutableSchema } = require('@graphql-tools/schema');
+
+  // Build our executable schema and apply our custom directives
+  const { redactedDirectiveTypeDefs, redactedDirectiveTransformer } =
+    redactedDirective('redact');
+  const { authDirectiveTypeDefs, authDirectiveTransformer } =
+    authDirective('auth');
+
+  return authDirectiveTransformer(
+    redactedDirectiveTransformer(
+      makeExecutableSchema({
+        typeDefs: [
+          redactedDirectiveTypeDefs,
+          authDirectiveTypeDefs,
+          typeDefs.default,
+        ],
+        resolvers,
+      })
+    )
+  );
+};
+
+export default schema;

src/api-client/withApollo.tsx

@@ -1,6 +1,4 @@
 import { NextPage } from 'next';
-import merge from 'deepmerge';
-import isEqual from 'lodash/isEqual';
 
 import {
   ApolloClient,
@@ -11,6 +9,8 @@ import {
 } from '@apollo/client';
 
 import { createPersistedQueryLink } from '@apollo/client/link/persisted-queries';
+import redactedDirective from '../api/directives/redactedDirective';
+import authDirective from '../api/directives/authDirective';
 import { sha256 } from 'crypto-hash';
 
 let apolloClient: ApolloClient<NormalizedCacheObject> | undefined;
@@ -19,8 +19,10 @@ function createApolloClient() {
   let terminatingLink;
   if (typeof window === 'undefined') {
     const { SchemaLink } = require('@apollo/client/link/schema');
-    const { schema } = require('../pages/api');
-    terminatingLink = new SchemaLink({ schema });
+    const { default: schema } = require('./schema');
+    terminatingLink = new SchemaLink({
+      schema: schema(authDirective, redactedDirective),
+    });
   } else {
     terminatingLink = createHttpLink({
       uri: '/api',

src/api/resolvers.ts

@@ -1,6 +1,5 @@
 import { stringifyAndCompressLoos } from '../lib/loo';
 import ngeohash from 'ngeohash';
-import { async } from 'hasha';
 
 const { Loo, Report, Area, MapGeo } = require('./db');
 const { GraphQLDateTime } = require('graphql-iso-date');

src/pages/api/index.ts

@@ -1,15 +1,12 @@
 import { ApolloServer } from 'apollo-server-micro';
 import responseCachePlugin from 'apollo-server-plugin-response-cache';
-import { makeExecutableSchema } from '@graphql-tools/schema';
 import jwt, { VerifyOptions } from 'jsonwebtoken';
 import jwksClient from 'jwks-rsa';
 import { getSession } from '@auth0/nextjs-auth0';
 import Cors from 'cors';
-
-import resolvers from '../../api/resolvers';
+import redactedDirective from '../..//api/directives/redactedDirective';
 import authDirective from '../../api/directives/authDirective';
-import redactedDirective from '../../api/directives/redactedDirective';
-import typeDefs from '../../api/typeDefs';
+import schema from '../../api-client/schema';
 
 const client = jwksClient({
   jwksUri: `${process.env.AUTH0_ISSUER_BASE_URL}/.well-known/jwks.json`,
@@ -30,22 +27,11 @@ const options: VerifyOptions = {
   algorithms: ['RS256'],
 };
 
-// Build our executable schema and apply our custom directives
-const { redactedDirectiveTypeDefs, redactedDirectiveTransformer } =
-  redactedDirective('redact');
-const { authDirectiveTypeDefs, authDirectiveTransformer } =
-  authDirective('auth');
-
-export let schema = makeExecutableSchema({
-  typeDefs: [redactedDirectiveTypeDefs, authDirectiveTypeDefs, typeDefs],
-  resolvers,
-});
-schema = redactedDirectiveTransformer(schema);
-schema = authDirectiveTransformer(schema);
-
 // Add GraphQL API
+const finalSchema = schema(authDirective, redactedDirective);
+
 export const server = new ApolloServer({
-  schema,
+  schema: finalSchema,
   context: async ({ req, res }) => {
     let user = null;
     // TODO: why does this throw an error?