Change SessionStrategy.end to be optional

keystonejs · Apr 8, 2024 · 4e501cd · 4e501cd
1 parent b405f1b
commit 4e501cd
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 6 deletions.
diff --git a/.changeset/no-session-end.md b/.changeset/no-session-end.md
@@ -0,0 +1,5 @@
+---
+'@keystone-6/core': major
+---
+
+Change `SessionStrategy.end` to be optional
diff --git a/examples/custom-session-invalidation/keystone.ts b/examples/custom-session-invalidation/keystone.ts
@@ -47,7 +47,7 @@ function withSessionInvalidation (config: Config<Session>) {
         // has the password changed since the session started?
         if (new Date(session.data.passwordChangedAt) > new Date(session.startedAt)) {
           // invalidate the session if password changed
-          await existingSessionStrategy.end({ context })
+          await existingSessionStrategy.end?.({ context })
           return
         }
 

diff --git a/packages/core/src/lib/createGraphQLSchema.ts b/packages/core/src/lib/createGraphQLSchema.ts
@@ -103,12 +103,12 @@ export function createGraphQLSchema (
   const graphQLSchema = getGraphQLSchema(
     lists,
     {
-      mutation: config.session
+      mutation: config.session?.end
         ? {
             endSession: graphql.field({
               type: graphql.nonNull(graphql.Boolean),
               async resolve (rootVal, args, context) {
-                await context.sessionStrategy?.end({ context })
+                await context.sessionStrategy!.end!({ context })
                 return true
               },
             }),
@@ -127,5 +127,5 @@ export function createGraphQLSchema (
   )
 
   // merge in the user defined graphQL API
-  return config.graphql?.extendGraphqlSchema?.(graphQLSchema) ?? graphQLSchema
+  return config.graphql.extendGraphqlSchema?.(graphQLSchema) ?? graphQLSchema
 }
diff --git a/packages/core/src/session/index.ts b/packages/core/src/session/index.ts
@@ -152,7 +152,7 @@ export function storedSessions<Session> ({
       if (!sessionId) return
 
       await store.delete(sessionId)
-      await stateless.end({ context })
+      await stateless.end?.({ context })
     },
   }
 }
diff --git a/packages/core/src/system.ts b/packages/core/src/system.ts
@@ -127,6 +127,7 @@ function resolveDefaults (config: KeystoneConfig) {
       ...config.server,
       cors,
     },
+    session: config.session,
     storage: {
       ...config?.storage
     },

diff --git a/packages/core/src/types/session.ts b/packages/core/src/types/session.ts
@@ -7,7 +7,7 @@ export type SessionStrategy<
 > = {
   get: (args: { context: KeystoneContext<TypeInfo> }) => Promise<Session | undefined>
   start: (args: { context: KeystoneContext<TypeInfo>, data: Session }) => Promise<unknown>
-  end: (args: { context: KeystoneContext<TypeInfo> }) => Promise<unknown>
+  end?: (args: { context: KeystoneContext<TypeInfo> }) => Promise<unknown>
 }
 
 /** @deprecated */