Remove unused enableSessionItem

keystonejs · Aug 25, 2022 · fa011bf · fa011bf
1 parent ab79beb
commit fa011bf
Show file tree

Hide file tree

Showing 40 changed files with 2 additions and 45 deletions.
diff --git a/examples/assets-local/schema.graphql b/examples/assets-local/schema.graphql
@@ -295,7 +295,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/assets-s3/schema.graphql b/examples/assets-s3/schema.graphql
@@ -295,7 +295,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/auth/schema.graphql b/examples/auth/schema.graphql
@@ -173,7 +173,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/basic/schema.graphql b/examples/basic/schema.graphql
@@ -464,7 +464,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/blog/schema.graphql b/examples/blog/schema.graphql
@@ -254,7 +254,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/custom-admin-ui-logo/schema.graphql b/examples/custom-admin-ui-logo/schema.graphql
@@ -254,7 +254,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/custom-admin-ui-navigation/schema.graphql b/examples/custom-admin-ui-navigation/schema.graphql
@@ -254,7 +254,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/custom-admin-ui-pages/schema.graphql b/examples/custom-admin-ui-pages/schema.graphql
@@ -254,7 +254,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/custom-field-view/schema.graphql b/examples/custom-field-view/schema.graphql
@@ -257,7 +257,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/custom-field/schema.graphql b/examples/custom-field/schema.graphql
@@ -134,7 +134,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/custom-session-validation/schema.graphql b/examples/custom-session-validation/schema.graphql
@@ -302,7 +302,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/default-values/schema.graphql b/examples/default-values/schema.graphql
@@ -254,7 +254,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/document-field/schema.graphql b/examples/document-field/schema.graphql
@@ -269,7 +269,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/ecommerce/schema.graphql b/examples/ecommerce/schema.graphql
@@ -934,7 +934,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/embedded-nextjs/schema.graphql b/examples/embedded-nextjs/schema.graphql
@@ -125,7 +125,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/extend-graphql-schema-graphql-ts/schema.graphql b/examples/extend-graphql-schema-graphql-ts/schema.graphql
@@ -263,7 +263,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/extend-graphql-schema-nexus/schema.graphql b/examples/extend-graphql-schema-nexus/schema.graphql
@@ -256,7 +256,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/extend-graphql-schema/schema.graphql b/examples/extend-graphql-schema/schema.graphql
@@ -278,7 +278,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/extend-graphql-subscriptions/schema.graphql b/examples/extend-graphql-subscriptions/schema.graphql
@@ -259,7 +259,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/graphql-api-endpoint/schema.graphql b/examples/graphql-api-endpoint/schema.graphql
@@ -408,7 +408,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/json/schema.graphql b/examples/json/schema.graphql
@@ -223,7 +223,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/rest-api/schema.graphql b/examples/rest-api/schema.graphql
@@ -255,7 +255,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/roles/schema.graphql b/examples/roles/schema.graphql
@@ -387,7 +387,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/task-manager/schema.graphql b/examples/task-manager/schema.graphql
@@ -255,7 +255,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/testing/schema.graphql b/examples/testing/schema.graphql
@@ -297,7 +297,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/virtual-field/schema.graphql b/examples/virtual-field/schema.graphql
@@ -265,7 +265,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/examples/with-auth/schema.graphql b/examples/with-auth/schema.graphql
@@ -297,7 +297,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/packages/auth/src/index.ts b/packages/auth/src/index.ts
@@ -275,7 +275,6 @@ export function createAuth<ListTypeInfo extends BaseListTypeInfo>({
         getAdditionalFiles: [...(keystoneConfig.ui?.getAdditionalFiles || []), getAdditionalFiles],
         pageMiddleware: async args =>
           (await pageMiddleware(args)) ?? keystoneConfig?.ui?.pageMiddleware?.(args),
-        enableSessionItem: true,
         isAccessAllowed: async (context: KeystoneContext) => {
           // Allow access to the adminMeta data from the /init path to correctly render that page
           // even if the user isn't logged in (which should always be the case if they're seeing /init)
@@ -324,7 +323,7 @@ export function createAuth<ListTypeInfo extends BaseListTypeInfo>({
     // In the future we may want to return the following so that developers can
     // roll their own. This is pending a review of the use cases this might be
     // appropriate for, along with documentation and testing.
-    // ui: { enableSessionItem: true, pageMiddleware, getAdditionalFiles, publicPages },
+    // ui: { pageMiddleware, getAdditionalFiles, publicPages },
     // fields,
     // extendGraphqlSchema,
     // validateConfig,

diff --git a/packages/core/src/admin-ui/admin-meta-graphql.ts b/packages/core/src/admin-ui/admin-meta-graphql.ts
@@ -8,7 +8,6 @@ export const staticAdminMetaQuery = gql`
       adminMeta {
         __typename
         enableSignout
-        enableSessionItem
         lists {
           __typename
           key
@@ -69,7 +68,6 @@ export type StaticAdminMetaQuery = {
     adminMeta: {
       __typename: 'KeystoneAdminMeta';
       enableSignout: boolean;
-      enableSessionItem: boolean;
       lists: Array<{
         __typename: 'KeystoneAdminUIListMeta';
         key: string;

diff --git a/packages/core/src/admin-ui/system/adminMetaSchema.ts b/packages/core/src/admin-ui/system/adminMetaSchema.ts
@@ -168,7 +168,6 @@ const adminMeta = graphql.object<AdminMetaRootVal>()({
   name: 'KeystoneAdminMeta',
   fields: {
     enableSignout: graphql.field({ type: graphql.nonNull(graphql.Boolean) }),
-    enableSessionItem: graphql.field({ type: graphql.nonNull(graphql.Boolean) }),
     lists: graphql.field({
       type: graphql.nonNull(graphql.list(graphql.nonNull(KeystoneAdminUIListMeta))),
     }),

diff --git a/packages/core/src/admin-ui/system/createAdminMeta.ts b/packages/core/src/admin-ui/system/createAdminMeta.ts
@@ -17,9 +17,8 @@ export function createAdminMeta(
   config: KeystoneConfig,
   initialisedLists: Record<string, InitialisedList>
 ) {
-  const { ui, lists, session } = config;
+  const { lists, session } = config;
   const adminMetaRoot: AdminMetaRootVal = {
-    enableSessionItem: ui?.enableSessionItem || false,
     enableSignout: session !== undefined,
     listsByKey: {},
     lists: [],

diff --git a/packages/core/src/admin-ui/utils/useAdminMeta.tsx b/packages/core/src/admin-ui/utils/useAdminMeta.tsx
@@ -64,7 +64,6 @@ export function useAdminMeta(adminMetaHash: string, fieldViews: FieldViews) {
       ? adminMetaFromLocalStorage
       : data.keystone.adminMeta;
     const runtimeAdminMeta: AdminMeta = {
-      enableSessionItem: adminMeta.enableSessionItem,
       enableSignout: adminMeta.enableSignout,
       lists: {},
     };

diff --git a/packages/core/src/scripts/tests/fixtures/basic-project/schema.graphql b/packages/core/src/scripts/tests/fixtures/basic-project/schema.graphql
@@ -115,7 +115,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/packages/core/src/types/admin-meta.ts b/packages/core/src/types/admin-meta.ts
@@ -111,7 +111,6 @@ export type ListMeta = {
 
 export type AdminMeta = {
   enableSignout: boolean;
-  enableSessionItem: boolean;
   lists: { [list: string]: ListMeta };
 };
 
@@ -202,7 +201,6 @@ export type ListMetaRootVal = {
 
 export type AdminMetaRootVal = {
   enableSignout: boolean;
-  enableSessionItem: boolean;
   lists: Array<ListMetaRootVal>;
   listsByKey: Record<string, ListMetaRootVal>;
   views: string[];

diff --git a/packages/core/src/types/config/index.ts b/packages/core/src/types/config/index.ts
@@ -139,8 +139,6 @@ export type DatabaseConfig<TypeInfo extends BaseKeystoneTypeInfo> = {
 export type AdminUIConfig<TypeInfo extends BaseKeystoneTypeInfo> = {
   /** Completely disables the Admin UI */
   isDisabled?: boolean;
-  /** Enables certain functionality in the Admin UI that expects the session to be an item */
-  enableSessionItem?: boolean;
   /** A function that can be run to validate that the current session should have access to the Admin UI */
   isAccessAllowed?: (context: KeystoneContext<TypeInfo>) => MaybePromise<boolean>;
   /** An array of page routes that can be accessed without passing the isAccessAllowed check */

diff --git a/tests/api-tests/admin-meta.test.ts b/tests/api-tests/admin-meta.test.ts
@@ -37,7 +37,6 @@ test(
         __typename: 'KeystoneMeta',
         adminMeta: {
           __typename: 'KeystoneAdminMeta',
-          enableSessionItem: false,
           enableSignout: false,
           lists: [
             {

diff --git a/tests/sandbox/schema.graphql b/tests/sandbox/schema.graphql
@@ -537,7 +537,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/tests/test-projects/basic/schema.graphql b/tests/test-projects/basic/schema.graphql
@@ -311,7 +311,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/tests/test-projects/crud-notifications/schema.graphql b/tests/test-projects/crud-notifications/schema.graphql
@@ -254,7 +254,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }

diff --git a/tests/test-projects/live-reloading/schema.graphql b/tests/test-projects/live-reloading/schema.graphql
@@ -119,7 +119,6 @@ type KeystoneMeta {
 
 type KeystoneAdminMeta {
   enableSignout: Boolean!
-  enableSessionItem: Boolean!
   lists: [KeystoneAdminUIListMeta!]!
   list(key: String!): KeystoneAdminUIListMeta
 }