Merge branch 'master' into session-security

keystonejs · Sep 11, 2019 · 6019546 · 6019546
2 parents 093bd79 + a8e9378
commit 6019546
Show file tree

Hide file tree

Showing 14 changed files with 282 additions and 36 deletions.
diff --git a/.changeset/wild-buttons-grab/changes.json b/.changeset/wild-buttons-grab/changes.json
@@ -0,0 +1,220 @@
+{
+  "releases": [
+    { "name": "@keystone-alpha/fields", "type": "major" },
+    { "name": "@keystone-alpha/keystone", "type": "major" },
+    { "name": "@keystone-alpha/app-admin-ui", "type": "minor" },
+    { "name": "@keystone-alpha/app-graphql", "type": "patch" },
+    { "name": "@keystone-alpha/test-utils", "type": "patch" }
+  ],
+  "dependents": [
+    {
+      "name": "@keystone-alpha/api-tests",
+      "type": "patch",
+      "dependencies": [
+        "@keystone-alpha/auth-password",
+        "@keystone-alpha/adapter-knex",
+        "@keystone-alpha/adapter-mongoose",
+        "@keystone-alpha/fields",
+        "@keystone-alpha/keystone",
+        "@keystone-alpha/app-graphql",
+        "@keystone-alpha/test-utils"
+      ]
+    },
+    {
+      "name": "@keystone-alpha/demo-project-blog",
+      "type": "patch",
+      "dependencies": [
+        "@keystone-alpha/auth-password",
+        "@keystone-alpha/fields-markdown",
+        "@keystone-alpha/fields-wysiwyg-tinymce",
+        "@keystone-alpha/adapter-mongoose",
+        "@keystone-alpha/fields",
+        "@keystone-alpha/keystone",
+        "@keystone-alpha/app-admin-ui",
+        "@keystone-alpha/app-graphql"
+      ]
+    },
+    {
+      "name": "@keystone-alpha/demo-project-meetup",
+      "type": "patch",
+      "dependencies": [
+        "@keystone-alpha/auth-password",
+        "@keystone-alpha/fields-wysiwyg-tinymce",
+        "@keystone-alpha/adapter-mongoose",
+        "@keystone-alpha/fields",
+        "@keystone-alpha/keystone",
+        "@keystone-alpha/app-admin-ui",
+        "@keystone-alpha/app-graphql"
+      ]
+    },
+    {
+      "name": "@keystone-alpha/demo-project-todo",
+      "type": "patch",
+      "dependencies": [
+        "@keystone-alpha/adapter-mongoose",
+        "@keystone-alpha/fields",
+        "@keystone-alpha/keystone",
+        "@keystone-alpha/app-admin-ui",
+        "@keystone-alpha/app-graphql"
+      ]
+    },
+    {
+      "name": "@keystone-alpha/auth-passport",
+      "type": "patch",
+      "dependencies": ["@keystone-alpha/fields"]
+    },
+    {
+      "name": "@keystone-alpha/auth-password",
+      "type": "patch",
+      "dependencies": ["@keystone-alpha/fields"]
+    },
+    {
+      "name": "@keystone-alpha/example-projects-starter",
+      "type": "patch",
+      "dependencies": [
+        "@keystone-alpha/auth-password",
+        "@keystone-alpha/adapter-mongoose",
+        "@keystone-alpha/fields",
+        "@keystone-alpha/keystone",
+        "@keystone-alpha/app-admin-ui",
+        "@keystone-alpha/app-graphql"
+      ]
+    },
+    {
+      "name": "@keystone-alpha/example-projects-todo",
+      "type": "patch",
+      "dependencies": [
+        "@keystone-alpha/adapter-mongoose",
+        "@keystone-alpha/fields",
+        "@keystone-alpha/keystone",
+        "@keystone-alpha/app-admin-ui",
+        "@keystone-alpha/app-graphql"
+      ]
+    },
+    {
+      "name": "@keystone-alpha/field-content",
+      "type": "patch",
+      "dependencies": ["@keystone-alpha/fields"]
+    },
+    {
+      "name": "@keystone-alpha/fields-auto-increment",
+      "type": "patch",
+      "dependencies": ["@keystone-alpha/adapter-knex", "@keystone-alpha/fields"]
+    },
+    {
+      "name": "@keystone-alpha/fields-datetime-utc",
+      "type": "patch",
+      "dependencies": [
+        "@keystone-alpha/adapter-knex",
+        "@keystone-alpha/adapter-mongoose",
+        "@keystone-alpha/fields"
+      ]
+    },
+    {
+      "name": "@keystone-alpha/fields-markdown",
+      "type": "patch",
+      "dependencies": ["@keystone-alpha/fields"]
+    },
+    {
+      "name": "@keystone-alpha/fields-mongoid",
+      "type": "patch",
+      "dependencies": [
+        "@keystone-alpha/adapter-knex",
+        "@keystone-alpha/adapter-mongoose",
+        "@keystone-alpha/fields"
+      ]
+    },
+    {
+      "name": "@keystone-alpha/fields-wysiwyg-tinymce",
+      "type": "patch",
+      "dependencies": ["@keystone-alpha/fields"]
+    },
+    {
+      "name": "@keystone-alpha/list-plugins",
+      "type": "patch",
+      "dependencies": ["@keystone-alpha/fields"]
+    },
+    {
+      "name": "@keystone-alpha/cypress-project-access-control",
+      "type": "patch",
+      "dependencies": [
+        "@keystone-alpha/auth-password",
+        "@keystone-alpha/adapter-mongoose",
+        "@keystone-alpha/fields",
+        "@keystone-alpha/keystone",
+        "@keystone-alpha/app-admin-ui",
+        "@keystone-alpha/app-graphql"
+      ]
+    },
+    {
+      "name": "@keystone-alpha/cypress-project-basic",
+      "type": "patch",
+      "dependencies": [
+        "@keystone-alpha/field-content",
+        "@keystone-alpha/fields-markdown",
+        "@keystone-alpha/adapter-mongoose",
+        "@keystone-alpha/fields",
+        "@keystone-alpha/keystone",
+        "@keystone-alpha/app-admin-ui",
+        "@keystone-alpha/app-graphql"
+      ]
+    },
+    {
+      "name": "@keystone-alpha/cypress-project-client-validation",
+      "type": "patch",
+      "dependencies": [
+        "@keystone-alpha/adapter-mongoose",
+        "@keystone-alpha/fields",
+        "@keystone-alpha/keystone",
+        "@keystone-alpha/app-admin-ui",
+        "@keystone-alpha/app-graphql"
+      ]
+    },
+    {
+      "name": "@keystone-alpha/cypress-project-login",
+      "type": "patch",
+      "dependencies": [
+        "@keystone-alpha/auth-password",
+        "@keystone-alpha/list-plugins",
+        "@keystone-alpha/adapter-mongoose",
+        "@keystone-alpha/fields",
+        "@keystone-alpha/keystone",
+        "@keystone-alpha/app-admin-ui",
+        "@keystone-alpha/app-graphql"
+      ]
+    },
+    {
+      "name": "@keystone-alpha/cypress-project-social-login",
+      "type": "patch",
+      "dependencies": [
+        "@keystone-alpha/auth-passport",
+        "@keystone-alpha/auth-password",
+        "@keystone-alpha/adapter-mongoose",
+        "@keystone-alpha/fields",
+        "@keystone-alpha/keystone",
+        "@keystone-alpha/app-admin-ui",
+        "@keystone-alpha/app-graphql"
+      ]
+    },
+    {
+      "name": "@keystone-alpha/adapter-knex",
+      "type": "patch",
+      "dependencies": ["@keystone-alpha/fields-auto-increment", "@keystone-alpha/keystone"]
+    },
+    {
+      "name": "@keystone-alpha/adapter-mongoose",
+      "type": "patch",
+      "dependencies": ["@keystone-alpha/fields-mongoid", "@keystone-alpha/keystone"]
+    },
+    {
+      "name": "@keystone-alpha/example-projects-blank",
+      "type": "patch",
+      "dependencies": [
+        "@keystone-alpha/adapter-mongoose",
+        "@keystone-alpha/keystone",
+        "@keystone-alpha/app-admin-ui",
+        "@keystone-alpha/app-graphql"
+      ]
+    }
+  ]
+}
diff --git a/.changeset/wild-buttons-grab/changes.md b/.changeset/wild-buttons-grab/changes.md
@@ -0,0 +1,7 @@
+`Keystone`, `List` and `Field` constructors now take `schemaNames` as config options. A number of methods also now take `schemaName` parameters.
+ * `keystone.getTypeDefs()` -> `keystone.getTypeDefs({ schemaName })`
+ * `keystone.getAdminSchema()` -> `keystone.getAdminSchema({ schemaName })`
+ * `keystone.dumpSchema(file)` -> `keystone.dumpSchema(file, schemaName)`
+ * `keystone.getAdminMeta()` -> `keystone.getAdminMeta({ schemaName })`
+ * `list.getAdminMeta()` -> `list.getAdminMeta({ schemaName })`
+ * `field.getAdminMeta()` -> `field.getAdminMeta({ schemaName })`
diff --git a/packages/app-admin-ui/index.js b/packages/app-admin-ui/index.js
@@ -18,6 +18,7 @@ class AdminUIApp {
     pages,
     enableDefaultRoute = false,
     isAccessAllowed = () => true,
+    schemaName = 'public',
   } = {}) {
     if (adminPath === '/') {
       throw new Error("Admin path cannot be the root path. Try; '/admin'");
@@ -34,6 +35,7 @@ class AdminUIApp {
     this.graphiqlPath = graphiqlPath;
     this.enableDefaultRoute = enableDefaultRoute;
     this._isAccessAllowed = isAccessAllowed;
+    this._schemaName = schemaName;
 
     this.routes = {
       signinPath: `${this.adminPath}/signin`,
@@ -137,7 +139,7 @@ class AdminUIApp {
       apiPath: this.apiPath,
       graphiqlPath: this.graphiqlPath,
       ...this.getAdminMeta(),
-      ...keystone.getAdminMeta(),
+      ...keystone.getAdminMeta({ schemaName: this._schemaName }),
     };
   }
 

diff --git a/packages/app-graphql/index.js b/packages/app-graphql/index.js
@@ -9,7 +9,7 @@ class GraphQLApp {
     cors = { origin: true, credentials: true },
     apiPath = '/admin/api',
     graphiqlPath = '/admin/graphiql',
-    schemaName = 'admin',
+    schemaName = 'public',
     apollo = {},
     pinoOptions,
     // Deprecated options:

diff --git a/packages/app-graphql/lib/apolloServer.js b/packages/app-graphql/lib/apolloServer.js
@@ -145,7 +145,7 @@ function createApolloServer(keystone, apolloConfig, schemaName, dev) {
     maxFileSize: 200 * 1024 * 1024,
     maxFiles: 5,
     ...apolloConfig,
-    ...keystone.getAdminSchema(),
+    ...keystone.getAdminSchema({ schemaName }),
     context: ({ req }) => ({
       ...keystone.getGraphQlContext({ schemaName, req }),
       req,

diff --git a/packages/fields/src/Implementation.js b/packages/fields/src/Implementation.js
@@ -5,7 +5,7 @@ class Field {
   constructor(
     path,
     { hooks = {}, isRequired, defaultValue, access, label, schemaDoc, ...config },
-    { getListByKey, listKey, listAdapter, fieldAdapterClass, defaultAccess }
+    { getListByKey, listKey, listAdapter, fieldAdapterClass, defaultAccess, schemaNames }
   ) {
     this.path = path;
     this.isPrimaryKey = path === 'id';
@@ -30,7 +30,7 @@ class Field {
     this.isRelationship = false;
 
     this.access = parseFieldAccess({
-      schemaNames: ['public'],
+      schemaNames,
       listKey,
       fieldKey: path,
       defaultAccess,
@@ -153,8 +153,7 @@ class Field {
   get gqlUpdateInputFields() {
     return [];
   }
-  getAdminMeta() {
-    const schemaName = 'public';
+  getAdminMeta({ schemaName }) {
     const schemaAccess = this.access[schemaName];
     return this.extendAdminMeta({
       label: this.label,

diff --git a/packages/fields/src/types/OEmbed/Implementation.test.js b/packages/fields/src/types/OEmbed/Implementation.test.js
@@ -6,7 +6,7 @@ const newOEmbed = ({ config = {} } = {}) => {
   return new OEmbed(
     path,
     { access: true, ...config },
-    { listAdapter: { newFieldAdapter: () => {} } }
+    { listAdapter: { newFieldAdapter: () => {} }, schemaNames: ['public'] }
   );
 };
 

diff --git a/packages/fields/src/types/Relationship/tests/implementation.test.js b/packages/fields/src/types/Relationship/tests/implementation.test.js
@@ -55,6 +55,7 @@ function createRelationship({ path, config = {}, getListByKey = () => new MockLi
     listAdapter: new MockListAdapter(),
     fieldAdapterClass: MockFieldAdapter,
     defaultAccess: true,
+    schemaNames: ['public'],
   });
 }
 

diff --git a/packages/fields/tests/Implementation.test.js b/packages/fields/tests/Implementation.test.js
@@ -7,6 +7,7 @@ const args = {
     newFieldAdapter: jest.fn(),
   },
   defaultAccess: true,
+  schemaNames: ['public'],
 };
 
 describe('new Implementation()', () => {
@@ -21,6 +22,7 @@ describe('new Implementation()', () => {
           newFieldAdapter: jest.fn(),
         },
         defaultAccess: true,
+        schemaNames: ['public'],
       }
     );
     expect(impl).not.toBeNull();
@@ -116,8 +118,9 @@ test('gqlOutputFieldResolvers', () => {
 describe('getAdminMeta()', () => {
   test('meta is as expect', () => {
     const impl = new Field('path', { label: 'config label', defaultValue: 'default' }, args);
+    const schemaName = 'public';
 
-    const value = impl.getAdminMeta();
+    const value = impl.getAdminMeta({ schemaName });
     expect(value).toEqual({
       access: {
         create: true,
@@ -135,8 +138,9 @@ describe('getAdminMeta()', () => {
 
   test('when defaultValue is a function, forced to `undefined`', () => {
     const impl = new Field('path', { label: 'config label', defaultValue: () => 'default' }, args);
+    const schemaName = 'public';
 
-    const value = impl.getAdminMeta();
+    const value = impl.getAdminMeta({ schemaName });
     expect(value).toEqual({
       access: {
         create: true,