upgrade and remove un required isAccessAllowed code (#266)

OpenSaasAU · Dec 4, 2022 · b9dbb77 · b9dbb77
1 parent ea0a634
commit b9dbb77
Show file tree

Hide file tree

Showing 8 changed files with 195 additions and 164 deletions.
diff --git a/.changeset/fast-dots-buy.md b/.changeset/fast-dots-buy.md
@@ -0,0 +1,5 @@
+---
+'@opensaas/keystone-nextjs-auth': patch
+---
+
+Resolve error when `isAccessAllowed` is not defined
diff --git a/.changeset/wicked-months-turn.md b/.changeset/wicked-months-turn.md
@@ -0,0 +1,5 @@
+---
+'@opensaas/keystone-nextjs-auth': minor
+---
+
+Upgrade to keystone `3.1.0`
diff --git a/backend/keystone.ts b/backend/keystone.ts
@@ -60,7 +60,7 @@ export default auth.withAuth(
       useMigrations: true,
     },
     ui: {
-      isAccessAllowed: (context: KeystoneContext) => !!context.session?.data,
+      isAccessAllowed: (context: KeystoneContext) => !!context.session,
       publicPages: ['/admin/auth/signin', '/admin/auth/error'],
       getAdditionalFiles: [
         async () => [

diff --git a/backend/package.json b/backend/package.json
@@ -9,10 +9,10 @@
     "start": "keystone prisma migrate deploy && keystone start"
   },
   "dependencies": {
-    "@keystone-6/core": "3.0.0",
-    "@keystone-6/fields-document": "4.1.2",
-    "@keystone-ui/button": "7.0.1",
-    "@keystone-ui/core": "5.0.1",
+    "@keystone-6/core": "3.1.3",
+    "@keystone-6/fields-document": "5.0.2",
+    "@keystone-ui/button": "7.0.2",
+    "@keystone-ui/core": "5.0.2",
     "@opensaas/keystone-nextjs-auth": "^25.0.0",
     "@types/ejs": "^3.1.1",
     "dotenv": "^16.0.2",

diff --git a/backend/schema.graphql b/backend/schema.graphql
@@ -263,9 +263,10 @@ type KeystoneAdminUIListMeta {
   pageSize: Int!
   labelField: String!
   fields: [KeystoneAdminUIFieldMeta!]!
+  groups: [KeystoneAdminUIFieldGroupMeta!]!
   initialSort: KeystoneAdminUISort
   isHidden: Boolean!
-  isSingleton: Boolean
+  isSingleton: Boolean!
 }
 
 type KeystoneAdminUIFieldMeta {
@@ -303,6 +304,7 @@ enum KeystoneAdminUIFieldMetaListViewFieldMode {
 
 type KeystoneAdminUIFieldMetaItemView {
   fieldMode: KeystoneAdminUIFieldMetaItemViewFieldMode
+  fieldPosition: KeystoneAdminUIFieldMetaItemViewFieldPosition
 }
 
 enum KeystoneAdminUIFieldMetaItemViewFieldMode {
@@ -311,6 +313,17 @@ enum KeystoneAdminUIFieldMetaItemViewFieldMode {
   hidden
 }
 
+enum KeystoneAdminUIFieldMetaItemViewFieldPosition {
+  form
+  sidebar
+}
+
+type KeystoneAdminUIFieldGroupMeta {
+  label: String!
+  description: String
+  fields: [KeystoneAdminUIFieldMeta!]!
+}
+
 type KeystoneAdminUISort {
   field: String!
   direction: KeystoneAdminUISortDirection!

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

diff --git a/packages/keystone-nextjs-auth/src/index.ts b/packages/keystone-nextjs-auth/src/index.ts
@@ -3,7 +3,6 @@ import {
   AdminFileToWrite,
   BaseListTypeInfo,
   KeystoneConfig,
-  KeystoneContext,
   AdminUIConfig,
   BaseKeystoneTypeInfo,
   SessionStrategy,
@@ -284,29 +283,6 @@ export function createAuth<GeneratedListTypes extends BaseListTypeInfo>({
         getAdditionalFiles: [...(keystoneConfig.ui?.getAdditionalFiles || []), getAdditionalFiles],
         pageMiddleware: async args =>
           (await pageMiddleware(args)) ?? keystoneConfig?.ui?.pageMiddleware?.(args),
-        isAccessAllowed: async (context: KeystoneContext) => {
-          const { req } = context;
-          const pathname = url.parse(req?.url!).pathname!;
-
-          // Allow nextjs scripts and static files to be accessed without auth
-          if (pathname.includes('/_next/')) {
-            return true;
-          }
-
-          // Allow keystone to access /api/__keystone_api_build for hot reloading
-          if (
-            process.env.NODE_ENV !== 'production' &&
-            context.req?.url !== undefined &&
-            new URL(context.req.url, 'http://example.com').pathname ===
-              `${customPath}/api/__keystone_api_build`
-          ) {
-            return true;
-          }
-
-          return keystoneConfig.ui?.isAccessAllowed
-            ? keystoneConfig.ui.isAccessAllowed(context)
-            : context.session !== undefined;
-        },
       };
     }