Pass context through on keystone.connect() (#4656)

keystonejs · Jan 14, 2021 · 283a669 · 283a669
1 parent b762416
commit 283a669
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.changeset/nervous-feet-juggle.md b/.changeset/nervous-feet-juggle.md
@@ -0,0 +1,5 @@
+---
+'@keystone-next/keystone': patch
+---
+
+Updated calls to `keystone.connect()` with a `{ context }` argument to be used by `config.db.onConnect`.
diff --git a/packages-next/keystone/src/lib/createSystem.ts b/packages-next/keystone/src/lib/createSystem.ts
@@ -8,10 +8,7 @@ import type { KeystoneConfig, KeystoneSystem, BaseKeystone } from '@keystone-nex
 import { createGraphQLSchema } from './createGraphQLSchema';
 import { makeCreateContext } from './createContext';
 
-export function createKeystone(
-  config: KeystoneConfig,
-  createContextFactory: () => ReturnType<typeof makeCreateContext>
-) {
+export function createKeystone(config: KeystoneConfig) {
   // Note: For backwards compatibility we may want to expose
   // this as a public API so that users can start their transition process
   // by using this pattern for creating their Keystone object before using
@@ -34,9 +31,7 @@ export function createKeystone(
     cookieSecret: '123456789', // FIXME: Don't provide a default here. See #2882
     queryLimits: graphql?.queryLimits,
     // @ts-ignore The @types/keystonejs__keystone package has the wrong type for KeystoneOptions
-    onConnect: () => {
-      return config.db.onConnect?.(createContextFactory()({ skipAccessControl: true }));
-    },
+    onConnect: (keystone, { context } = {}) => config.db.onConnect?.(context),
     // FIXME: Unsupported options: Need to work which of these we want to support with backwards
     // compatibility options.
     // defaultAccess
@@ -79,7 +74,7 @@ export function createKeystone(
 }
 
 export function createSystem(config: KeystoneConfig): KeystoneSystem {
-  const keystone = createKeystone(config, () => createContext);
+  const keystone = createKeystone(config);
 
   const graphQLSchema = createGraphQLSchema(config, keystone);
 

diff --git a/packages-next/keystone/src/scripts/dev.ts b/packages-next/keystone/src/scripts/dev.ts
@@ -48,7 +48,7 @@ export const dev = async () => {
     );
 
     console.log('✨ Connecting to the Database');
-    await system.keystone.connect();
+    await system.keystone.connect({ context: system.createContext({ skipAccessControl: true }) });
 
     console.log('✨ Generating Admin UI');
     await generateAdminUI(config, system);

diff --git a/packages-next/keystone/src/scripts/start.ts b/packages-next/keystone/src/scripts/start.ts
@@ -16,7 +16,7 @@ export const start = async () => {
   const system = createSystem(config);
 
   console.log('✨ Connecting to the Database');
-  await system.keystone.connect();
+  await system.keystone.connect({ context: system.createContext({ skipAccessControl: true }) });
 
   const server = await createExpressServer(config, system, false);
   console.log(`👋 Admin UI Ready`);