@webiny/api-apw 0.0.0-unstable.13771d80a8 → 0.0.0-unstable.2696f9d9e8

package/storageOperations/changeRequestStorageOperations.js

@@ -5,8 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createChangeRequestStorageOperations = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _index = require("./index");
+var _pickEntryFieldValues = require("../utils/pickEntryFieldValues");
 var _fieldResolver = require("../utils/fieldResolver");
 var _error = _interopRequireDefault(require("@webiny/error"));
 const createChangeRequestStorageOperations = params => {
@@ -16,9 +15,9 @@ const createChangeRequestStorageOperations = params => {
     security
   } = params;
   const getChangeRequestModel = async () => {
-    security.disableAuthorization();
-    const model = await cms.getModel("apwChangeRequestModelDefinition");
-    security.enableAuthorization();
+    const model = await security.withoutAuthorization(async () => {
+      return cms.getModel("apwChangeRequestModelDefinition");
+    });
     if (!model) {
       throw new _error.default("Could not find `apwChangeRequestModelDefinition` model.", "MODEL_NOT_FOUND_ERROR");
     }
@@ -28,12 +27,12 @@ const createChangeRequestStorageOperations = params => {
     id
   }) => {
     const model = await getChangeRequestModel();
-    security.disableAuthorization();
-    const entry = await cms.getEntryById(model, id);
-    security.enableAuthorization();
+    const entry = await security.withoutAuthorization(async () => {
+      return cms.getEntryById(model, id);
+    });
     return (0, _fieldResolver.getFieldValues)({
       entry,
-      fields: _index.baseFields,
+      fields: _pickEntryFieldValues.baseFields,
       context: getCmsContext(),
       transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
     });
@@ -43,15 +42,18 @@ const createChangeRequestStorageOperations = params => {
     getChangeRequest,
     async listChangeRequests(params) {
       const model = await getChangeRequestModel();
-      security.disableAuthorization();
-      const [entries, meta] = await cms.listLatestEntries(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
-        where: (0, _objectSpread2.default)({}, params.where)
-      }));
-      security.enableAuthorization();
+      const [entries, meta] = await security.withoutAuthorization(async () => {
+        return cms.listLatestEntries(model, {
+          ...params,
+          where: {
+            ...params.where
+          }
+        });
+      });
       try {
         const all = await Promise.all(entries.map(entry => (0, _fieldResolver.getFieldValues)({
           entry,
-          fields: _index.baseFields,
+          fields: _pickEntryFieldValues.baseFields,
           context: getCmsContext(),
           transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
         })));
@@ -62,18 +64,19 @@ const createChangeRequestStorageOperations = params => {
     },
     async createChangeRequest(params) {
       const model = await getChangeRequestModel();
-      security.disableAuthorization();
-      const entry = await cms.createEntry(model, params.data);
-      security.enableAuthorization();
+      const entry = await security.withoutAuthorization(async () => {
+        return cms.createEntry(model, params.data);
+      });
       return (0, _fieldResolver.getFieldValues)({
         entry,
-        fields: _index.baseFields,
+        fields: _pickEntryFieldValues.baseFields,
         context: getCmsContext(),
         transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
       });
     },
     async updateChangeRequest(params) {
       const model = await getChangeRequestModel();
+
       /**
        * We're fetching the existing entry here because we're not accepting "app" field as input,
        * but, we still need to retain its value after the "update" operation.
@@ -81,23 +84,53 @@ const createChangeRequestStorageOperations = params => {
       const existingEntry = await getChangeRequest({
         id: params.id
       });
-      security.disableAuthorization();
-      const entry = await cms.updateEntry(model, params.id, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, existingEntry), params.data));
-      security.enableAuthorization();
+
+      /**
+       * Only creator can update the change request
+       */
+      if (existingEntry.createdBy.id !== security.getIdentity().id) {
+        throw new _error.default("A change request can only be updated by its creator.", "ONLY_CREATOR_CAN_UPDATE_CHANGE_REQUEST");
+      }
+      const entry = await security.withoutAuthorization(async () => {
+        return cms.updateEntry(model, params.id, {
+          ...existingEntry,
+          ...params.data,
+          savedOn: new Date()
+        });
+      });
       return (0, _fieldResolver.getFieldValues)({
         entry,
-        fields: _index.baseFields,
+        fields: _pickEntryFieldValues.baseFields,
         context: getCmsContext(),
         transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
       });
     },
     async deleteChangeRequest(params) {
       const model = await getChangeRequestModel();
-      security.disableAuthorization();
-      await cms.deleteEntry(model, params.id);
-      security.enableAuthorization();
+      if (!security.getIdentity()) {
+        return true;
+      }
+
+      /**
+       * We're fetching the existing entry
+       */
+      const existingEntry = await getChangeRequest({
+        id: params.id
+      });
+
+      /**
+       * Only creator can delete the change request
+       */
+      if (existingEntry.createdBy.id !== security.getIdentity().id) {
+        throw new _error.default("A change request can only be deleted by its creator.", "ONLY_CREATOR_CAN_DELETE_CHANGE_REQUEST");
+      }
+      await security.withoutAuthorization(async () => {
+        return cms.deleteEntry(model, params.id);
+      });
       return true;
     }
   };
 };
-exports.createChangeRequestStorageOperations = createChangeRequestStorageOperations;
+exports.createChangeRequestStorageOperations = createChangeRequestStorageOperations;
+
+//# sourceMappingURL=changeRequestStorageOperations.js.map

package/storageOperations/changeRequestStorageOperations.js.map

@@ -1 +1 @@
-{"version":3,"names":["createChangeRequestStorageOperations","params","cms","getCmsContext","security","getChangeRequestModel","disableAuthorization","model","getModel","enableAuthorization","WebinyError","getChangeRequest","id","entry","getEntryById","getFieldValues","fields","baseFields","context","transformers","getTransformer","listChangeRequests","entries","meta","listLatestEntries","where","all","Promise","map","ex","message","code","data","createChangeRequest","createEntry","updateChangeRequest","existingEntry","updateEntry","deleteChangeRequest","deleteEntry"],"sources":["changeRequestStorageOperations.ts"],"sourcesContent":["import { ApwChangeRequestStorageOperations } from \"./types\";\nimport { baseFields, CreateApwStorageOperationsParams } from \"~/storageOperations/index\";\nimport { getFieldValues, getTransformer } from \"~/utils/fieldResolver\";\nimport WebinyError from \"@webiny/error\";\nimport { ApwChangeRequest } from \"~/types\";\n\nexport const createChangeRequestStorageOperations = (\n    params: CreateApwStorageOperationsParams\n): ApwChangeRequestStorageOperations => {\n    const { cms, getCmsContext, security } = params;\n    const getChangeRequestModel = async () => {\n        security.disableAuthorization();\n        const model = await cms.getModel(\"apwChangeRequestModelDefinition\");\n        security.enableAuthorization();\n        if (!model) {\n            throw new WebinyError(\n                \"Could not find `apwChangeRequestModelDefinition` model.\",\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n    const getChangeRequest: ApwChangeRequestStorageOperations[\"getChangeRequest\"] = async ({\n        id\n    }) => {\n        const model = await getChangeRequestModel();\n        security.disableAuthorization();\n        const entry = await cms.getEntryById(model, id);\n        security.enableAuthorization();\n        return getFieldValues({\n            entry,\n            fields: baseFields,\n            context: getCmsContext(),\n            transformers: [getTransformer(model, \"body\")]\n        });\n    };\n    return {\n        getChangeRequestModel,\n        getChangeRequest,\n        async listChangeRequests(params) {\n            const model = await getChangeRequestModel();\n            security.disableAuthorization();\n            const [entries, meta] = await cms.listLatestEntries(model, {\n                ...params,\n                where: {\n                    ...params.where\n                }\n            });\n            security.enableAuthorization();\n            try {\n                const all = await Promise.all(\n                    entries.map(entry =>\n                        getFieldValues<ApwChangeRequest>({\n                            entry,\n                            fields: baseFields,\n                            context: getCmsContext(),\n                            transformers: [getTransformer(model, \"body\")]\n                        })\n                    )\n                );\n                return [all, meta];\n            } catch (ex) {\n                throw new WebinyError(ex.message, ex.code, ex.data);\n            }\n        },\n        async createChangeRequest(params) {\n            const model = await getChangeRequestModel();\n            security.disableAuthorization();\n            const entry = await cms.createEntry(model, params.data);\n            security.enableAuthorization();\n            return getFieldValues({\n                entry,\n                fields: baseFields,\n                context: getCmsContext(),\n                transformers: [getTransformer(model, \"body\")]\n            });\n        },\n        async updateChangeRequest(params) {\n            const model = await getChangeRequestModel();\n            /**\n             * We're fetching the existing entry here because we're not accepting \"app\" field as input,\n             * but, we still need to retain its value after the \"update\" operation.\n             */\n            const existingEntry = await getChangeRequest({ id: params.id });\n\n            security.disableAuthorization();\n            const entry = await cms.updateEntry(model, params.id, {\n                ...existingEntry,\n                ...params.data\n            });\n            security.enableAuthorization();\n            return getFieldValues({\n                entry,\n                fields: baseFields,\n                context: getCmsContext(),\n                transformers: [getTransformer(model, \"body\")]\n            });\n        },\n        async deleteChangeRequest(params) {\n            const model = await getChangeRequestModel();\n            security.disableAuthorization();\n            await cms.deleteEntry(model, params.id);\n            security.enableAuthorization();\n            return true;\n        }\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["_pickEntryFieldValues","require","_fieldResolver","_error","_interopRequireDefault","createChangeRequestStorageOperations","params","cms","getCmsContext","security","getChangeRequestModel","model","withoutAuthorization","getModel","WebinyError","getChangeRequest","id","entry","getEntryById","getFieldValues","fields","baseFields","context","transformers","getTransformer","listChangeRequests","entries","meta","listLatestEntries","where","all","Promise","map","ex","message","code","data","createChangeRequest","createEntry","updateChangeRequest","existingEntry","createdBy","getIdentity","updateEntry","savedOn","Date","deleteChangeRequest","deleteEntry","exports"],"sources":["changeRequestStorageOperations.ts"],"sourcesContent":["import { ApwChangeRequestStorageOperations } from \"./types\";\nimport { CreateApwStorageOperationsParams } from \"~/storageOperations/index\";\nimport { baseFields } from \"~/utils/pickEntryFieldValues\";\nimport { getFieldValues, getTransformer } from \"~/utils/fieldResolver\";\nimport WebinyError from \"@webiny/error\";\nimport { ApwChangeRequest } from \"~/types\";\n\nexport const createChangeRequestStorageOperations = (\n    params: CreateApwStorageOperationsParams\n): ApwChangeRequestStorageOperations => {\n    const { cms, getCmsContext, security } = params;\n    const getChangeRequestModel = async () => {\n        const model = await security.withoutAuthorization(async () => {\n            return cms.getModel(\"apwChangeRequestModelDefinition\");\n        });\n        if (!model) {\n            throw new WebinyError(\n                \"Could not find `apwChangeRequestModelDefinition` model.\",\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n    const getChangeRequest: ApwChangeRequestStorageOperations[\"getChangeRequest\"] = async ({\n        id\n    }) => {\n        const model = await getChangeRequestModel();\n\n        const entry = await security.withoutAuthorization(async () => {\n            return cms.getEntryById(model, id);\n        });\n        return getFieldValues({\n            entry,\n            fields: baseFields,\n            context: getCmsContext(),\n            transformers: [getTransformer(model, \"body\")]\n        });\n    };\n    return {\n        getChangeRequestModel,\n        getChangeRequest,\n        async listChangeRequests(params) {\n            const model = await getChangeRequestModel();\n\n            const [entries, meta] = await security.withoutAuthorization(async () => {\n                return cms.listLatestEntries(model, {\n                    ...params,\n                    where: {\n                        ...params.where\n                    }\n                });\n            });\n            try {\n                const all = await Promise.all(\n                    entries.map(entry =>\n                        getFieldValues<ApwChangeRequest>({\n                            entry,\n                            fields: baseFields,\n                            context: getCmsContext(),\n                            transformers: [getTransformer(model, \"body\")]\n                        })\n                    )\n                );\n                return [all, meta];\n            } catch (ex) {\n                throw new WebinyError(ex.message, ex.code, ex.data);\n            }\n        },\n        async createChangeRequest(params) {\n            const model = await getChangeRequestModel();\n\n            const entry = await security.withoutAuthorization(async () => {\n                return cms.createEntry(model, params.data);\n            });\n            return getFieldValues({\n                entry,\n                fields: baseFields,\n                context: getCmsContext(),\n                transformers: [getTransformer(model, \"body\")]\n            });\n        },\n        async updateChangeRequest(params) {\n            const model = await getChangeRequestModel();\n\n            /**\n             * We're fetching the existing entry here because we're not accepting \"app\" field as input,\n             * but, we still need to retain its value after the \"update\" operation.\n             */\n            const existingEntry = await getChangeRequest({ id: params.id });\n\n            /**\n             * Only creator can update the change request\n             */\n            if (existingEntry.createdBy.id !== security.getIdentity().id) {\n                throw new WebinyError(\n                    \"A change request can only be updated by its creator.\",\n                    \"ONLY_CREATOR_CAN_UPDATE_CHANGE_REQUEST\"\n                );\n            }\n\n            const entry = await security.withoutAuthorization(async () => {\n                return cms.updateEntry(model, params.id, {\n                    ...existingEntry,\n                    ...params.data,\n                    savedOn: new Date()\n                });\n            });\n            return getFieldValues({\n                entry,\n                fields: baseFields,\n                context: getCmsContext(),\n                transformers: [getTransformer(model, \"body\")]\n            });\n        },\n        async deleteChangeRequest(params) {\n            const model = await getChangeRequestModel();\n\n            if (!security.getIdentity()) {\n                return true;\n            }\n\n            /**\n             * We're fetching the existing entry\n             */\n            const existingEntry = await getChangeRequest({ id: params.id });\n\n            /**\n             * Only creator can delete the change request\n             */\n            if (existingEntry.createdBy.id !== security.getIdentity().id) {\n                throw new WebinyError(\n                    \"A change request can only be deleted by its creator.\",\n                    \"ONLY_CREATOR_CAN_DELETE_CHANGE_REQUEST\"\n                );\n            }\n\n            await security.withoutAuthorization(async () => {\n                return cms.deleteEntry(model, params.id);\n            });\n\n            return true;\n        }\n    };\n};\n"],"mappings":"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"}

package/storageOperations/commentStorageOperations.js

@@ -5,9 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createCommentStorageOperations = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _index = require("./index");
 var _fieldResolver = require("../utils/fieldResolver");
+var _pickEntryFieldValues = require("../utils/pickEntryFieldValues");
 var _error = _interopRequireDefault(require("@webiny/error"));
 var _comment = require("./models/comment.model");
 const pickIdFromChangeRequest = obj => {
@@ -24,9 +23,9 @@ const createCommentStorageOperations = ({
   security
 }) => {
   const getCommentModel = async () => {
-    security.disableAuthorization();
-    const model = await cms.getModel(_comment.COMMENT_MODEL_ID);
-    security.enableAuthorization();
+    const model = await security.withoutAuthorization(async () => {
+      return cms.getModel(_comment.COMMENT_MODEL_ID);
+    });
     if (!model) {
       throw new _error.default(`Could not find "${_comment.COMMENT_MODEL_ID}" model.`, "MODEL_NOT_FOUND_ERROR");
     }
@@ -36,12 +35,12 @@ const createCommentStorageOperations = ({
     id
   }) => {
     const model = await getCommentModel();
-    security.disableAuthorization();
-    const entry = await cms.getEntryById(model, id);
-    security.enableAuthorization();
+    const entry = await security.withoutAuthorization(async () => {
+      return cms.getEntryById(model, id);
+    });
     return (0, _fieldResolver.getFieldValues)({
       entry,
-      fields: _index.baseFields,
+      fields: _pickEntryFieldValues.baseFields,
       context: getCmsContext(),
       transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
     });
@@ -54,12 +53,12 @@ const createCommentStorageOperations = ({
     },
     async listComments(params) {
       const model = await getCommentModel();
-      security.disableAuthorization();
-      const [entries, meta] = await cms.listLatestEntries(model, params);
-      security.enableAuthorization();
+      const [entries, meta] = await security.withoutAuthorization(async () => {
+        return cms.listLatestEntries(model, params);
+      });
       const values = await Promise.all(entries.map(entry => (0, _fieldResolver.getFieldValues)({
         entry,
-        fields: _index.baseFields,
+        fields: _pickEntryFieldValues.baseFields,
         context: getCmsContext(),
         transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
       })));
@@ -69,17 +68,18 @@ const createCommentStorageOperations = ({
     async createComment(params) {
       const model = await getCommentModel();
       const refModel = await this.getChangeRequestModel();
-      security.disableAuthorization();
-      const entry = await cms.createEntry(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params.data), {}, {
-        changeRequest: {
-          id: params.data.changeRequest,
-          modelId: refModel.modelId
-        }
-      }));
-      security.enableAuthorization();
+      const entry = await security.withoutAuthorization(async () => {
+        return cms.createEntry(model, {
+          ...params.data,
+          changeRequest: {
+            id: params.data.changeRequest,
+            modelId: refModel.modelId
+          }
+        });
+      });
       const values = await (0, _fieldResolver.getFieldValues)({
         entry,
-        fields: _index.baseFields,
+        fields: _pickEntryFieldValues.baseFields,
         context: getCmsContext(),
         transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
       });
@@ -94,12 +94,16 @@ const createCommentStorageOperations = ({
       const existingEntry = await getComment({
         id: params.id
       });
-      security.disableAuthorization();
-      const entry = await cms.updateEntry(model, params.id, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, existingEntry), params.data));
-      security.enableAuthorization();
+      const entry = await security.withoutAuthorization(async () => {
+        return cms.updateEntry(model, params.id, {
+          ...existingEntry,
+          ...params.data,
+          savedOn: new Date()
+        });
+      });
       const values = await (0, _fieldResolver.getFieldValues)({
         entry,
-        fields: _index.baseFields,
+        fields: _pickEntryFieldValues.baseFields,
         context: getCmsContext(),
         transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
       });
@@ -107,11 +111,13 @@ const createCommentStorageOperations = ({
     },
     async deleteComment(params) {
       const model = await getCommentModel();
-      security.disableAuthorization();
-      await cms.deleteEntry(model, params.id);
-      security.enableAuthorization();
+      await security.withoutAuthorization(async () => {
+        return cms.deleteEntry(model, params.id);
+      });
       return true;
     }
   };
 };
-exports.createCommentStorageOperations = createCommentStorageOperations;
+exports.createCommentStorageOperations = createCommentStorageOperations;
+
+//# sourceMappingURL=commentStorageOperations.js.map

package/storageOperations/commentStorageOperations.js.map

@@ -1 +1 @@
-{"version":3,"names":["pickIdFromChangeRequest","obj","rawValue","id","createCommentStorageOperations","cms","getCmsContext","security","getCommentModel","disableAuthorization","model","getModel","COMMENT_MODEL_ID","enableAuthorization","WebinyError","getComment","entry","getEntryById","getFieldValues","fields","baseFields","context","transformers","getTransformer","params","values","listComments","entries","meta","listLatestEntries","Promise","all","map","value","createComment","refModel","getChangeRequestModel","createEntry","data","changeRequest","modelId","updateComment","existingEntry","updateEntry","deleteComment","deleteEntry"],"sources":["commentStorageOperations.ts"],"sourcesContent":["import { ApwStorageOperations } from \"./types\";\nimport { ApwCommentStorageOperations } from \"./types\";\nimport { baseFields, CreateApwStorageOperationsParams } from \"~/storageOperations/index\";\nimport { getFieldValues, getTransformer } from \"~/utils/fieldResolver\";\nimport WebinyError from \"@webiny/error\";\nimport { ApwComment } from \"~/types\";\nimport { CmsEntryListParams } from \"@webiny/api-headless-cms/types\";\nimport { COMMENT_MODEL_ID } from \"~/storageOperations/models/comment.model\";\n\nconst pickIdFromChangeRequest = (obj: Record<string, any>): ApwComment => {\n    const rawValue = obj[\"changeRequest\"];\n    if (!rawValue) {\n        return obj as unknown as ApwComment;\n    }\n    obj[\"changeRequest\"] = rawValue.id;\n    return obj as unknown as ApwComment;\n};\n\nexport const createCommentStorageOperations = ({\n    cms,\n    getCmsContext,\n    security\n}: CreateApwStorageOperationsParams): ApwCommentStorageOperations => {\n    const getCommentModel = async () => {\n        security.disableAuthorization();\n        const model = await cms.getModel(COMMENT_MODEL_ID);\n        security.enableAuthorization();\n        if (!model) {\n            throw new WebinyError(\n                `Could not find \"${COMMENT_MODEL_ID}\" model.`,\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n    const getComment: ApwCommentStorageOperations[\"getComment\"] = async ({ id }) => {\n        const model = await getCommentModel();\n        security.disableAuthorization();\n        const entry = await cms.getEntryById(model, id);\n        security.enableAuthorization();\n        return getFieldValues({\n            entry,\n            fields: baseFields,\n            context: getCmsContext(),\n            transformers: [getTransformer(model, \"body\")]\n        });\n    };\n    return {\n        getCommentModel,\n        getComment: async params => {\n            const values = await getComment(params);\n            return pickIdFromChangeRequest(values);\n        },\n        async listComments(params) {\n            const model = await getCommentModel();\n            security.disableAuthorization();\n            const [entries, meta] = await cms.listLatestEntries(\n                model,\n                params as CmsEntryListParams\n            );\n            security.enableAuthorization();\n            const values = await Promise.all(\n                entries.map(entry =>\n                    getFieldValues<ApwComment>({\n                        entry,\n                        fields: baseFields,\n                        context: getCmsContext(),\n                        transformers: [getTransformer(model, \"body\")]\n                    })\n                )\n            );\n            const all = values.map(value => pickIdFromChangeRequest(value));\n            return [all, meta];\n        },\n        async createComment(this: ApwStorageOperations, params) {\n            const model = await getCommentModel();\n            const refModel = await this.getChangeRequestModel();\n            security.disableAuthorization();\n            const entry = await cms.createEntry(model, {\n                ...params.data,\n                changeRequest: {\n                    id: params.data.changeRequest,\n                    modelId: refModel.modelId\n                }\n            });\n            security.enableAuthorization();\n\n            const values = await getFieldValues({\n                entry,\n                fields: baseFields,\n                context: getCmsContext(),\n                transformers: [getTransformer(model, \"body\")]\n            });\n            return pickIdFromChangeRequest(values);\n        },\n        async updateComment(params) {\n            const model = await getCommentModel();\n            /**\n             * We're fetching the existing entry here because we're not accepting \"app\" field as input,\n             * but, we still need to retain its value after the \"update\" operation.\n             */\n            const existingEntry = await getComment({ id: params.id });\n\n            security.disableAuthorization();\n            const entry = await cms.updateEntry(model, params.id, {\n                ...existingEntry,\n                ...params.data\n            });\n            security.enableAuthorization();\n            const values = await getFieldValues({\n                entry,\n                fields: baseFields,\n                context: getCmsContext(),\n                transformers: [getTransformer(model, \"body\")]\n            });\n            return pickIdFromChangeRequest(values);\n        },\n        async deleteComment(params) {\n            const model = await getCommentModel();\n            security.disableAuthorization();\n            await cms.deleteEntry(model, params.id);\n            security.enableAuthorization();\n            return true;\n        }\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["_fieldResolver","require","_pickEntryFieldValues","_error","_interopRequireDefault","_comment","pickIdFromChangeRequest","obj","rawValue","id","createCommentStorageOperations","cms","getCmsContext","security","getCommentModel","model","withoutAuthorization","getModel","COMMENT_MODEL_ID","WebinyError","getComment","entry","getEntryById","getFieldValues","fields","baseFields","context","transformers","getTransformer","params","values","listComments","entries","meta","listLatestEntries","Promise","all","map","value","createComment","refModel","getChangeRequestModel","createEntry","data","changeRequest","modelId","updateComment","existingEntry","updateEntry","savedOn","Date","deleteComment","deleteEntry","exports"],"sources":["commentStorageOperations.ts"],"sourcesContent":["import { ApwStorageOperations } from \"./types\";\nimport { ApwCommentStorageOperations } from \"./types\";\nimport { CreateApwStorageOperationsParams } from \"~/storageOperations/index\";\nimport { getFieldValues, getTransformer } from \"~/utils/fieldResolver\";\nimport { baseFields } from \"~/utils/pickEntryFieldValues\";\n\nimport WebinyError from \"@webiny/error\";\nimport { ApwComment } from \"~/types\";\nimport { CmsEntryListParams } from \"@webiny/api-headless-cms/types\";\nimport { COMMENT_MODEL_ID } from \"~/storageOperations/models/comment.model\";\n\nconst pickIdFromChangeRequest = (obj: Record<string, any>): ApwComment => {\n    const rawValue = obj[\"changeRequest\"];\n    if (!rawValue) {\n        return obj as unknown as ApwComment;\n    }\n    obj[\"changeRequest\"] = rawValue.id;\n    return obj as unknown as ApwComment;\n};\n\nexport const createCommentStorageOperations = ({\n    cms,\n    getCmsContext,\n    security\n}: CreateApwStorageOperationsParams): ApwCommentStorageOperations => {\n    const getCommentModel = async () => {\n        const model = await security.withoutAuthorization(async () => {\n            return cms.getModel(COMMENT_MODEL_ID);\n        });\n\n        if (!model) {\n            throw new WebinyError(\n                `Could not find \"${COMMENT_MODEL_ID}\" model.`,\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n    const getComment: ApwCommentStorageOperations[\"getComment\"] = async ({ id }) => {\n        const model = await getCommentModel();\n        const entry = await security.withoutAuthorization(async () => {\n            return cms.getEntryById(model, id);\n        });\n\n        return getFieldValues({\n            entry,\n            fields: baseFields,\n            context: getCmsContext(),\n            transformers: [getTransformer(model, \"body\")]\n        });\n    };\n    return {\n        getCommentModel,\n        getComment: async params => {\n            const values = await getComment(params);\n            return pickIdFromChangeRequest(values);\n        },\n        async listComments(params) {\n            const model = await getCommentModel();\n            const [entries, meta] = await security.withoutAuthorization(async () => {\n                return cms.listLatestEntries(model, params as CmsEntryListParams);\n            });\n            const values = await Promise.all(\n                entries.map(entry =>\n                    getFieldValues<ApwComment>({\n                        entry,\n                        fields: baseFields,\n                        context: getCmsContext(),\n                        transformers: [getTransformer(model, \"body\")]\n                    })\n                )\n            );\n            const all = values.map(value => pickIdFromChangeRequest(value));\n            return [all, meta];\n        },\n        async createComment(this: ApwStorageOperations, params) {\n            const model = await getCommentModel();\n            const refModel = await this.getChangeRequestModel();\n\n            const entry = await security.withoutAuthorization(async () => {\n                return cms.createEntry(model, {\n                    ...params.data,\n                    changeRequest: {\n                        id: params.data.changeRequest,\n                        modelId: refModel.modelId\n                    }\n                });\n            });\n\n            const values = await getFieldValues({\n                entry,\n                fields: baseFields,\n                context: getCmsContext(),\n                transformers: [getTransformer(model, \"body\")]\n            });\n            return pickIdFromChangeRequest(values);\n        },\n        async updateComment(params) {\n            const model = await getCommentModel();\n            /**\n             * We're fetching the existing entry here because we're not accepting \"app\" field as input,\n             * but, we still need to retain its value after the \"update\" operation.\n             */\n            const existingEntry = await getComment({ id: params.id });\n\n            const entry = await security.withoutAuthorization(async () => {\n                return cms.updateEntry(model, params.id, {\n                    ...existingEntry,\n                    ...params.data,\n                    savedOn: new Date()\n                });\n            });\n\n            const values = await getFieldValues({\n                entry,\n                fields: baseFields,\n                context: getCmsContext(),\n                transformers: [getTransformer(model, \"body\")]\n            });\n            return pickIdFromChangeRequest(values);\n        },\n        async deleteComment(params) {\n            const model = await getCommentModel();\n            await security.withoutAuthorization(async () => {\n                return cms.deleteEntry(model, params.id);\n            });\n            return true;\n        }\n    };\n};\n"],"mappings":";;;;;;;AAGA,IAAAA,cAAA,GAAAC,OAAA;AACA,IAAAC,qBAAA,GAAAD,OAAA;AAEA,IAAAE,MAAA,GAAAC,sBAAA,CAAAH,OAAA;AAGA,IAAAI,QAAA,GAAAJ,OAAA;AAEA,MAAMK,uBAAuB,GAAIC,GAAwB,IAAiB;EACtE,MAAMC,QAAQ,GAAGD,GAAG,CAAC,eAAe,CAAC;EACrC,IAAI,CAACC,QAAQ,EAAE;IACX,OAAOD,GAAG;EACd;EACAA,GAAG,CAAC,eAAe,CAAC,GAAGC,QAAQ,CAACC,EAAE;EAClC,OAAOF,GAAG;AACd,CAAC;AAEM,MAAMG,8BAA8B,GAAGA,CAAC;EAC3CC,GAAG;EACHC,aAAa;EACbC;AAC8B,CAAC,KAAkC;EACjE,MAAMC,eAAe,GAAG,MAAAA,CAAA,KAAY;IAChC,MAAMC,KAAK,GAAG,MAAMF,QAAQ,CAACG,oBAAoB,CAAC,YAAY;MAC1D,OAAOL,GAAG,CAACM,QAAQ,CAACC,yBAAgB,CAAC;IACzC,CAAC,CAAC;IAEF,IAAI,CAACH,KAAK,EAAE;MACR,MAAM,IAAII,cAAW,CAChB,mBAAkBD,yBAAiB,UAAS,EAC7C,uBACJ,CAAC;IACL;IACA,OAAOH,KAAK;EAChB,CAAC;EACD,MAAMK,UAAqD,GAAG,MAAAA,CAAO;IAAEX;EAAG,CAAC,KAAK;IAC5E,MAAMM,KAAK,GAAG,MAAMD,eAAe,CAAC,CAAC;IACrC,MAAMO,KAAK,GAAG,MAAMR,QAAQ,CAACG,oBAAoB,CAAC,YAAY;MAC1D,OAAOL,GAAG,CAACW,YAAY,CAACP,KAAK,EAAEN,EAAE,CAAC;IACtC,CAAC,CAAC;IAEF,OAAO,IAAAc,6BAAc,EAAC;MAClBF,KAAK;MACLG,MAAM,EAAEC,gCAAU;MAClBC,OAAO,EAAEd,aAAa,CAAC,CAAC;MACxBe,YAAY,EAAE,CAAC,IAAAC,6BAAc,EAACb,KAAK,EAAE,MAAM,CAAC;IAChD,CAAC,CAAC;EACN,CAAC;EACD,OAAO;IACHD,eAAe;IACfM,UAAU,EAAE,MAAMS,MAAM,IAAI;MACxB,MAAMC,MAAM,GAAG,MAAMV,UAAU,CAACS,MAAM,CAAC;MACvC,OAAOvB,uBAAuB,CAACwB,MAAM,CAAC;IAC1C,CAAC;IACD,MAAMC,YAAYA,CAACF,MAAM,EAAE;MACvB,MAAMd,KAAK,GAAG,MAAMD,eAAe,CAAC,CAAC;MACrC,MAAM,CAACkB,OAAO,EAAEC,IAAI,CAAC,GAAG,MAAMpB,QAAQ,CAACG,oBAAoB,CAAC,YAAY;QACpE,OAAOL,GAAG,CAACuB,iBAAiB,CAACnB,KAAK,EAAEc,MAA4B,CAAC;MACrE,CAAC,CAAC;MACF,MAAMC,MAAM,GAAG,MAAMK,OAAO,CAACC,GAAG,CAC5BJ,OAAO,CAACK,GAAG,CAAChB,KAAK,IACb,IAAAE,6BAAc,EAAa;QACvBF,KAAK;QACLG,MAAM,EAAEC,gCAAU;QAClBC,OAAO,EAAEd,aAAa,CAAC,CAAC;QACxBe,YAAY,EAAE,CAAC,IAAAC,6BAAc,EAACb,KAAK,EAAE,MAAM,CAAC;MAChD,CAAC,CACL,CACJ,CAAC;MACD,MAAMqB,GAAG,GAAGN,MAAM,CAACO,GAAG,CAACC,KAAK,IAAIhC,uBAAuB,CAACgC,KAAK,CAAC,CAAC;MAC/D,OAAO,CAACF,GAAG,EAAEH,IAAI,CAAC;IACtB,CAAC;IACD,MAAMM,aAAaA,CAA6BV,MAAM,EAAE;MACpD,MAAMd,KAAK,GAAG,MAAMD,eAAe,CAAC,CAAC;MACrC,MAAM0B,QAAQ,GAAG,MAAM,IAAI,CAACC,qBAAqB,CAAC,CAAC;MAEnD,MAAMpB,KAAK,GAAG,MAAMR,QAAQ,CAACG,oBAAoB,CAAC,YAAY;QAC1D,OAAOL,GAAG,CAAC+B,WAAW,CAAC3B,KAAK,EAAE;UAC1B,GAAGc,MAAM,CAACc,IAAI;UACdC,aAAa,EAAE;YACXnC,EAAE,EAAEoB,MAAM,CAACc,IAAI,CAACC,aAAa;YAC7BC,OAAO,EAAEL,QAAQ,CAACK;UACtB;QACJ,CAAC,CAAC;MACN,CAAC,CAAC;MAEF,MAAMf,MAAM,GAAG,MAAM,IAAAP,6BAAc,EAAC;QAChCF,KAAK;QACLG,MAAM,EAAEC,gCAAU;QAClBC,OAAO,EAAEd,aAAa,CAAC,CAAC;QACxBe,YAAY,EAAE,CAAC,IAAAC,6BAAc,EAACb,KAAK,EAAE,MAAM,CAAC;MAChD,CAAC,CAAC;MACF,OAAOT,uBAAuB,CAACwB,MAAM,CAAC;IAC1C,CAAC;IACD,MAAMgB,aAAaA,CAACjB,MAAM,EAAE;MACxB,MAAMd,KAAK,GAAG,MAAMD,eAAe,CAAC,CAAC;MACrC;AACZ;AACA;AACA;MACY,MAAMiC,aAAa,GAAG,MAAM3B,UAAU,CAAC;QAAEX,EAAE,EAAEoB,MAAM,CAACpB;MAAG,CAAC,CAAC;MAEzD,MAAMY,KAAK,GAAG,MAAMR,QAAQ,CAACG,oBAAoB,CAAC,YAAY;QAC1D,OAAOL,GAAG,CAACqC,WAAW,CAACjC,KAAK,EAAEc,MAAM,CAACpB,EAAE,EAAE;UACrC,GAAGsC,aAAa;UAChB,GAAGlB,MAAM,CAACc,IAAI;UACdM,OAAO,EAAE,IAAIC,IAAI,CAAC;QACtB,CAAC,CAAC;MACN,CAAC,CAAC;MAEF,MAAMpB,MAAM,GAAG,MAAM,IAAAP,6BAAc,EAAC;QAChCF,KAAK;QACLG,MAAM,EAAEC,gCAAU;QAClBC,OAAO,EAAEd,aAAa,CAAC,CAAC;QACxBe,YAAY,EAAE,CAAC,IAAAC,6BAAc,EAACb,KAAK,EAAE,MAAM,CAAC;MAChD,CAAC,CAAC;MACF,OAAOT,uBAAuB,CAACwB,MAAM,CAAC;IAC1C,CAAC;IACD,MAAMqB,aAAaA,CAACtB,MAAM,EAAE;MACxB,MAAMd,KAAK,GAAG,MAAMD,eAAe,CAAC,CAAC;MACrC,MAAMD,QAAQ,CAACG,oBAAoB,CAAC,YAAY;QAC5C,OAAOL,GAAG,CAACyC,WAAW,CAACrC,KAAK,EAAEc,MAAM,CAACpB,EAAE,CAAC;MAC5C,CAAC,CAAC;MACF,OAAO,IAAI;IACf;EACJ,CAAC;AACL,CAAC;AAAC4C,OAAA,CAAA3C,8BAAA,GAAAA,8BAAA"}

package/storageOperations/contentReviewStorageOperations.d.ts

@@ -1,3 +1,3 @@
 import { ApwContentReviewStorageOperations } from "./types";
-import { CreateApwStorageOperationsParams } from "./index";
+import { CreateApwStorageOperationsParams } from ".";
 export declare const createContentReviewStorageOperations: ({ cms, security }: CreateApwStorageOperationsParams) => ApwContentReviewStorageOperations;

package/storageOperations/contentReviewStorageOperations.js

@@ -5,8 +5,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createContentReviewStorageOperations = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _index = require("./index");
+var _pickEntryFieldValues = require("../utils/pickEntryFieldValues");
 var _error = _interopRequireDefault(require("@webiny/error"));
 var _contentReview = require("./models/contentReview.model");
 const createContentReviewStorageOperations = ({
@@ -14,9 +13,9 @@ const createContentReviewStorageOperations = ({
   security
 }) => {
   const getContentReviewModel = async () => {
-    security.disableAuthorization();
-    const model = await cms.getModel(_contentReview.CONTENT_REVIEW_MODEL_ID);
-    security.enableAuthorization();
+    const model = await security.withoutAuthorization(async () => {
+      return cms.getModel(_contentReview.CONTENT_REVIEW_MODEL_ID);
+    });
     if (!model) {
       throw new _error.default(`Could not find "${_contentReview.CONTENT_REVIEW_MODEL_ID}" model.`, "MODEL_NOT_FOUND_ERROR");
     }
@@ -26,29 +25,32 @@ const createContentReviewStorageOperations = ({
     id
   }) => {
     const model = await getContentReviewModel();
-    security.disableAuthorization();
-    const entry = await cms.getEntryById(model, id);
-    security.enableAuthorization();
-    return (0, _index.getFieldValues)(entry, _index.baseFields);
+    const entry = await security.withoutAuthorization(async () => {
+      return cms.getEntryById(model, id);
+    });
+    return (0, _pickEntryFieldValues.pickEntryFieldValues)(entry);
   };
   return {
     getContentReviewModel,
     getContentReview,
     async listContentReviews(params) {
       const model = await getContentReviewModel();
-      security.disableAuthorization();
-      const [entries, meta] = await cms.listLatestEntries(model, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
-        where: (0, _objectSpread2.default)({}, params.where)
-      }));
-      security.enableAuthorization();
-      return [entries.map(entry => (0, _index.getFieldValues)(entry, _index.baseFields)), meta];
+      const [entries, meta] = await security.withoutAuthorization(async () => {
+        return cms.listLatestEntries(model, {
+          ...params,
+          where: {
+            ...params.where
+          }
+        });
+      });
+      return [entries.map(_pickEntryFieldValues.pickEntryFieldValues), meta];
     },
     async createContentReview(params) {
       const model = await getContentReviewModel();
-      security.disableAuthorization();
-      const entry = await cms.createEntry(model, params.data);
-      security.enableAuthorization();
-      return (0, _index.getFieldValues)(entry, _index.baseFields);
+      const entry = await security.withoutAuthorization(async () => {
+        return cms.createEntry(model, params.data);
+      });
+      return (0, _pickEntryFieldValues.pickEntryFieldValues)(entry);
     },
     async updateContentReview(params) {
       const model = await getContentReviewModel();
@@ -59,18 +61,24 @@ const createContentReviewStorageOperations = ({
       const existingEntry = await getContentReview({
         id: params.id
       });
-      security.disableAuthorization();
-      const entry = await cms.updateEntry(model, params.id, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, existingEntry), params.data));
-      security.enableAuthorization();
-      return (0, _index.getFieldValues)(entry, _index.baseFields);
+      const entry = await security.withoutAuthorization(async () => {
+        return cms.updateEntry(model, params.id, {
+          ...existingEntry,
+          ...params.data,
+          savedOn: new Date()
+        });
+      });
+      return (0, _pickEntryFieldValues.pickEntryFieldValues)(entry);
     },
     async deleteContentReview(params) {
       const model = await getContentReviewModel();
-      security.disableAuthorization();
-      await cms.deleteEntry(model, params.id);
-      security.enableAuthorization();
+      await security.withoutAuthorization(async () => {
+        return cms.deleteEntry(model, params.id);
+      });
       return true;
     }
   };
 };
-exports.createContentReviewStorageOperations = createContentReviewStorageOperations;
+exports.createContentReviewStorageOperations = createContentReviewStorageOperations;
+
+//# sourceMappingURL=contentReviewStorageOperations.js.map

package/storageOperations/contentReviewStorageOperations.js.map

@@ -1 +1 @@
-{"version":3,"names":["createContentReviewStorageOperations","cms","security","getContentReviewModel","disableAuthorization","model","getModel","CONTENT_REVIEW_MODEL_ID","enableAuthorization","WebinyError","getContentReview","id","entry","getEntryById","getFieldValues","baseFields","listContentReviews","params","entries","meta","listLatestEntries","where","map","createContentReview","createEntry","data","updateContentReview","existingEntry","updateEntry","deleteContentReview","deleteEntry"],"sources":["contentReviewStorageOperations.ts"],"sourcesContent":["import { ApwContentReviewStorageOperations } from \"./types\";\nimport {\n    baseFields,\n    CreateApwStorageOperationsParams,\n    getFieldValues\n} from \"~/storageOperations/index\";\nimport WebinyError from \"@webiny/error\";\nimport { CONTENT_REVIEW_MODEL_ID } from \"~/storageOperations/models/contentReview.model\";\n\nexport const createContentReviewStorageOperations = ({\n    cms,\n    security\n}: CreateApwStorageOperationsParams): ApwContentReviewStorageOperations => {\n    const getContentReviewModel = async () => {\n        security.disableAuthorization();\n        const model = await cms.getModel(CONTENT_REVIEW_MODEL_ID);\n        security.enableAuthorization();\n        if (!model) {\n            throw new WebinyError(\n                `Could not find \"${CONTENT_REVIEW_MODEL_ID}\" model.`,\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n    const getContentReview: ApwContentReviewStorageOperations[\"getContentReview\"] = async ({\n        id\n    }) => {\n        const model = await getContentReviewModel();\n        security.disableAuthorization();\n        const entry = await cms.getEntryById(model, id);\n        security.enableAuthorization();\n        return getFieldValues(entry, baseFields);\n    };\n    return {\n        getContentReviewModel,\n        getContentReview,\n        async listContentReviews(params) {\n            const model = await getContentReviewModel();\n            security.disableAuthorization();\n            const [entries, meta] = await cms.listLatestEntries(model, {\n                ...params,\n                where: {\n                    ...params.where\n                }\n            });\n            security.enableAuthorization();\n            return [entries.map(entry => getFieldValues(entry, baseFields)), meta];\n        },\n        async createContentReview(params) {\n            const model = await getContentReviewModel();\n            security.disableAuthorization();\n            const entry = await cms.createEntry(model, params.data);\n            security.enableAuthorization();\n            return getFieldValues(entry, baseFields);\n        },\n        async updateContentReview(params) {\n            const model = await getContentReviewModel();\n            /**\n             * We're fetching the existing entry here because we're not accepting \"app\" field as input,\n             * but, we still need to retain its value after the \"update\" operation.\n             */\n            const existingEntry = await getContentReview({ id: params.id });\n\n            security.disableAuthorization();\n            const entry = await cms.updateEntry(model, params.id, {\n                ...existingEntry,\n                ...params.data\n            });\n            security.enableAuthorization();\n            return getFieldValues(entry, baseFields);\n        },\n        async deleteContentReview(params) {\n            const model = await getContentReviewModel();\n            security.disableAuthorization();\n            await cms.deleteEntry(model, params.id);\n            security.enableAuthorization();\n            return true;\n        }\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["_pickEntryFieldValues","require","_error","_interopRequireDefault","_contentReview","createContentReviewStorageOperations","cms","security","getContentReviewModel","model","withoutAuthorization","getModel","CONTENT_REVIEW_MODEL_ID","WebinyError","getContentReview","id","entry","getEntryById","pickEntryFieldValues","listContentReviews","params","entries","meta","listLatestEntries","where","map","createContentReview","createEntry","data","updateContentReview","existingEntry","updateEntry","savedOn","Date","deleteContentReview","deleteEntry","exports"],"sources":["contentReviewStorageOperations.ts"],"sourcesContent":["import { ApwContentReviewStorageOperations } from \"./types\";\nimport { CreateApwStorageOperationsParams } from \"~/storageOperations\";\nimport { pickEntryFieldValues } from \"~/utils/pickEntryFieldValues\";\nimport WebinyError from \"@webiny/error\";\nimport { CONTENT_REVIEW_MODEL_ID } from \"~/storageOperations/models/contentReview.model\";\nimport { ApwContentReview } from \"~/types\";\n\nexport const createContentReviewStorageOperations = ({\n    cms,\n    security\n}: CreateApwStorageOperationsParams): ApwContentReviewStorageOperations => {\n    const getContentReviewModel = async () => {\n        const model = await security.withoutAuthorization(async () => {\n            return cms.getModel(CONTENT_REVIEW_MODEL_ID);\n        });\n        if (!model) {\n            throw new WebinyError(\n                `Could not find \"${CONTENT_REVIEW_MODEL_ID}\" model.`,\n                \"MODEL_NOT_FOUND_ERROR\"\n            );\n        }\n        return model;\n    };\n    const getContentReview: ApwContentReviewStorageOperations[\"getContentReview\"] = async ({\n        id\n    }) => {\n        const model = await getContentReviewModel();\n        const entry = await security.withoutAuthorization(async () => {\n            return cms.getEntryById(model, id);\n        });\n        return pickEntryFieldValues(entry);\n    };\n    return {\n        getContentReviewModel,\n        getContentReview,\n        async listContentReviews(params) {\n            const model = await getContentReviewModel();\n\n            const [entries, meta] = await security.withoutAuthorization(async () => {\n                return cms.listLatestEntries(model, {\n                    ...params,\n                    where: {\n                        ...params.where\n                    }\n                });\n            });\n\n            return [entries.map(pickEntryFieldValues<ApwContentReview>), meta];\n        },\n        async createContentReview(params) {\n            const model = await getContentReviewModel();\n\n            const entry = await security.withoutAuthorization(async () => {\n                return cms.createEntry(model, params.data);\n            });\n            return pickEntryFieldValues(entry);\n        },\n        async updateContentReview(params) {\n            const model = await getContentReviewModel();\n            /**\n             * We're fetching the existing entry here because we're not accepting \"app\" field as input,\n             * but, we still need to retain its value after the \"update\" operation.\n             */\n            const existingEntry = await getContentReview({ id: params.id });\n\n            const entry = await security.withoutAuthorization(async () => {\n                return cms.updateEntry(model, params.id, {\n                    ...existingEntry,\n                    ...params.data,\n                    savedOn: new Date()\n                });\n            });\n            return pickEntryFieldValues(entry);\n        },\n        async deleteContentReview(params) {\n            const model = await getContentReviewModel();\n\n            await security.withoutAuthorization(async () => {\n                return cms.deleteEntry(model, params.id);\n            });\n\n            return true;\n        }\n    };\n};\n"],"mappings":"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"}

package/storageOperations/index.d.ts

@@ -1,4 +1,4 @@
-import { CmsContext, CmsEntry, HeadlessCms } from "@webiny/api-headless-cms/types";
+import { CmsContext, HeadlessCms } from "@webiny/api-headless-cms/types";
 import { ApwStorageOperations } from "../types";
 import { Security } from "@webiny/api-security/types";
 export interface CreateApwStorageOperationsParams {
@@ -6,10 +6,4 @@ export interface CreateApwStorageOperationsParams {
     security: Security;
     getCmsContext: () => CmsContext;
 }
-/**
- * Using any because value can be a lot of types.
- * TODO @ts-refactor figure out correct types.
- */
-export declare function getFieldValues(entry: CmsEntry, fields: string[]): any;
-export declare const baseFields: string[];
 export declare const createStorageOperations: (params: CreateApwStorageOperationsParams) => ApwStorageOperations;

package/storageOperations/index.js

@@ -1,34 +1,29 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.createStorageOperations = exports.baseFields = void 0;
-exports.getFieldValues = getFieldValues;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _pick = _interopRequireDefault(require("lodash/pick"));
+exports.createStorageOperations = void 0;
 var _reviewerStorageOperations = require("./reviewerStorageOperations");
 var _workflowStorageOperations = require("./workflowStorageOperations");
 var _contentReviewStorageOperations = require("./contentReviewStorageOperations");
 var _changeRequestStorageOperations = require("./changeRequestStorageOperations");
 var _commentStorageOperations = require("./commentStorageOperations");
 var _models = require("./models");
-/**
- * Using any because value can be a lot of types.
- * TODO @ts-refactor figure out correct types.
- */
-function getFieldValues(entry, fields) {
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _pick.default)(entry, fields)), entry.values);
-}
-const baseFields = ["id", "entryId", "createdBy", "createdOn", "savedOn"];
-exports.baseFields = baseFields;
 const createStorageOperations = params => {
   const context = params.getCmsContext();
   /**
    * Register Apw models.
    */
   (0, _models.createApwModels)(context);
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _reviewerStorageOperations.createReviewerStorageOperations)(params)), (0, _workflowStorageOperations.createWorkflowStorageOperations)(params)), (0, _contentReviewStorageOperations.createContentReviewStorageOperations)(params)), (0, _changeRequestStorageOperations.createChangeRequestStorageOperations)(params)), (0, _commentStorageOperations.createCommentStorageOperations)(params));
+  return {
+    ...(0, _reviewerStorageOperations.createReviewerStorageOperations)(params),
+    ...(0, _workflowStorageOperations.createWorkflowStorageOperations)(params),
+    ...(0, _contentReviewStorageOperations.createContentReviewStorageOperations)(params),
+    ...(0, _changeRequestStorageOperations.createChangeRequestStorageOperations)(params),
+    ...(0, _commentStorageOperations.createCommentStorageOperations)(params)
+  };
 };
