@webiny/api-headless-cms 0.0.0-unstable.d65ec29d44 → 0.0.0-unstable.da99e0b846

package/graphql/graphQLHandlerFactory.js

@@ -5,159 +5,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.graphQLHandlerFactory = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _apiSecurity = require("@webiny/api-security");
 var _debugPlugins = _interopRequireDefault(require("@webiny/handler-graphql/debugPlugins"));
-var _processRequestBody = _interopRequireDefault(require("@webiny/handler-graphql/processRequestBody"));
 var _handler = require("@webiny/handler");
-var _error = _interopRequireDefault(require("@webiny/error"));
-var _codeFrame = _interopRequireDefault(require("code-frame"));
-var _generateSchema = require("./generateSchema");
-// @ts-ignore `code-frame` has no types
-
-const createRequestBody = body => {
-  /**
-   * We are trusting that the body payload is correct.
-   * The `processRequestBody` will fail if it is not.
-   */
-  return typeof body === "string" ? JSON.parse(body) : body;
-};
-const schemaList = new Map();
-const generateCacheKey = async args => {
-  const {
-    context,
-    locale,
-    type
-  } = args;
-  const lastModelChange = await context.cms.getModelLastChange();
-  return [locale.code, type, lastModelChange.toISOString()].join("#");
-};
-
-/**
- * Gets an existing schema or rewrites existing one or creates a completely new one
- * depending on the schemaId created from type and locale parameters
- */
-const getSchema = async params => {
-  const {
-    context,
-    type,
-    locale
-  } = params;
-  const tenantId = context.tenancy.getCurrentTenant().id;
-  const id = `${tenantId}#${type}#${locale.code}`;
-  const cacheKey = await generateCacheKey(params);
-  const cachedSchema = schemaList.get(id);
-  if ((cachedSchema === null || cachedSchema === void 0 ? void 0 : cachedSchema.key) === cacheKey) {
-    return cachedSchema.schema;
-  }
-  // Load model data
-  context.security.disableAuthorization();
-  const models = (await context.cms.listModels()).filter(model => model.isPrivate !== true);
-  context.security.enableAuthorization();
-  try {
-    const schema = await (0, _generateSchema.generateSchema)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
-      models
-    }));
-    schemaList.set(id, {
-      key: cacheKey,
-      schema
-    });
-    return schema;
-  } catch (err) {
-    if (!Array.isArray(err.locations)) {
-      throw new _error.default({
-        message: err.message,
-        code: err.code || "INVALID_GRAPHQL_SCHEMA_LOCATIONS",
-        data: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, err.data || {}), {}, {
-          locations: err.locations
-        })
-      });
-    }
-    const [location] = err.locations;
-    throw new _error.default({
-      code: "INVALID_GRAPHQL_SCHEMA",
-      message: err.message,
-      data: {
-        invalidSegment: (0, _codeFrame.default)(err.source.body, location.line, location.column, {
-          frameSize: 15
-        })
-      }
-    });
-  }
-};
-const checkEndpointAccess = async context => {
-  const permission = await context.security.getPermission(`cms.endpoint.${context.cms.type}`);
-  if (!permission) {
-    throw new _apiSecurity.NotAuthorizedError({
-      data: {
-        reason: `Not allowed to access "${context.cms.type}" endpoint.`
-      }
-    });
-  }
-};
-const formatErrorPayload = error => {
-  if (error instanceof _error.default) {
-    return JSON.stringify({
-      type: "CmsGraphQLWebinyError",
-      message: error.message,
-      code: error.code,
-      data: error.data
-    });
-  }
-  return JSON.stringify({
-    type: "Error",
-    name: error.name,
-    message: error.message,
-    stack: error.stack
-  });
-};
+var _handleRequest = require("./handleRequest");
 const cmsRoutes = new _handler.RoutePlugin(({
   onPost,
   onOptions,
   context
 }) => {
   onPost("/cms/:type(^manage|preview|read$)/:locale", async (request, reply) => {
-    try {
-      await checkEndpointAccess(context);
-    } catch (ex) {
-      return reply.code(401).send({
-        data: null,
-        error: {
-          message: ex.message || "Not authorized!",
-          code: ex.code || "SECURITY_NOT_AUTHORIZED",
-          data: ex.data || null,
-          stack: null
-        }
-      });
-    }
-    let schema;
-    try {
-      schema = await getSchema({
-        context,
-        locale: context.cms.getLocale(),
-        type: context.cms.type
-      });
-    } catch (ex) {
-      console.log(`Error while generating the schema.`);
-      console.log(formatErrorPayload(ex));
-      throw ex;
-    }
-    let body = [];
-    try {
-      body = createRequestBody(request.body);
-    } catch (ex) {
-      console.log(`Error while creating the body request.`);
-      console.log(formatErrorPayload(ex));
-      throw ex;
-    }
-    try {
-      const result = await (0, _processRequestBody.default)(body, schema, context);
-      return reply.code(200).send(result);
-    } catch (ex) {
-      console.log(`Error while processing the body request.`);
-      console.log(formatErrorPayload(ex));
-      throw ex;
-    }
+    return (0, _handleRequest.handleRequest)({
+      context,
+      request,
+      reply
+    });
   });
   onOptions("/cms/:type(^manage|preview|read$)/:locale", async (_, reply) => {
     return reply.status(204).send({}).hijack();

package/graphql/graphQLHandlerFactory.js.map

@@ -1 +1 @@
-{"version":3,"names":["createRequestBody","body","JSON","parse","schemaList","Map","generateCacheKey","args","context","locale","type","lastModelChange","cms","getModelLastChange","code","toISOString","join","getSchema","params","tenantId","tenancy","getCurrentTenant","id","cacheKey","cachedSchema","get","key","schema","security","disableAuthorization","models","listModels","filter","model","isPrivate","enableAuthorization","generateSchema","set","err","Array","isArray","locations","WebinyError","message","data","location","invalidSegment","codeFrame","source","line","column","frameSize","checkEndpointAccess","permission","getPermission","NotAuthorizedError","reason","formatErrorPayload","error","stringify","name","stack","cmsRoutes","RoutePlugin","onPost","onOptions","request","reply","ex","send","getLocale","console","log","result","processRequestBody","_","status","hijack","graphQLHandlerFactory","debug","debugPlugins"],"sources":["graphQLHandlerFactory.ts"],"sourcesContent":["import { GraphQLSchema } from \"graphql\";\nimport { ApiEndpoint, CmsContext } from \"~/types\";\nimport { I18NLocale } from \"@webiny/api-i18n/types\";\nimport { NotAuthorizedError } from \"@webiny/api-security\";\nimport { PluginCollection } from \"@webiny/plugins/types\";\nimport debugPlugins from \"@webiny/handler-graphql/debugPlugins\";\nimport processRequestBody from \"@webiny/handler-graphql/processRequestBody\";\nimport { GraphQLRequestBody } from \"@webiny/handler-graphql/types\";\nimport { RoutePlugin } from \"@webiny/handler\";\nimport WebinyError from \"@webiny/error\";\n// @ts-ignore `code-frame` has no types\nimport codeFrame from \"code-frame\";\nimport { generateSchema } from \"~/graphql/generateSchema\";\n\ninterface SchemaCache {\n    key: string;\n    schema: GraphQLSchema;\n}\ninterface GetSchemaParams {\n    context: CmsContext;\n    type: ApiEndpoint;\n    locale: I18NLocale;\n}\n\nconst createRequestBody = (body: unknown): GraphQLRequestBody | GraphQLRequestBody[] => {\n    /**\n     * We are trusting that the body payload is correct.\n     * The `processRequestBody` will fail if it is not.\n     */\n    return typeof body === \"string\" ? JSON.parse(body) : body;\n};\n\nconst schemaList = new Map<string, SchemaCache>();\n\nconst generateCacheKey = async (args: GetSchemaParams): Promise<string> => {\n    const { context, locale, type } = args;\n    const lastModelChange = await context.cms.getModelLastChange();\n    return [locale.code, type, lastModelChange.toISOString()].join(\"#\");\n};\n\n/**\n * Gets an existing schema or rewrites existing one or creates a completely new one\n * depending on the schemaId created from type and locale parameters\n */\nconst getSchema = async (params: GetSchemaParams): Promise<GraphQLSchema> => {\n    const { context, type, locale } = params;\n    const tenantId = context.tenancy.getCurrentTenant().id;\n    const id = `${tenantId}#${type}#${locale.code}`;\n\n    const cacheKey = await generateCacheKey(params);\n    const cachedSchema = schemaList.get(id);\n    if (cachedSchema?.key === cacheKey) {\n        return cachedSchema.schema;\n    }\n    // Load model data\n    context.security.disableAuthorization();\n    const models = (await context.cms.listModels()).filter(model => model.isPrivate !== true);\n    context.security.enableAuthorization();\n    try {\n        const schema = await generateSchema({\n            ...params,\n            models\n        });\n        schemaList.set(id, {\n            key: cacheKey,\n            schema\n        });\n        return schema;\n    } catch (err) {\n        if (!Array.isArray(err.locations)) {\n            throw new WebinyError({\n                message: err.message,\n                code: err.code || \"INVALID_GRAPHQL_SCHEMA_LOCATIONS\",\n                data: {\n                    ...(err.data || {}),\n                    locations: err.locations\n                }\n            });\n        }\n        const [location] = err.locations;\n\n        throw new WebinyError({\n            code: \"INVALID_GRAPHQL_SCHEMA\",\n            message: err.message,\n            data: {\n                invalidSegment: codeFrame(err.source.body, location.line, location.column, {\n                    frameSize: 15\n                })\n            }\n        });\n    }\n};\n\nconst checkEndpointAccess = async (context: CmsContext): Promise<void> => {\n    const permission = await context.security.getPermission(`cms.endpoint.${context.cms.type}`);\n    if (!permission) {\n        throw new NotAuthorizedError({\n            data: {\n                reason: `Not allowed to access \"${context.cms.type}\" endpoint.`\n            }\n        });\n    }\n};\n\nconst formatErrorPayload = (error: Error): string => {\n    if (error instanceof WebinyError) {\n        return JSON.stringify({\n            type: \"CmsGraphQLWebinyError\",\n            message: error.message,\n            code: error.code,\n            data: error.data\n        });\n    }\n\n    return JSON.stringify({\n        type: \"Error\",\n        name: error.name,\n        message: error.message,\n        stack: error.stack\n    });\n};\n\nexport interface GraphQLHandlerFactoryParams {\n    debug?: boolean;\n}\n\nconst cmsRoutes = new RoutePlugin<CmsContext>(({ onPost, onOptions, context }) => {\n    onPost(\"/cms/:type(^manage|preview|read$)/:locale\", async (request, reply) => {\n        try {\n            await checkEndpointAccess(context);\n        } catch (ex) {\n            return reply.code(401).send({\n                data: null,\n                error: {\n                    message: ex.message || \"Not authorized!\",\n                    code: ex.code || \"SECURITY_NOT_AUTHORIZED\",\n                    data: ex.data || null,\n                    stack: null\n                }\n            });\n        }\n\n        let schema: GraphQLSchema;\n        try {\n            schema = await getSchema({\n                context,\n                locale: context.cms.getLocale(),\n                type: context.cms.type as ApiEndpoint\n            });\n        } catch (ex) {\n            console.log(`Error while generating the schema.`);\n            console.log(formatErrorPayload(ex));\n            throw ex;\n        }\n\n        let body: GraphQLRequestBody | GraphQLRequestBody[] = [];\n        try {\n            body = createRequestBody(request.body);\n        } catch (ex) {\n            console.log(`Error while creating the body request.`);\n            console.log(formatErrorPayload(ex));\n            throw ex;\n        }\n\n        try {\n            const result = await processRequestBody(body, schema, context);\n            return reply.code(200).send(result);\n        } catch (ex) {\n            console.log(`Error while processing the body request.`);\n            console.log(formatErrorPayload(ex));\n            throw ex;\n        }\n    });\n\n    onOptions(\"/cms/:type(^manage|preview|read$)/:locale\", async (_, reply) => {\n        return reply.status(204).send({}).hijack();\n    });\n});\n\ncmsRoutes.name = \"headless-cms.graphql.route.default\";\n\nexport const graphQLHandlerFactory = ({ debug }: GraphQLHandlerFactoryParams): PluginCollection => {\n    return [\n        ...(debug ? debugPlugins() : []),\n        cmsRoutes,\n        {\n            type: \"wcp-telemetry-tracker\"\n        }\n    ];\n};\n"],"mappings":"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"}
+{"version":3,"names":["cmsRoutes","RoutePlugin","onPost","onOptions","context","request","reply","handleRequest","_","status","send","hijack","name","graphQLHandlerFactory","debug","debugPlugins","type"],"sources":["graphQLHandlerFactory.ts"],"sourcesContent":["import debugPlugins from \"@webiny/handler-graphql/debugPlugins\";\nimport { CmsContext } from \"~/types\";\nimport { PluginCollection } from \"@webiny/plugins/types\";\nimport { RoutePlugin } from \"@webiny/handler\";\nimport { handleRequest } from \"./handleRequest\";\n\nexport interface GraphQLHandlerFactoryParams {\n    debug?: boolean;\n}\n\nconst cmsRoutes = new RoutePlugin<CmsContext>(({ onPost, onOptions, context }) => {\n    onPost(\"/cms/:type(^manage|preview|read$)/:locale\", async (request, reply) => {\n        return handleRequest({ context, request, reply });\n    });\n\n    onOptions(\"/cms/:type(^manage|preview|read$)/:locale\", async (_, reply) => {\n        return reply.status(204).send({}).hijack();\n    });\n});\n\ncmsRoutes.name = \"headless-cms.graphql.route.default\";\n\nexport const graphQLHandlerFactory = ({ debug }: GraphQLHandlerFactoryParams): PluginCollection => {\n    return [\n        ...(debug ? debugPlugins() : []),\n        cmsRoutes,\n        {\n            type: \"wcp-telemetry-tracker\"\n        }\n    ];\n};\n"],"mappings":";;;;;;;AAAA;AAGA;AACA;AAMA,MAAMA,SAAS,GAAG,IAAIC,oBAAW,CAAa,CAAC;EAAEC,MAAM;EAAEC,SAAS;EAAEC;AAAQ,CAAC,KAAK;EAC9EF,MAAM,CAAC,2CAA2C,EAAE,OAAOG,OAAO,EAAEC,KAAK,KAAK;IAC1E,OAAO,IAAAC,4BAAa,EAAC;MAAEH,OAAO;MAAEC,OAAO;MAAEC;IAAM,CAAC,CAAC;EACrD,CAAC,CAAC;EAEFH,SAAS,CAAC,2CAA2C,EAAE,OAAOK,CAAC,EAAEF,KAAK,KAAK;IACvE,OAAOA,KAAK,CAACG,MAAM,CAAC,GAAG,CAAC,CAACC,IAAI,CAAC,CAAC,CAAC,CAAC,CAACC,MAAM,EAAE;EAC9C,CAAC,CAAC;AACN,CAAC,CAAC;AAEFX,SAAS,CAACY,IAAI,GAAG,oCAAoC;AAE9C,MAAMC,qBAAqB,GAAG,CAAC;EAAEC;AAAmC,CAAC,KAAuB;EAC/F,OAAO,CACH,IAAIA,KAAK,GAAG,IAAAC,qBAAY,GAAE,GAAG,EAAE,CAAC,EAChCf,SAAS,EACT;IACIgB,IAAI,EAAE;EACV,CAAC,CACJ;AACL,CAAC;AAAC"}

package/graphql/handleRequest.d.ts

@@ -0,0 +1,11 @@
+import { CmsContext } from "../types";
+import { Reply, Request } from "@webiny/handler/types";
+export interface HandleRequestParams {
+    context: CmsContext;
+    request: Request;
+    reply: Reply;
+}
+export interface HandleRequest {
+    (params: HandleRequestParams): Promise<Reply>;
+}
+export declare const handleRequest: HandleRequest;

package/graphql/handleRequest.js

@@ -0,0 +1,81 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.handleRequest = void 0;
+var _checkEndpointAccess = require("./checkEndpointAccess");
+var _createRequestBody = require("./createRequestBody");
+var _formatErrorPayload = require("./formatErrorPayload");
+var _getSchema = require("./getSchema");
+var _handlerGraphql = require("@webiny/handler-graphql");
+const handleRequest = async params => {
+  const {
+    context,
+    request,
+    reply
+  } = params;
+  try {
+    await (0, _checkEndpointAccess.checkEndpointAccess)(context);
+  } catch (ex) {
+    return reply.code(401).send({
+      data: null,
+      error: {
+        message: ex.message || "Not authorized!",
+        code: ex.code || "SECURITY_NOT_AUTHORIZED",
+        data: ex.data || null,
+        stack: null
+      }
+    });
+  }
+  const getTenant = () => {
+    return context.tenancy.getCurrentTenant();
+  };
+  const getLocale = () => {
+    return context.cms.getLocale();
+  };
+  const getLastModifiedTime = async () => {
+    return context.cms.getModelLastChange();
+  };
+  const schema = await context.benchmark.measure("headlessCms.graphql.getSchema", async () => {
+    try {
+      return await (0, _getSchema.getSchema)({
+        context,
+        getTenant,
+        getLastModifiedTime,
+        getLocale,
+        type: context.cms.type
+      });
+    } catch (ex) {
+      console.error(`Error while generating the schema.`);
+      console.error((0, _formatErrorPayload.formatErrorPayload)(ex));
+      throw ex;
+    }
+  });
+  const body = await context.benchmark.measure("headlessCms.graphql.createRequestBody", async () => {
+    try {
+      return (0, _createRequestBody.createRequestBody)(request.body);
+    } catch (ex) {
+      console.error(`Error while creating the body request.`);
+      console.error((0, _formatErrorPayload.formatErrorPayload)(ex));
+      throw ex;
+    }
+  });
+
+  /**
+   * We need to store the processRequestBody result in a variable and output it after the measurement.
+   * Otherwise, the measurement will not be shown in the output.
+   */
+  let result = null;
+  await context.benchmark.measure("headlessCms.graphql.processRequestBody", async () => {
+    try {
+      result = await (0, _handlerGraphql.processRequestBody)(body, schema, context);
+    } catch (ex) {
+      console.error(`Error while processing the body request.`);
+      console.error((0, _formatErrorPayload.formatErrorPayload)(ex));
+      throw ex;
+    }
+  });
+  return reply.code(200).send(result);
+};
+exports.handleRequest = handleRequest;

package/graphql/handleRequest.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["handleRequest","params","context","request","reply","checkEndpointAccess","ex","code","send","data","error","message","stack","getTenant","tenancy","getCurrentTenant","getLocale","cms","getLastModifiedTime","getModelLastChange","schema","benchmark","measure","getSchema","type","console","formatErrorPayload","body","createRequestBody","result","processRequestBody"],"sources":["handleRequest.ts"],"sourcesContent":["import { ApiEndpoint, CmsContext } from \"~/types\";\nimport { checkEndpointAccess } from \"./checkEndpointAccess\";\nimport { createRequestBody } from \"./createRequestBody\";\nimport { formatErrorPayload } from \"./formatErrorPayload\";\nimport { getSchema } from \"./getSchema\";\nimport { Reply, Request } from \"@webiny/handler/types\";\nimport { processRequestBody } from \"@webiny/handler-graphql\";\nimport { ExecutionResult } from \"graphql\";\n\nexport interface HandleRequestParams {\n    context: CmsContext;\n    request: Request;\n    reply: Reply;\n}\n\nexport interface HandleRequest {\n    (params: HandleRequestParams): Promise<Reply>;\n}\n\nexport const handleRequest: HandleRequest = async params => {\n    const { context, request, reply } = params;\n    try {\n        await checkEndpointAccess(context);\n    } catch (ex) {\n        return reply.code(401).send({\n            data: null,\n            error: {\n                message: ex.message || \"Not authorized!\",\n                code: ex.code || \"SECURITY_NOT_AUTHORIZED\",\n                data: ex.data || null,\n                stack: null\n            }\n        });\n    }\n\n    const getTenant = () => {\n        return context.tenancy.getCurrentTenant();\n    };\n\n    const getLocale = () => {\n        return context.cms.getLocale();\n    };\n\n    const getLastModifiedTime = async () => {\n        return context.cms.getModelLastChange();\n    };\n\n    const schema = await context.benchmark.measure(\"headlessCms.graphql.getSchema\", async () => {\n        try {\n            return await getSchema({\n                context,\n                getTenant,\n                getLastModifiedTime,\n                getLocale,\n                type: context.cms.type as ApiEndpoint\n            });\n        } catch (ex) {\n            console.error(`Error while generating the schema.`);\n            console.error(formatErrorPayload(ex));\n            throw ex;\n        }\n    });\n\n    const body = await context.benchmark.measure(\n        \"headlessCms.graphql.createRequestBody\",\n        async () => {\n            try {\n                return createRequestBody(request.body);\n            } catch (ex) {\n                console.error(`Error while creating the body request.`);\n                console.error(formatErrorPayload(ex));\n                throw ex;\n            }\n        }\n    );\n\n    /**\n     * We need to store the processRequestBody result in a variable and output it after the measurement.\n     * Otherwise, the measurement will not be shown in the output.\n     */\n    let result: ExecutionResult[] | ExecutionResult | null = null;\n\n    await context.benchmark.measure(\"headlessCms.graphql.processRequestBody\", async () => {\n        try {\n            result = await processRequestBody(body, schema, context);\n        } catch (ex) {\n            console.error(`Error while processing the body request.`);\n            console.error(formatErrorPayload(ex));\n            throw ex;\n        }\n    });\n\n    return reply.code(200).send(result);\n};\n"],"mappings":";;;;;;AACA;AACA;AACA;AACA;AAEA;AAaO,MAAMA,aAA4B,GAAG,MAAMC,MAAM,IAAI;EACxD,MAAM;IAAEC,OAAO;IAAEC,OAAO;IAAEC;EAAM,CAAC,GAAGH,MAAM;EAC1C,IAAI;IACA,MAAM,IAAAI,wCAAmB,EAACH,OAAO,CAAC;EACtC,CAAC,CAAC,OAAOI,EAAE,EAAE;IACT,OAAOF,KAAK,CAACG,IAAI,CAAC,GAAG,CAAC,CAACC,IAAI,CAAC;MACxBC,IAAI,EAAE,IAAI;MACVC,KAAK,EAAE;QACHC,OAAO,EAAEL,EAAE,CAACK,OAAO,IAAI,iBAAiB;QACxCJ,IAAI,EAAED,EAAE,CAACC,IAAI,IAAI,yBAAyB;QAC1CE,IAAI,EAAEH,EAAE,CAACG,IAAI,IAAI,IAAI;QACrBG,KAAK,EAAE;MACX;IACJ,CAAC,CAAC;EACN;EAEA,MAAMC,SAAS,GAAG,MAAM;IACpB,OAAOX,OAAO,CAACY,OAAO,CAACC,gBAAgB,EAAE;EAC7C,CAAC;EAED,MAAMC,SAAS,GAAG,MAAM;IACpB,OAAOd,OAAO,CAACe,GAAG,CAACD,SAAS,EAAE;EAClC,CAAC;EAED,MAAME,mBAAmB,GAAG,YAAY;IACpC,OAAOhB,OAAO,CAACe,GAAG,CAACE,kBAAkB,EAAE;EAC3C,CAAC;EAED,MAAMC,MAAM,GAAG,MAAMlB,OAAO,CAACmB,SAAS,CAACC,OAAO,CAAC,+BAA+B,EAAE,YAAY;IACxF,IAAI;MACA,OAAO,MAAM,IAAAC,oBAAS,EAAC;QACnBrB,OAAO;QACPW,SAAS;QACTK,mBAAmB;QACnBF,SAAS;QACTQ,IAAI,EAAEtB,OAAO,CAACe,GAAG,CAACO;MACtB,CAAC,CAAC;IACN,CAAC,CAAC,OAAOlB,EAAE,EAAE;MACTmB,OAAO,CAACf,KAAK,CAAE,oCAAmC,CAAC;MACnDe,OAAO,CAACf,KAAK,CAAC,IAAAgB,sCAAkB,EAACpB,EAAE,CAAC,CAAC;MACrC,MAAMA,EAAE;IACZ;EACJ,CAAC,CAAC;EAEF,MAAMqB,IAAI,GAAG,MAAMzB,OAAO,CAACmB,SAAS,CAACC,OAAO,CACxC,uCAAuC,EACvC,YAAY;IACR,IAAI;MACA,OAAO,IAAAM,oCAAiB,EAACzB,OAAO,CAACwB,IAAI,CAAC;IAC1C,CAAC,CAAC,OAAOrB,EAAE,EAAE;MACTmB,OAAO,CAACf,KAAK,CAAE,wCAAuC,CAAC;MACvDe,OAAO,CAACf,KAAK,CAAC,IAAAgB,sCAAkB,EAACpB,EAAE,CAAC,CAAC;MACrC,MAAMA,EAAE;IACZ;EACJ,CAAC,CACJ;;EAED;AACJ;AACA;AACA;EACI,IAAIuB,MAAkD,GAAG,IAAI;EAE7D,MAAM3B,OAAO,CAACmB,SAAS,CAACC,OAAO,CAAC,wCAAwC,EAAE,YAAY;IAClF,IAAI;MACAO,MAAM,GAAG,MAAM,IAAAC,kCAAkB,EAACH,IAAI,EAAEP,MAAM,EAAElB,OAAO,CAAC;IAC5D,CAAC,CAAC,OAAOI,EAAE,EAAE;MACTmB,OAAO,CAACf,KAAK,CAAE,0CAAyC,CAAC;MACzDe,OAAO,CAACf,KAAK,CAAC,IAAAgB,sCAAkB,EAACpB,EAAE,CAAC,CAAC;MACrC,MAAMA,EAAE;IACZ;EACJ,CAAC,CAAC;EAEF,OAAOF,KAAK,CAACG,IAAI,CAAC,GAAG,CAAC,CAACC,IAAI,CAACqB,MAAM,CAAC;AACvC,CAAC;AAAC"}

package/graphql/schema/baseContentSchema.js

@@ -31,13 +31,7 @@ const createBaseContentSchema = ({
                 _empty: String
             }
 
-            type CmsCreatedBy {
-                id: String
-                displayName: String
-                type: String
-            }
-
-            type CmsOwnedBy {
+            type CmsIdentity {
                 id: String
                 displayName: String
                 type: String

package/graphql/schema/baseContentSchema.js.map

@@ -1 +1 @@
-{"version":3,"names":["createBaseContentSchema","context","scalars","plugins","byType","map","item","scalar","plugin","CmsGraphQLSchemaPlugin","typeDefs","name","join","resolvers","reduce","acc","s","JSON","JsonScalar","Long","LongScalar","RefInput","RefInputScalar","Number","NumberScalar","Any","AnyScalar","DateTime","DateTimeScalar","DateTimeZ","DateTimeZScalar","Date","DateScalar","Time","TimeScalar","Mutation","_empty"],"sources":["baseContentSchema.ts"],"sourcesContent":["import { GraphQLScalarPlugin } from \"@webiny/handler-graphql/types\";\nimport { CmsContext } from \"~/types\";\nimport {\n    RefInputScalar,\n    NumberScalar,\n    AnyScalar,\n    DateTimeScalar,\n    DateScalar,\n    TimeScalar,\n    LongScalar,\n    JsonScalar,\n    DateTimeZScalar\n} from \"@webiny/handler-graphql/builtInTypes\";\nimport { GraphQLScalarType } from \"graphql\";\nimport { CmsGraphQLSchemaPlugin } from \"~/plugins\";\n\ninterface Params {\n    context: CmsContext;\n}\nexport const createBaseContentSchema = ({ context }: Params): CmsGraphQLSchemaPlugin => {\n    const scalars = context.plugins\n        .byType<GraphQLScalarPlugin>(\"graphql-scalar\")\n        .map(item => item.scalar);\n\n    const plugin = new CmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            ${scalars.map(scalar => `scalar ${scalar.name}`).join(\" \")}\n            scalar JSON\n            scalar Long\n            scalar RefInput\n            scalar Number\n            scalar Any\n            scalar Date\n            scalar DateTime\n            scalar DateTimeZ\n            scalar Time\n\n            type Query\n\n            type Mutation {\n                _empty: String\n            }\n\n            type CmsCreatedBy {\n                id: String\n                displayName: String\n                type: String\n            }\n\n            type CmsOwnedBy {\n                id: String\n                displayName: String\n                type: String\n            }\n\n            enum CmsEntryStatusType {\n                latest\n                published\n            }\n        `,\n        resolvers: {\n            ...scalars.reduce<Record<string, GraphQLScalarType>>((acc, s) => {\n                acc[s.name] = s;\n                return acc;\n            }, {}),\n            JSON: JsonScalar,\n            Long: LongScalar,\n            RefInput: RefInputScalar,\n            Number: NumberScalar,\n            Any: AnyScalar,\n            DateTime: DateTimeScalar,\n            DateTimeZ: DateTimeZScalar,\n            Date: DateScalar,\n            Time: TimeScalar,\n            Mutation: {\n                _empty: () => \"_empty\"\n            }\n        }\n    });\n    plugin.name = `headless-cms.graphql.schema.baseContentSchema`;\n\n    return plugin;\n};\n"],"mappings":";;;;;;;;AAEA;AAYA;AAKO,MAAMA,uBAAuB,GAAG,CAAC;EAAEC;AAAgB,CAAC,KAA6B;EACpF,MAAMC,OAAO,GAAGD,OAAO,CAACE,OAAO,CAC1BC,MAAM,CAAsB,gBAAgB,CAAC,CAC7CC,GAAG,CAACC,IAAI,IAAIA,IAAI,CAACC,MAAM,CAAC;EAE7B,MAAMC,MAAM,GAAG,IAAIC,+BAAsB,CAAC;IACtCC,QAAQ,EAAE,aAAe;AACjC,cAAcR,OAAO,CAACG,GAAG,CAACE,MAAM,IAAK,UAASA,MAAM,CAACI,IAAK,EAAC,CAAC,CAACC,IAAI,CAAC,GAAG,CAAE;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;IACDC,SAAS,8DACFX,OAAO,CAACY,MAAM,CAAoC,CAACC,GAAG,EAAEC,CAAC,KAAK;MAC7DD,GAAG,CAACC,CAAC,CAACL,IAAI,CAAC,GAAGK,CAAC;MACf,OAAOD,GAAG;IACd,CAAC,EAAE,CAAC,CAAC,CAAC;MACNE,IAAI,EAAEC,wBAAU;MAChBC,IAAI,EAAEC,wBAAU;MAChBC,QAAQ,EAAEC,4BAAc;MACxBC,MAAM,EAAEC,0BAAY;MACpBC,GAAG,EAAEC,uBAAS;MACdC,QAAQ,EAAEC,4BAAc;MACxBC,SAAS,EAAEC,6BAAe;MAC1BC,IAAI,EAAEC,wBAAU;MAChBC,IAAI,EAAEC,wBAAU;MAChBC,QAAQ,EAAE;QACNC,MAAM,EAAE,MAAM;MAClB;IAAC;EAET,CAAC,CAAC;EACF5B,MAAM,CAACG,IAAI,GAAI,+CAA8C;EAE7D,OAAOH,MAAM;AACjB,CAAC;AAAC"}
+{"version":3,"names":["createBaseContentSchema","context","scalars","plugins","byType","map","item","scalar","plugin","CmsGraphQLSchemaPlugin","typeDefs","name","join","resolvers","reduce","acc","s","JSON","JsonScalar","Long","LongScalar","RefInput","RefInputScalar","Number","NumberScalar","Any","AnyScalar","DateTime","DateTimeScalar","DateTimeZ","DateTimeZScalar","Date","DateScalar","Time","TimeScalar","Mutation","_empty"],"sources":["baseContentSchema.ts"],"sourcesContent":["import { GraphQLScalarPlugin } from \"@webiny/handler-graphql/types\";\nimport { CmsContext } from \"~/types\";\nimport {\n    RefInputScalar,\n    NumberScalar,\n    AnyScalar,\n    DateTimeScalar,\n    DateScalar,\n    TimeScalar,\n    LongScalar,\n    JsonScalar,\n    DateTimeZScalar\n} from \"@webiny/handler-graphql/builtInTypes\";\nimport { GraphQLScalarType } from \"graphql\";\nimport { CmsGraphQLSchemaPlugin } from \"~/plugins\";\n\ninterface Params {\n    context: CmsContext;\n}\nexport const createBaseContentSchema = ({ context }: Params): CmsGraphQLSchemaPlugin => {\n    const scalars = context.plugins\n        .byType<GraphQLScalarPlugin>(\"graphql-scalar\")\n        .map(item => item.scalar);\n\n    const plugin = new CmsGraphQLSchemaPlugin({\n        typeDefs: /* GraphQL */ `\n            ${scalars.map(scalar => `scalar ${scalar.name}`).join(\" \")}\n            scalar JSON\n            scalar Long\n            scalar RefInput\n            scalar Number\n            scalar Any\n            scalar Date\n            scalar DateTime\n            scalar DateTimeZ\n            scalar Time\n\n            type Query\n\n            type Mutation {\n                _empty: String\n            }\n\n            type CmsIdentity {\n                id: String\n                displayName: String\n                type: String\n            }\n\n            enum CmsEntryStatusType {\n                latest\n                published\n            }\n        `,\n        resolvers: {\n            ...scalars.reduce<Record<string, GraphQLScalarType>>((acc, s) => {\n                acc[s.name] = s;\n                return acc;\n            }, {}),\n            JSON: JsonScalar,\n            Long: LongScalar,\n            RefInput: RefInputScalar,\n            Number: NumberScalar,\n            Any: AnyScalar,\n            DateTime: DateTimeScalar,\n            DateTimeZ: DateTimeZScalar,\n            Date: DateScalar,\n            Time: TimeScalar,\n            Mutation: {\n                _empty: () => \"_empty\"\n            }\n        }\n    });\n    plugin.name = `headless-cms.graphql.schema.baseContentSchema`;\n\n    return plugin;\n};\n"],"mappings":";;;;;;;;AAEA;AAYA;AAKO,MAAMA,uBAAuB,GAAG,CAAC;EAAEC;AAAgB,CAAC,KAA6B;EACpF,MAAMC,OAAO,GAAGD,OAAO,CAACE,OAAO,CAC1BC,MAAM,CAAsB,gBAAgB,CAAC,CAC7CC,GAAG,CAACC,IAAI,IAAIA,IAAI,CAACC,MAAM,CAAC;EAE7B,MAAMC,MAAM,GAAG,IAAIC,+BAAsB,CAAC;IACtCC,QAAQ,EAAE,aAAe;AACjC,cAAcR,OAAO,CAACG,GAAG,CAACE,MAAM,IAAK,UAASA,MAAM,CAACI,IAAK,EAAC,CAAC,CAACC,IAAI,CAAC,GAAG,CAAE;AACvE;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,SAAS;IACDC,SAAS,8DACFX,OAAO,CAACY,MAAM,CAAoC,CAACC,GAAG,EAAEC,CAAC,KAAK;MAC7DD,GAAG,CAACC,CAAC,CAACL,IAAI,CAAC,GAAGK,CAAC;MACf,OAAOD,GAAG;IACd,CAAC,EAAE,CAAC,CAAC,CAAC;MACNE,IAAI,EAAEC,wBAAU;MAChBC,IAAI,EAAEC,wBAAU;MAChBC,QAAQ,EAAEC,4BAAc;MACxBC,MAAM,EAAEC,0BAAY;MACpBC,GAAG,EAAEC,uBAAS;MACdC,QAAQ,EAAEC,4BAAc;MACxBC,SAAS,EAAEC,6BAAe;MAC1BC,IAAI,EAAEC,wBAAU;MAChBC,IAAI,EAAEC,wBAAU;MAChBC,QAAQ,EAAE;QACNC,MAAM,EAAE,MAAM;MAClB;IAAC;EAET,CAAC,CAAC;EACF5B,MAAM,CAACG,IAAI,GAAI,+CAA8C;EAE7D,OAAOH,MAAM;AACjB,CAAC;AAAC"}

package/graphql/schema/contentEntries.js

@@ -5,11 +5,38 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createContentEntriesSchema = void 0;
+var _error = _interopRequireDefault(require("@webiny/error"));
 var _handlerGraphql = require("@webiny/handler-graphql");
 var _apiSecurity = require("@webiny/api-security");
 var _getEntryTitle = require("../../utils/getEntryTitle");
 var _plugins = require("../../plugins");
-var _error = _interopRequireDefault(require("@webiny/error"));
+var _getEntryDescription = require("../../utils/getEntryDescription");
+var _getEntryImage = require("../../utils/getEntryImage");
+var _entryStorage = require("../../utils/entryStorage");
+const createDate = date => {
+  try {
+    return new Date(date);
+  } catch {}
+  return new Date();
+};
+const createCmsEntryRecord = (model, entry) => {
+  return {
+    id: entry.id,
+    entryId: entry.entryId,
+    model: {
+      modelId: model.modelId,
+      name: model.name
+    },
+    status: entry.status,
+    title: (0, _getEntryTitle.getEntryTitle)(model, entry),
+    description: (0, _getEntryDescription.getEntryDescription)(model, entry),
+    image: (0, _getEntryImage.getEntryImage)(model, entry),
+    createdBy: entry.createdBy,
+    modifiedBy: entry.modifiedBy,
+    createdOn: createDate(entry.createdOn),
+    savedOn: createDate(entry.savedOn)
+  };
+};
 const getFetchMethod = (type, context) => {
   if (!getContentEntriesMethods[type]) {
     throw new _error.default(`Unknown getContentEntries method "${type}". Could not fetch content entries.`, "UNKNOWN_METHOD_ERROR", {
@@ -72,16 +99,7 @@ const getContentEntries = async params => {
     const entries = results.reduce((collection, items) => {
       return collection.concat(items.map(item => {
         const model = modelsMap[item.modelId];
-        return {
-          id: item.id,
-          entryId: item.entryId,
-          model: {
-            modelId: model.modelId,
-            name: model.name
-          },
-          status: item.status,
-          title: (0, _getEntryTitle.getEntryTitle)(model, item)
-        };
+        return createCmsEntryRecord(model, item);
       }));
     }, []).filter(Boolean);
     return new _handlerGraphql.Response(entries);
@@ -125,16 +143,37 @@ const getContentEntry = async params => {
   if (!entry) {
     return new _handlerGraphql.Response(null);
   }
-  return new _handlerGraphql.Response({
-    id: entry.id,
-    entryId: entry.entryId,
-    model: {
-      modelId: model.modelId,
-      name: model.name
-    },
-    status: entry.status,
-    title: (0, _getEntryTitle.getEntryTitle)(model, entry)
-  });
+  return new _handlerGraphql.Response(createCmsEntryRecord(model, entry));
+};
+/**
+ * As we support description field, we need to transform the value from storage.
+ */
+const createResolveDescription = () => {
+  return async (parent, _, context) => {
+    const models = await context.cms.listModels();
+    const model = models.find(({
+      modelId
+    }) => {
+      return parent.model.modelId === modelId;
+    });
+    if (!model) {
+      return null;
+    }
+    const field = model.fields.find(f => f.fieldId === model.descriptionFieldId);
+    if (!field) {
+      return null;
+    }
+    const value = parent.description || parent[field.fieldId];
+    if (!value) {
+      return null;
+    }
+    return (0, _entryStorage.entryFieldFromStorageTransform)({
+      context,
+      model,
+      field,
+      value
+    });
+  };
 };
 const createContentEntriesSchema = ({
   context
@@ -150,27 +189,36 @@ const createContentEntriesSchema = ({
   const plugin = new _plugins.CmsGraphQLSchemaPlugin({
     typeDefs: /* GraphQL */`
             type CmsModelMeta {
-                modelId: String
-                name: String
+                modelId: String!
+                name: String!
             }
 
             type CmsPublishedContentEntry {
                 id: ID!
                 entryId: String!
                 title: String
+                description: String
+                image: String
             }
 
             type CmsContentEntry {
                 id: ID!
                 entryId: String!
-                model: CmsModelMeta
-                status: String
-                title: String
+                model: CmsModelMeta!
+                status: String!
+                title: String!
+                description: String
+                image: String
+                createdBy: CmsIdentity!
+                ownedBy: CmsIdentity!
+                modifiedBy: CmsIdentity
                 published: CmsPublishedContentEntry
+                createdOn: DateTime!
+                savedOn: DateTime!
             }
 
             type CmsContentEntriesResponse {
-                data: [CmsContentEntry]
+                data: [CmsContentEntry!]
                 error: CmsError
             }
 
@@ -191,20 +239,20 @@ const createContentEntriesSchema = ({
                     query: String
                     fields: [String!]
                     limit: Int
-                ): CmsContentEntriesResponse
+                ): CmsContentEntriesResponse!
 
                 # Get content entry meta data
-                getContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse
+                getContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse!
 
-                getLatestContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse
-                getPublishedContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse
+                getLatestContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse!
+                getPublishedContentEntry(entry: CmsModelEntryInput!): CmsContentEntryResponse!
 
                 # Get content entries meta data
-                getContentEntries(entries: [CmsModelEntryInput!]!): CmsContentEntriesResponse
-                getLatestContentEntries(entries: [CmsModelEntryInput!]!): CmsContentEntriesResponse
+                getContentEntries(entries: [CmsModelEntryInput!]!): CmsContentEntriesResponse!
+                getLatestContentEntries(entries: [CmsModelEntryInput!]!): CmsContentEntriesResponse!
                 getPublishedContentEntries(
                     entries: [CmsModelEntryInput!]!
-                ): CmsContentEntriesResponse
+                ): CmsContentEntriesResponse!
             }
         `,
     resolvers: {
@@ -224,15 +272,15 @@ const createContentEntriesSchema = ({
             if (!entry) {
               return null;
             }
-            return {
-              id: entry.id,
-              entryId: entry.entryId,
-              title: (0, _getEntryTitle.getEntryTitle)(model, entry)
-            };
+            return createCmsEntryRecord(model, entry);
           } catch (ex) {
             return null;
           }
-        }
+        },
+        description: createResolveDescription()
+      },
+      CmsPublishedContentEntry: {
+        description: createResolveDescription()
       },
       Query: {
         async searchContentEntries(_, args, context) {
@@ -253,23 +301,12 @@ const createContentEntriesSchema = ({
               fields: fields || []
             });
             return items.map(entry => {
-              return {
-                id: entry.id,
-                entryId: entry.entryId,
-                model: {
-                  modelId: model.modelId,
-                  name: model.name
-                },
-                status: entry.status,
-                title: (0, _getEntryTitle.getEntryTitle)(model, entry),
-                // We need `savedOn` to sort entries from latest to oldest
-                savedOn: entry.savedOn
-              };
+              return createCmsEntryRecord(model, entry);
             });
           });
           try {
             const entries = await Promise.all(getters).then(results => results.reduce((result, item) => result.concat(item), []));
-            return new _handlerGraphql.Response(entries.sort((a, b) => Date.parse(b.savedOn) - Date.parse(a.savedOn)).slice(0, limit));
+            return new _handlerGraphql.Response(entries.sort((a, b) => b.savedOn.getTime() - a.savedOn.getTime()).slice(0, limit));
           } catch (ex) {
             return new _handlerGraphql.ErrorResponse(ex);
           }