Resolve example errors for new session

Josh Calder · Josh Calder · commit c69d939ccb83 · 2022-11-29T15:27:48.000+11:00
diff --git a/examples/custom-session/keystone.ts b/examples/custom-session/keystone.ts
@@ -1,96 +1,79 @@
 import { randomBytes } from 'crypto';
 import { config, graphql } from '@keystone-6/core';
-import type { SessionStrategy } from '@keystone-6/core/src/types/session';
-import { Context } from '.keystone/types';
 import { lists } from './schema';
+import { Context, TypeInfo } from '.keystone/types';
 
-type Session = {
-  id: string
-  data: {
-    id: string
-  }
-};
-
-function mySessionStrategy (): SessionStrategy<Session, {
-  id: string
-}> {
-  return {
-    async start({ data: { id }, createContext }) { // TODO: change the return type of this to unknown/T
-      const sudoContext = createContext({}).sudo();
-      const token = randomBytes(16).toString('hex'); // random 128-bit token
-
-      await sudoContext.db.Session.createOne({
-        data: {
-          token,
-          user: { connect: { id } },
-          ended: false
-        },
-      });
+async function startSession({ id, context }: { id: string; context: Context }) {
+  const sudoContext = context.sudo();
+  const token = randomBytes(16).toString('hex'); // random 128-bit token
 
-      return token;
+  await sudoContext.db.Session.createOne({
+    data: {
+      token,
+      user: { connect: { id } },
+      ended: false,
     },
+  });
 
-    // this populates the session object
-    async get({ req, createContext }) {
-      const sudoContext = createContext({}).sudo();
-      const token = req.headers?.authorization;
-      if (!token) return; // not authenticated
-      // TODO: hash the token for timing attack
-
-      const item = await sudoContext.query.Session.findOne({
-        where: {
-          token
-        },
-        query: 'user { id } ended',
-      });
+  return token;
+}
+async function endSession({ context }: { context: Context }) {
+  const sudoContext = context.sudo();
+  const token = context.req?.headers?.authorization;
+  if (!token) return; // not authenticated
+
+  await sudoContext.db.Session.updateOne({
+    where: {
+      token,
+    },
+    data: {
+      ended: true,
+    },
+  });
+}
 
-      // no session
-      if (!item) return;
+async function getSession({ context }: { context: Context }) {
+  const sudoContext = context.sudo();
+  const token = context.req?.headers?.authorization;
+  if (!token) return; // not authenticated
 
-      const { user, ended } = item;
-      if (!user) return; // uh, shouldnt happen
+  const item = await sudoContext.query.Session.findOne({
+    where: {
+      token,
+    },
+    query: 'user { id } ended',
+  });
 
-      // is it still active?
-      if (ended) return;
+  // no session
+  if (!item) return;
 
-      // they have a session
-      return {
-        id: user.id,
-        data: {
-          id: user.id
-        }
-      };
-    },
+  const { user, ended } = item;
+  if (!user) return; // uh, shouldnt happen
 
-    async end({ req, createContext }) {
-      const sudoContext = createContext({}).sudo();
-      const token = req.headers?.authorization;
-      if (!token) return; // not authenticated
+  // is it still active?
+  if (ended) return;
 
-      await sudoContext.db.Session.updateOne({
-        where: {
-          token
-        },
-        data: {
-          ended: true
-        },
-      });
+  // they have a session
+  return {
+    id: user.id,
+    data: {
+      id: user.id,
     },
   };
 }
 
-export const extendGraphqlSchema = graphql.extend((base) => {
+export const extendGraphqlSchema = graphql.extend(base => {
   return {
     mutation: {
       authenticate: graphql.field({
         args: {
           id: graphql.arg({ type: graphql.nonNull(graphql.ID) }),
         }, // parameters
         type: base.object('Session'), // return type
-        async resolve(source, { id }, context) {
-          const token = await context.startSession({ id }); // TODO: should be an object
-          console.log({ token })
-          return {};
+        async resolve(source, { id }, context: Context) {
+          const token = await startSession({ id, context });
+          console.log({ token });
+          return { token };
         },
       }),
 
@@ -99,10 +82,10 @@ export const extendGraphqlSchema = graphql.extend((base) => {
           id: graphql.arg({ type: graphql.nonNull(graphql.ID) }),
         }, // parameters
         type: base.object('Session'), // return type
-        async resolve(source, { id }, context) {
+        async resolve(source, { id }, context: Context) {
           if (!context.session) return {}; // only authenticated peeps
 
-          const token = await context.startSession({ id }); // TODO: should be an object
+          const token = await startSession({ id, context });
           return { id, token };
         },
       }),
@@ -112,26 +95,25 @@ export const extendGraphqlSchema = graphql.extend((base) => {
           token: graphql.arg({ type: graphql.nonNull(graphql.String) }),
         }, // parameters
         type: base.object('Session'), // return type
-        async resolve(source, { token }, context) {
-          await context.endSession({ token }); // TODO: should be an object
+        async resolve(source, args, context: Context) {
+          await endSession({ context });
         },
       }),
     },
   };
 });
 
-async function insertSeedData (context: Context) {
+async function insertSeedData(context: Context) {
   const { id } = await context.db.User.createOne({
     data: {
-      name: 'Daniel'
+      name: 'Daniel',
     },
-    query: 'id'
   });
 
   console.error('created user', { id });
 }
 
-export default config({
+export default config<TypeInfo>({
   db: {
     provider: 'sqlite',
     url: process.env.DATABASE_URL || 'file:./keystone-example.db',
@@ -142,7 +124,7 @@ export default config({
     },
   },
   lists,
-  session: mySessionStrategy(),
+  getSession,
   extendGraphqlSchema,
 });
 
diff --git a/examples/custom-session/package.json b/examples/custom-session/package.json
@@ -9,10 +9,10 @@
     "build": "keystone build"
   },
   "dependencies": {
-    "@keystone-6/core": "^2.1.0"
+    "@keystone-6/core": "^3.1.2"
   },
   "devDependencies": {
-    "typescript": "^4.4.4"
+    "typescript": "~4.7.4"
   },
   "engines": {
     "node": "^14.15 || ^16.13"
diff --git a/examples/custom-session/schema.graphql b/examples/custom-session/schema.graphql
@@ -15,8 +15,7 @@ enum PostStatusType {
   published
 }
 
-scalar DateTime
-  @specifiedBy(url: "https://datatracker.ietf.org/doc/html/rfc3339#section-5.6")
+scalar DateTime @specifiedBy(url: "https://datatracker.ietf.org/doc/html/rfc3339#section-5.6")
 
 input PostWhereUniqueInput {
   id: ID
@@ -139,12 +138,7 @@ input UserRelateToOneForCreateInput {
 type User {
   id: ID!
   name: String
-  posts(
-    where: PostWhereInput! = {}
-    orderBy: [PostOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [Post!]
+  posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0): [Post!]
   postsCount(where: PostWhereInput! = {}): Int
 }
 
@@ -252,10 +246,7 @@ input SessionCreateInput {
 """
 The `JSON` scalar type represents JSON values as specified by [ECMA-404](http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf).
 """
-scalar JSON
-  @specifiedBy(
-    url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf"
-  )
+scalar JSON @specifiedBy(url: "http://www.ecma-international.org/publications/files/ECMA-ST/ECMA-404.pdf")
 
 type Mutation {
   createPost(data: PostCreateInput!): Post
@@ -272,42 +263,23 @@ type Mutation {
   deleteUsers(where: [UserWhereUniqueInput!]!): [User]
   createSession(data: SessionCreateInput!): Session
   createSessions(data: [SessionCreateInput!]!): [Session]
-  updateSession(
-    where: SessionWhereUniqueInput!
-    data: SessionUpdateInput!
-  ): Session
+  updateSession(where: SessionWhereUniqueInput!, data: SessionUpdateInput!): Session
   updateSessions(data: [SessionUpdateArgs!]!): [Session]
   deleteSession(where: SessionWhereUniqueInput!): Session
   deleteSessions(where: [SessionWhereUniqueInput!]!): [Session]
-  endSession: Boolean!
   authenticate(id: ID!): Session
   refresh(id: ID!): Session
   deauthenticate(token: String!): Session
 }
 
 type Query {
-  posts(
-    where: PostWhereInput! = {}
-    orderBy: [PostOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [Post!]
+  posts(where: PostWhereInput! = {}, orderBy: [PostOrderByInput!]! = [], take: Int, skip: Int! = 0): [Post!]
   post(where: PostWhereUniqueInput!): Post
   postsCount(where: PostWhereInput! = {}): Int
-  users(
-    where: UserWhereInput! = {}
-    orderBy: [UserOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [User!]
+  users(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0): [User!]
   user(where: UserWhereUniqueInput!): User
   usersCount(where: UserWhereInput! = {}): Int
-  sessions(
-    where: SessionWhereInput! = {}
-    orderBy: [SessionOrderByInput!]! = []
-    take: Int
-    skip: Int! = 0
-  ): [Session!]
+  sessions(where: SessionWhereInput! = {}, orderBy: [SessionOrderByInput!]! = [], take: Int, skip: Int! = 0): [Session!]
   session(where: SessionWhereUniqueInput!): Session
   sessionsCount(where: SessionWhereInput! = {}): Int
   keystone: KeystoneMeta!
@@ -318,8 +290,6 @@ type KeystoneMeta {
 }
 
 type KeystoneAdminMeta {
-  enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }
@@ -339,8 +309,10 @@ type KeystoneAdminUIListMeta {
   pageSize: Int!
   labelField: String!
   fields: [KeystoneAdminUIFieldMeta!]!
+  groups: [KeystoneAdminUIFieldGroupMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
+  isSingleton: Boolean!
 }
 
 type KeystoneAdminUIFieldMeta {
@@ -378,6 +350,7 @@ enum KeystoneAdminUIFieldMetaListViewFieldMode {
 
 type KeystoneAdminUIFieldMetaItemView {
   fieldMode: KeystoneAdminUIFieldMetaItemViewFieldMode
+  fieldPosition: KeystoneAdminUIFieldMetaItemViewFieldPosition
 }
 
 enum KeystoneAdminUIFieldMetaItemViewFieldMode {
@@ -386,11 +359,22 @@ enum KeystoneAdminUIFieldMetaItemViewFieldMode {
   hidden
 }
 
+enum KeystoneAdminUIFieldMetaItemViewFieldPosition {
+  form
+  sidebar
+}
+
 enum QueryMode {
   default
   insensitive
 }
 
+type KeystoneAdminUIFieldGroupMeta {
+  label: String!
+  description: String
+  fields: [KeystoneAdminUIFieldMeta!]!
+}
+
 type KeystoneAdminUISort {
   field: String!
   direction: KeystoneAdminUISortDirection!
diff --git a/examples/custom-session/schema.prisma b/examples/custom-session/schema.prisma
@@ -39,4 +39,4 @@ model Session {
   ended  Boolean @default(false)
 
   @@index([userId])
-}
+}
