Update dependency @keystone-6/core to v5 (#288)

* Update dependency @keystone-6/core to v5 * update schemas * update to wasAccessAllowed * add changeset --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Josh Calder <[email protected]>
OpenSaasAU · Feb 26, 2023 · ec29144 · ec29144
1 parent c787ffc
commit ec29144
Show file tree

Hide file tree

Showing 7 changed files with 348 additions and 511 deletions.
diff --git a/.changeset/brown-scissors-sin.md b/.changeset/brown-scissors-sin.md
@@ -0,0 +1,5 @@
+---
+"@opensaas/keystone-nextjs-auth": major
+---
+
+Update dependency @keystone-6/core to v5
diff --git a/backend/package.json b/backend/package.json
@@ -9,7 +9,7 @@
     "start": "keystone prisma migrate deploy && keystone start"
   },
   "dependencies": {
-    "@keystone-6/core": "4.0.1",
+    "@keystone-6/core": "5.0.0",
     "@keystone-6/fields-document": "7.0.0",
     "@keystone-ui/button": "7.0.2",
     "@keystone-ui/core": "5.0.2",

diff --git a/backend/schema.graphql b/backend/schema.graphql
@@ -10,7 +10,7 @@ type Role {
   canManageRoles: Boolean
   canManageCart: Boolean
   canManageOrgs: Boolean
-  assignedTo(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0): [User!]
+  assignedTo(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: UserWhereUniqueInput): [User!]
   assignedToCount(where: UserWhereInput! = {}): Int
 }
 
@@ -227,10 +227,10 @@ type Mutation {
 }
 
 type Query {
-  roles(where: RoleWhereInput! = {}, orderBy: [RoleOrderByInput!]! = [], take: Int, skip: Int! = 0): [Role!]
+  roles(where: RoleWhereInput! = {}, orderBy: [RoleOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: RoleWhereUniqueInput): [Role!]
   role(where: RoleWhereUniqueInput!): Role
   rolesCount(where: RoleWhereInput! = {}): Int
-  users(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0): [User!]
+  users(where: UserWhereInput! = {}, orderBy: [UserOrderByInput!]! = [], take: Int, skip: Int! = 0, cursor: UserWhereUniqueInput): [User!]
   user(where: UserWhereUniqueInput!): User
   usersCount(where: UserWhereInput! = {}): Int
   keystone: KeystoneMeta!
@@ -275,6 +275,7 @@ type KeystoneAdminUIFieldMeta {
   description: String
   isOrderable: Boolean!
   isFilterable: Boolean!
+  isNonNull: [KeystoneAdminUIFieldMetaIsNonNull!]
   fieldMeta: JSON
   viewsIndex: Int!
   customViewsIndex: Int
@@ -284,6 +285,12 @@ type KeystoneAdminUIFieldMeta {
   search: QueryMode
 }
 
+enum KeystoneAdminUIFieldMetaIsNonNull {
+  read
+  create
+  update
+}
+
 type KeystoneAdminUIFieldMetaCreateView {
   fieldMode: KeystoneAdminUIFieldMetaCreateViewFieldMode!
 }

diff --git a/backend/schema.prisma b/backend/schema.prisma
@@ -9,7 +9,6 @@ datasource postgresql {
 
 generator client {
   provider = "prisma-client-js"
-  output   = "node_modules/.prisma/client"
 }
 
 model Role {

diff --git a/packages/keystone-nextjs-auth/package.json b/packages/keystone-nextjs-auth/package.json
@@ -16,11 +16,11 @@
     "next-auth": "^4.19.2"
   },
   "devDependencies": {
-    "@keystone-6/core": "4.0.1",
+    "@keystone-6/core": "5.0.0",
     "react": "^18.2.0"
   },
   "peerDependencies": {
-    "@keystone-6/core": "4.0.1",
+    "@keystone-6/core": "5.0.0",
     "react": "^18.2.0"
   },
   "publishConfig": {

diff --git a/packages/keystone-nextjs-auth/src/index.ts b/packages/keystone-nextjs-auth/src/index.ts
@@ -61,12 +61,12 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
    */
   const authMiddleware: AdminUIConfig<BaseKeystoneTypeInfo>['pageMiddleware'] = async ({
     context,
-    isValidSession,
+    wasAccessAllowed,
   }) => {
     const { req, session } = context;
     const pathname = url.parse(req?.url!).pathname!;
 
-    if (isValidSession) {
+    if (wasAccessAllowed) {
       if (customPath !== '' && pathname === '/') {
         return { kind: 'redirect', to: `${customPath}` };
       }