Move session graphQL code into sessions module (#5004)

.changeset/plenty-rivers-type.md

@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': patch
+---
+
+Moved session handling GraphQL schema code into the sessions module.

packages-next/keystone/src/lib/createGraphQLSchema.ts

@@ -1,11 +1,9 @@
 import { GraphQLObjectType } from 'graphql';
-import { mergeSchemas } from '@graphql-tools/merge';
 import { mapSchema } from '@graphql-tools/utils';
 import { makeExecutableSchema } from '@graphql-tools/schema';
-import type { KeystoneConfig, KeystoneContext, BaseKeystone } from '@keystone-next/types';
+import type { KeystoneConfig, BaseKeystone } from '@keystone-next/types';
 import { getAdminMetaSchema } from '@keystone-next/admin-ui/system';
-
-import { gql } from '../schema';
+import { sessionSchema } from '../session';
 
 export function createGraphQLSchema(config: KeystoneConfig, keystone: BaseKeystone) {
   // Start with the core keystone graphQL schema
@@ -41,24 +39,7 @@ export function createGraphQLSchema(config: KeystoneConfig, keystone: BaseKeysto
 
   // Merge in session graphQL API
   if (config.session) {
-    graphQLSchema = mergeSchemas({
-      schemas: [graphQLSchema],
-      typeDefs: gql`
-        type Mutation {
-          endSession: Boolean!
-        }
-      `,
-      resolvers: {
-        Mutation: {
-          async endSession(rootVal, args, context: KeystoneContext) {
-            if (context.endSession) {
-              await context.endSession();
-            }
-            return true;
-          },
-        },
-      },
-    });
+    graphQLSchema = sessionSchema(graphQLSchema);
   }
 
   // Merge in the admin-meta graphQL API

packages-next/keystone/src/session/index.ts

@@ -1,3 +1,5 @@
+import { mergeSchemas } from '@graphql-tools/merge';
+import { GraphQLSchema } from 'graphql';
 import { IncomingMessage, ServerResponse } from 'http';
 import * as cookie from 'cookie';
 import Iron from '@hapi/iron';
@@ -7,7 +9,9 @@ import {
   SessionStoreFunction,
   SessionContext,
   CreateContext,
+  KeystoneContext,
 } from '@keystone-next/types';
+import { gql } from '../schema';
 
 // uid-safe is what express-session uses so let's just use it
 import { sync as uid } from 'uid-safe';
@@ -237,3 +241,24 @@ export async function createSessionContext<T>(
     endSession: () => sessionStrategy.end({ req, res, createContext }),
   };
 }
+
+export function sessionSchema(graphQLSchema: GraphQLSchema) {
+  return mergeSchemas({
+    schemas: [graphQLSchema],
+    typeDefs: gql`
+      type Mutation {
+        endSession: Boolean!
+      }
+    `,
+    resolvers: {
+      Mutation: {
+        async endSession(rootVal, args, context: KeystoneContext) {
+          if (context.endSession) {
+            await context.endSession();
+          }
+          return true;
+        },
+      },
+    },
+  });
+}