-exports.createStorageOperations = createStorageOperations;
+exports.createStorageOperations = createStorageOperations;
+
+//# sourceMappingURL=index.js.map

package/storageOperations/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["getFieldValues","entry","fields","pick","values","baseFields","createStorageOperations","params","context","getCmsContext","createApwModels","createReviewerStorageOperations","createWorkflowStorageOperations","createContentReviewStorageOperations","createChangeRequestStorageOperations","createCommentStorageOperations"],"sources":["index.ts"],"sourcesContent":["import pick from \"lodash/pick\";\nimport { CmsContext, CmsEntry, HeadlessCms } from \"@webiny/api-headless-cms/types\";\nimport { ApwStorageOperations } from \"~/types\";\nimport { createReviewerStorageOperations } from \"./reviewerStorageOperations\";\nimport { createWorkflowStorageOperations } from \"./workflowStorageOperations\";\nimport { createContentReviewStorageOperations } from \"./contentReviewStorageOperations\";\nimport { createChangeRequestStorageOperations } from \"./changeRequestStorageOperations\";\nimport { createCommentStorageOperations } from \"~/storageOperations/commentStorageOperations\";\nimport { createApwModels } from \"./models\";\nimport { Security } from \"@webiny/api-security/types\";\n\nexport interface CreateApwStorageOperationsParams {\n    cms: HeadlessCms;\n    security: Security;\n    getCmsContext: () => CmsContext;\n}\n\n/**\n * Using any because value can be a lot of types.\n * TODO @ts-refactor figure out correct types.\n */\nexport function getFieldValues(entry: CmsEntry, fields: string[]): any {\n    return { ...pick(entry, fields), ...entry.values };\n}\n\nexport const baseFields = [\"id\", \"entryId\", \"createdBy\", \"createdOn\", \"savedOn\"];\n\nexport const createStorageOperations = (\n    params: CreateApwStorageOperationsParams\n): ApwStorageOperations => {\n    const context = params.getCmsContext();\n    /**\n     * Register Apw models.\n     */\n    createApwModels(context);\n\n    return {\n        ...createReviewerStorageOperations(params),\n        ...createWorkflowStorageOperations(params),\n        ...createContentReviewStorageOperations(params),\n        ...createChangeRequestStorageOperations(params),\n        ...createCommentStorageOperations(params)\n    };\n};\n"],"mappings":";;;;;;;;;AAAA;AAGA;AACA;AACA;AACA;AACA;AACA;AASA;AACA;AACA;AACA;AACO,SAASA,cAAc,CAACC,KAAe,EAAEC,MAAgB,EAAO;EACnE,mEAAY,IAAAC,aAAI,EAACF,KAAK,EAAEC,MAAM,CAAC,GAAKD,KAAK,CAACG,MAAM;AACpD;AAEO,MAAMC,UAAU,GAAG,CAAC,IAAI,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,CAAC;AAAC;AAE1E,MAAMC,uBAAuB,GAChCC,MAAwC,IACjB;EACvB,MAAMC,OAAO,GAAGD,MAAM,CAACE,aAAa,EAAE;EACtC;AACJ;AACA;EACI,IAAAC,uBAAe,EAACF,OAAO,CAAC;EAExB,uJACO,IAAAG,0DAA+B,EAACJ,MAAM,CAAC,GACvC,IAAAK,0DAA+B,EAACL,MAAM,CAAC,GACvC,IAAAM,oEAAoC,EAACN,MAAM,CAAC,GAC5C,IAAAO,oEAAoC,EAACP,MAAM,CAAC,GAC5C,IAAAQ,wDAA8B,EAACR,MAAM,CAAC;AAEjD,CAAC;AAAC"}
+{"version":3,"names":["_reviewerStorageOperations","require","_workflowStorageOperations","_contentReviewStorageOperations","_changeRequestStorageOperations","_commentStorageOperations","_models","createStorageOperations","params","context","getCmsContext","createApwModels","createReviewerStorageOperations","createWorkflowStorageOperations","createContentReviewStorageOperations","createChangeRequestStorageOperations","createCommentStorageOperations","exports"],"sources":["index.ts"],"sourcesContent":["import { CmsContext, HeadlessCms } from \"@webiny/api-headless-cms/types\";\nimport { ApwStorageOperations } from \"~/types\";\nimport { createReviewerStorageOperations } from \"./reviewerStorageOperations\";\nimport { createWorkflowStorageOperations } from \"./workflowStorageOperations\";\nimport { createContentReviewStorageOperations } from \"./contentReviewStorageOperations\";\nimport { createChangeRequestStorageOperations } from \"./changeRequestStorageOperations\";\nimport { createCommentStorageOperations } from \"~/storageOperations/commentStorageOperations\";\nimport { createApwModels } from \"./models\";\nimport { Security } from \"@webiny/api-security/types\";\n\nexport interface CreateApwStorageOperationsParams {\n    cms: HeadlessCms;\n    security: Security;\n    getCmsContext: () => CmsContext;\n}\n\nexport const createStorageOperations = (\n    params: CreateApwStorageOperationsParams\n): ApwStorageOperations => {\n    const context = params.getCmsContext();\n    /**\n     * Register Apw models.\n     */\n    createApwModels(context);\n\n    return {\n        ...createReviewerStorageOperations(params),\n        ...createWorkflowStorageOperations(params),\n        ...createContentReviewStorageOperations(params),\n        ...createChangeRequestStorageOperations(params),\n        ...createCommentStorageOperations(params)\n    };\n};\n"],"mappings":";;;;;;AAEA,IAAAA,0BAAA,GAAAC,OAAA;AACA,IAAAC,0BAAA,GAAAD,OAAA;AACA,IAAAE,+BAAA,GAAAF,OAAA;AACA,IAAAG,+BAAA,GAAAH,OAAA;AACA,IAAAI,yBAAA,GAAAJ,OAAA;AACA,IAAAK,OAAA,GAAAL,OAAA;AASO,MAAMM,uBAAuB,GAChCC,MAAwC,IACjB;EACvB,MAAMC,OAAO,GAAGD,MAAM,CAACE,aAAa,CAAC,CAAC;EACtC;AACJ;AACA;EACI,IAAAC,uBAAe,EAACF,OAAO,CAAC;EAExB,OAAO;IACH,GAAG,IAAAG,0DAA+B,EAACJ,MAAM,CAAC;IAC1C,GAAG,IAAAK,0DAA+B,EAACL,MAAM,CAAC;IAC1C,GAAG,IAAAM,oEAAoC,EAACN,MAAM,CAAC;IAC/C,GAAG,IAAAO,oEAAoC,EAACP,MAAM,CAAC;IAC/C,GAAG,IAAAQ,wDAA8B,EAACR,MAAM;EAC5C,CAAC;AACL,CAAC;AAACS,OAAA,CAAAV,uBAAA,GAAAA,uBAAA"}

package/storageOperations/models/changeRequest.model.d.ts

@@ -1,3 +1,2 @@
-import { WorkflowModelDefinition } from "../../types";
 export declare const CHANGE_REQUEST_MODEL_ID = "apwChangeRequestModelDefinition";
-export declare const createChangeRequestModelDefinition: () => WorkflowModelDefinition;
+export declare const createChangeRequestModelDefinition: () => import("@webiny/api-headless-cms").CmsPrivateModelFull;