@webiny/api-apw 0.0.0-unstable.aad28a72ae → 0.0.0-unstable.ad3a7a4920

package/scheduler/handlers/utils.js.map

@@ -1 +1 @@
-{"version":3,"names":["dayjs","extend","utc","TIME_SEPARATOR","ELAPSED_CRON_EXPRESSION","getIsoStringTillMinutes","datetime","isNaN","Date","parse","slice","lastIndexOf","dateTimeToCronExpression","dayOfWeek","format","moveDateTimeToNextCentury","add","toISOString","moveDateTimeToCurrentCentury","subtract","isDateTimeInNextCentury","isAfter","shouldRestoreDatetime","invocationType","selfInvoked","InvocationTypes","SCHEDULED","today","isExecutionPending","encodeToken","id","tenant","locale","TOKEN_PREFIX","decodeToken","token","auth","length","split","documentClient","DocumentClient","convertEmptyValues","region","process","env","AWS_REGION","basePlugins","dynamoDbPlugins","logsPlugins","dbPlugins","table","DB_TABLE","driver","DynamoDbDriver","getApwSettings","variant","STAGED_ROLLOUTS_VARIANT","params","TableName","Key","PK","SK","Item","get","promise","mainGraphqlFunctionArn","cmsGraphqlFunctionArn","eventRuleName","eventTargetId"],"sources":["utils.ts"],"sourcesContent":["import dayjs from \"dayjs\";\nimport utc from \"dayjs/plugin/utc\";\nimport { DocumentClient } from \"aws-sdk/clients/dynamodb\";\nimport dbPlugins from \"@webiny/handler-db\";\nimport { DynamoDbDriver } from \"@webiny/db-dynamodb\";\nimport dynamoDbPlugins from \"@webiny/db-dynamodb/plugins\";\nimport logsPlugins from \"@webiny/handler-logs\";\nimport { InvocationTypes } from \"~/scheduler/types\";\n\n/**\n * https://day.js.org/docs/en/plugin/utc\n */\ndayjs.extend(utc);\n\nconst TIME_SEPARATOR = \":\";\nconst ELAPSED_CRON_EXPRESSION = \"* * * * ? 2000\";\n\nexport const getIsoStringTillMinutes = (datetime: string): string => {\n    /**\n     * Validate datetime.\n     */\n    if (isNaN(Date.parse(datetime))) {\n        return datetime;\n    }\n    // input = \"2022-03-08T05:41:13.230Z\"\n    // output = \"2022-03-08T05:41\"\n    return datetime.slice(0, datetime.lastIndexOf(TIME_SEPARATOR));\n};\n\nexport const dateTimeToCronExpression = (datetime: string): string => {\n    if (!datetime) {\n        return ELAPSED_CRON_EXPRESSION;\n    }\n    /**\n     * You can't specify the Day-of-month and Day-of-week fields in the same cron expression.\n     * If you specify a value (or a *) in one of the fields, you must use a ? (question mark) in the other.\n     *\n     *  https://docs.aws.amazon.com/AmazonCloudWatch/latest/events/ScheduledEvents.html\n     */\n    const dayOfWeek = \"?\";\n\n    return dayjs.utc(datetime).format(`mm H D M [${dayOfWeek}] YYYY`);\n};\n\nexport const moveDateTimeToNextCentury = (datetime: string): string => {\n    return dayjs.utc(datetime).add(100, \"year\").toISOString();\n};\n\nexport const moveDateTimeToCurrentCentury = (datetime: string): string => {\n    return dayjs.utc(datetime).subtract(100, \"year\").toISOString();\n};\n\nexport const isDateTimeInNextCentury = (datetime: string): boolean => {\n    return dayjs.utc(datetime).isAfter(\"2100-01-01\", \"year\");\n};\n\ninterface ShouldRestoreDatetimeParams {\n    invocationType?: InvocationTypes;\n    datetime: string;\n}\n\nexport const shouldRestoreDatetime = ({\n    invocationType,\n    datetime\n}: ShouldRestoreDatetimeParams): boolean => {\n    /**\n     * \"invocationType\" will not be SCHEDULED when the lambda is called from Main GQL handler.\n     *\n     * Which means a new content is scheduled for \"publish\"/\"unpublish\" therefore, we need to restore the previously\n     * scheduled action if it has not been executed already.\n     */\n    const selfInvoked = invocationType === InvocationTypes.SCHEDULED;\n\n    const today = dayjs.utc();\n    const isExecutionPending = dayjs.utc(datetime).isAfter(today);\n\n    return !selfInvoked && isExecutionPending;\n};\n\ninterface EncodeTokenParams {\n    id: string;\n    tenant: string;\n    locale: string;\n}\n\nexport const encodeToken = ({ id, tenant, locale }: EncodeTokenParams) => {\n    return `${TOKEN_PREFIX}${id}__${tenant}__${locale}`;\n};\n\nexport const TOKEN_PREFIX = \"apw-\";\n\nexport const decodeToken = (token: string): Partial<EncodeTokenParams> => {\n    const auth = token.slice(TOKEN_PREFIX.length);\n    const [id, tenant, locale] = auth.split(\"__\");\n\n    return {\n        id,\n        tenant,\n        locale\n    };\n};\n\nexport const documentClient = new DocumentClient({\n    convertEmptyValues: true,\n    region: process.env.AWS_REGION\n});\n\nexport const basePlugins = () => [\n    dynamoDbPlugins(),\n    logsPlugins(),\n    dbPlugins({\n        table: process.env.DB_TABLE,\n        driver: new DynamoDbDriver({\n            documentClient\n        })\n    })\n];\n\n/**\n * Get APW settings record from DDB.\n */\nexport interface ApwSettings {\n    mainGraphqlFunctionArn: string;\n    cmsGraphqlFunctionArn: string;\n    eventRuleName: string;\n    eventTargetId: string;\n}\n\nexport const getApwSettings = async (): Promise<ApwSettings> => {\n    const variant = process.env.STAGED_ROLLOUTS_VARIANT;\n\n    const params = {\n        TableName: process.env.DB_TABLE as string,\n        Key: {\n            PK: `APW#SETTINGS`,\n            SK: variant || \"default\"\n        }\n    };\n\n    const { Item } = await documentClient.get(params).promise();\n\n    return {\n        mainGraphqlFunctionArn: Item ? Item[\"mainGraphqlFunctionArn\"] : \"mainGraphqlFunctionArn\",\n        cmsGraphqlFunctionArn: Item ? Item[\"cmsGraphqlFunctionArn\"] : \"cmsGraphqlFunctionArn\",\n        eventRuleName: Item ? Item[\"eventRuleName\"] : \"eventRuleName\",\n        eventTargetId: Item ? Item[\"eventTargetId\"] : \"eventTargetId\"\n    };\n};\n"],"mappings":"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"}
+{"version":3,"names":["dayjs","extend","utc","TIME_SEPARATOR","ELAPSED_CRON_EXPRESSION","getIsoStringTillMinutes","datetime","isNaN","Date","parse","slice","lastIndexOf","dateTimeToCronExpression","dayOfWeek","format","moveDateTimeToNextCentury","add","toISOString","moveDateTimeToCurrentCentury","subtract","isDateTimeInNextCentury","isAfter","shouldRestoreDatetime","invocationType","selfInvoked","InvocationTypes","SCHEDULED","today","isExecutionPending","encodeToken","id","tenant","locale","TOKEN_PREFIX","decodeToken","token","auth","length","split","documentClient","DocumentClient","convertEmptyValues","region","process","env","AWS_REGION","basePlugins","dynamoDbPlugins","logsPlugins","dbPlugins","table","DB_TABLE","driver","DynamoDbDriver","getApwSettings","variant","STAGED_ROLLOUTS_VARIANT","params","TableName","Key","PK","SK","Item","get","promise","mainGraphqlFunctionArn","eventRuleName","eventTargetId"],"sources":["utils.ts"],"sourcesContent":["import dayjs from \"dayjs\";\nimport utc from \"dayjs/plugin/utc\";\nimport { DocumentClient } from \"aws-sdk/clients/dynamodb\";\nimport dbPlugins from \"@webiny/handler-db\";\nimport { DynamoDbDriver } from \"@webiny/db-dynamodb\";\nimport dynamoDbPlugins from \"@webiny/db-dynamodb/plugins\";\nimport logsPlugins from \"@webiny/handler-logs\";\nimport { InvocationTypes } from \"~/scheduler/types\";\n\n/**\n * https://day.js.org/docs/en/plugin/utc\n */\ndayjs.extend(utc);\n\nconst TIME_SEPARATOR = \":\";\nconst ELAPSED_CRON_EXPRESSION = \"* * * * ? 2000\";\n\nexport const getIsoStringTillMinutes = (datetime: string): string => {\n    /**\n     * Validate datetime.\n     */\n    if (isNaN(Date.parse(datetime))) {\n        return datetime;\n    }\n    // input = \"2022-03-08T05:41:13.230Z\"\n    // output = \"2022-03-08T05:41\"\n    return datetime.slice(0, datetime.lastIndexOf(TIME_SEPARATOR));\n};\n\nexport const dateTimeToCronExpression = (datetime: string): string => {\n    if (!datetime) {\n        return ELAPSED_CRON_EXPRESSION;\n    }\n    /**\n     * You can't specify the Day-of-month and Day-of-week fields in the same cron expression.\n     * If you specify a value (or a *) in one of the fields, you must use a ? (question mark) in the other.\n     *\n     *  https://docs.aws.amazon.com/AmazonCloudWatch/latest/events/ScheduledEvents.html\n     */\n    const dayOfWeek = \"?\";\n\n    return dayjs.utc(datetime).format(`mm H D M [${dayOfWeek}] YYYY`);\n};\n\nexport const moveDateTimeToNextCentury = (datetime: string): string => {\n    return dayjs.utc(datetime).add(100, \"year\").toISOString();\n};\n\nexport const moveDateTimeToCurrentCentury = (datetime: string): string => {\n    return dayjs.utc(datetime).subtract(100, \"year\").toISOString();\n};\n\nexport const isDateTimeInNextCentury = (datetime: string): boolean => {\n    return dayjs.utc(datetime).isAfter(\"2100-01-01\", \"year\");\n};\n\ninterface ShouldRestoreDatetimeParams {\n    invocationType?: InvocationTypes;\n    datetime: string;\n}\n\nexport const shouldRestoreDatetime = ({\n    invocationType,\n    datetime\n}: ShouldRestoreDatetimeParams): boolean => {\n    /**\n     * \"invocationType\" will not be SCHEDULED when the lambda is called from Main GQL handler.\n     *\n     * Which means a new content is scheduled for \"publish\"/\"unpublish\" therefore, we need to restore the previously\n     * scheduled action if it has not been executed already.\n     */\n    const selfInvoked = invocationType === InvocationTypes.SCHEDULED;\n\n    const today = dayjs.utc();\n    const isExecutionPending = dayjs.utc(datetime).isAfter(today);\n\n    return !selfInvoked && isExecutionPending;\n};\n\ninterface EncodeTokenParams {\n    id: string;\n    tenant: string;\n    locale: string;\n}\n\nexport const encodeToken = ({ id, tenant, locale }: EncodeTokenParams) => {\n    return `${TOKEN_PREFIX}${id}__${tenant}__${locale}`;\n};\n\nexport const TOKEN_PREFIX = \"apw-\";\n\nexport const decodeToken = (token: string): Partial<EncodeTokenParams> => {\n    const auth = token.slice(TOKEN_PREFIX.length);\n    const [id, tenant, locale] = auth.split(\"__\");\n\n    return {\n        id,\n        tenant,\n        locale\n    };\n};\n\nexport const documentClient = new DocumentClient({\n    convertEmptyValues: true,\n    region: process.env.AWS_REGION\n});\n\nexport const basePlugins = () => [\n    dynamoDbPlugins(),\n    logsPlugins(),\n    dbPlugins({\n        table: process.env.DB_TABLE,\n        driver: new DynamoDbDriver({\n            documentClient\n        })\n    })\n];\n\n/**\n * Get APW settings record from DDB.\n */\nexport interface ApwSettings {\n    mainGraphqlFunctionArn: string;\n    eventRuleName: string;\n    eventTargetId: string;\n}\n\nexport const getApwSettings = async (): Promise<ApwSettings> => {\n    const variant = process.env.STAGED_ROLLOUTS_VARIANT;\n\n    const params = {\n        TableName: process.env.DB_TABLE as string,\n        Key: {\n            PK: `APW#SETTINGS`,\n            SK: variant || \"default\"\n        }\n    };\n\n    const { Item } = await documentClient.get(params).promise();\n\n    return {\n        mainGraphqlFunctionArn: Item ? Item[\"mainGraphqlFunctionArn\"] : \"mainGraphqlFunctionArn\",\n        eventRuleName: Item ? Item[\"eventRuleName\"] : \"eventRuleName\",\n        eventTargetId: Item ? Item[\"eventTargetId\"] : \"eventTargetId\"\n    };\n};\n"],"mappings":";;;;;;;AAAA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AAEA;AACA;AACA;AACAA,cAAK,CAACC,MAAM,CAACC,YAAG,CAAC;AAEjB,MAAMC,cAAc,GAAG,GAAG;AAC1B,MAAMC,uBAAuB,GAAG,gBAAgB;AAEzC,MAAMC,uBAAuB,GAAIC,QAAgB,IAAa;EACjE;AACJ;AACA;EACI,IAAIC,KAAK,CAACC,IAAI,CAACC,KAAK,CAACH,QAAQ,CAAC,CAAC,EAAE;IAC7B,OAAOA,QAAQ;EACnB;EACA;EACA;EACA,OAAOA,QAAQ,CAACI,KAAK,CAAC,CAAC,EAAEJ,QAAQ,CAACK,WAAW,CAACR,cAAc,CAAC,CAAC;AAClE,CAAC;AAAC;AAEK,MAAMS,wBAAwB,GAAIN,QAAgB,IAAa;EAClE,IAAI,CAACA,QAAQ,EAAE;IACX,OAAOF,uBAAuB;EAClC;EACA;AACJ;AACA;AACA;AACA;AACA;EACI,MAAMS,SAAS,GAAG,GAAG;EAErB,OAAOb,cAAK,CAACE,GAAG,CAACI,QAAQ,CAAC,CAACQ,MAAM,CAAE,aAAYD,SAAU,QAAO,CAAC;AACrE,CAAC;AAAC;AAEK,MAAME,yBAAyB,GAAIT,QAAgB,IAAa;EACnE,OAAON,cAAK,CAACE,GAAG,CAACI,QAAQ,CAAC,CAACU,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAACC,WAAW,EAAE;AAC7D,CAAC;AAAC;AAEK,MAAMC,4BAA4B,GAAIZ,QAAgB,IAAa;EACtE,OAAON,cAAK,CAACE,GAAG,CAACI,QAAQ,CAAC,CAACa,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAACF,WAAW,EAAE;AAClE,CAAC;AAAC;AAEK,MAAMG,uBAAuB,GAAId,QAAgB,IAAc;EAClE,OAAON,cAAK,CAACE,GAAG,CAACI,QAAQ,CAAC,CAACe,OAAO,CAAC,YAAY,EAAE,MAAM,CAAC;AAC5D,CAAC;AAAC;AAOK,MAAMC,qBAAqB,GAAG,CAAC;EAClCC,cAAc;EACdjB;AACyB,CAAC,KAAc;EACxC;AACJ;AACA;AACA;AACA;AACA;EACI,MAAMkB,WAAW,GAAGD,cAAc,KAAKE,sBAAe,CAACC,SAAS;EAEhE,MAAMC,KAAK,GAAG3B,cAAK,CAACE,GAAG,EAAE;EACzB,MAAM0B,kBAAkB,GAAG5B,cAAK,CAACE,GAAG,CAACI,QAAQ,CAAC,CAACe,OAAO,CAACM,KAAK,CAAC;EAE7D,OAAO,CAACH,WAAW,IAAII,kBAAkB;AAC7C,CAAC;AAAC;AAQK,MAAMC,WAAW,GAAG,CAAC;EAAEC,EAAE;EAAEC,MAAM;EAAEC;AAA0B,CAAC,KAAK;EACtE,OAAQ,GAAEC,YAAa,GAAEH,EAAG,KAAIC,MAAO,KAAIC,MAAO,EAAC;AACvD,CAAC;AAAC;AAEK,MAAMC,YAAY,GAAG,MAAM;AAAC;AAE5B,MAAMC,WAAW,GAAIC,KAAa,IAAiC;EACtE,MAAMC,IAAI,GAAGD,KAAK,CAACzB,KAAK,CAACuB,YAAY,CAACI,MAAM,CAAC;EAC7C,MAAM,CAACP,EAAE,EAAEC,MAAM,EAAEC,MAAM,CAAC,GAAGI,IAAI,CAACE,KAAK,CAAC,IAAI,CAAC;EAE7C,OAAO;IACHR,EAAE;IACFC,MAAM;IACNC;EACJ,CAAC;AACL,CAAC;AAAC;AAEK,MAAMO,cAAc,GAAG,IAAIC,wBAAc,CAAC;EAC7CC,kBAAkB,EAAE,IAAI;EACxBC,MAAM,EAAEC,OAAO,CAACC,GAAG,CAACC;AACxB,CAAC,CAAC;AAAC;AAEI,MAAMC,WAAW,GAAG,MAAM,CAC7B,IAAAC,gBAAe,GAAE,EACjB,IAAAC,oBAAW,GAAE,EACb,IAAAC,kBAAS,EAAC;EACNC,KAAK,EAAEP,OAAO,CAACC,GAAG,CAACO,QAAQ;EAC3BC,MAAM,EAAE,IAAIC,0BAAc,CAAC;IACvBd;EACJ,CAAC;AACL,CAAC,CAAC,CACL;;AAED;AACA;AACA;AAFA;AASO,MAAMe,cAAc,GAAG,YAAkC;EAC5D,MAAMC,OAAO,GAAGZ,OAAO,CAACC,GAAG,CAACY,uBAAuB;EAEnD,MAAMC,MAAM,GAAG;IACXC,SAAS,EAAEf,OAAO,CAACC,GAAG,CAACO,QAAkB;IACzCQ,GAAG,EAAE;MACDC,EAAE,EAAG,cAAa;MAClBC,EAAE,EAAEN,OAAO,IAAI;IACnB;EACJ,CAAC;EAED,MAAM;IAAEO;EAAK,CAAC,GAAG,MAAMvB,cAAc,CAACwB,GAAG,CAACN,MAAM,CAAC,CAACO,OAAO,EAAE;EAE3D,OAAO;IACHC,sBAAsB,EAAEH,IAAI,GAAGA,IAAI,CAAC,wBAAwB,CAAC,GAAG,wBAAwB;IACxFI,aAAa,EAAEJ,IAAI,GAAGA,IAAI,CAAC,eAAe,CAAC,GAAG,eAAe;IAC7DK,aAAa,EAAEL,IAAI,GAAGA,IAAI,CAAC,eAAe,CAAC,GAAG;EAClD,CAAC;AACL,CAAC;AAAC"}

package/scheduler/index.js

@@ -4,9 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createScheduler = void 0;
-
 var _createScheduleActionMethods = require("./createScheduleActionMethods");
-
 const createScheduler = params => {
   const {
     getLocale,
@@ -23,5 +21,4 @@ const createScheduler = params => {
     storageOperations
   });
 };
-
 exports.createScheduler = createScheduler;

package/scheduler/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["createScheduler","params","getLocale","getIdentity","getTenant","getPermission","storageOperations","createScheduleActionMethods"],"sources":["index.ts"],"sourcesContent":["import { createScheduleActionMethods } from \"./createScheduleActionMethods\";\nimport { ApwScheduleActionCrud, CreateScheduleActionParams } from \"./types\";\n\nexport const createScheduler = (params: CreateScheduleActionParams): ApwScheduleActionCrud => {\n    const { getLocale, getIdentity, getTenant, getPermission, storageOperations } = params;\n\n    return createScheduleActionMethods({\n        getLocale,\n        getIdentity,\n        getTenant,\n        getPermission,\n        storageOperations\n    });\n};\n"],"mappings":";;;;;;;AAAA;;AAGO,MAAMA,eAAe,GAAIC,MAAD,IAA+D;EAC1F,MAAM;IAAEC,SAAF;IAAaC,WAAb;IAA0BC,SAA1B;IAAqCC,aAArC;IAAoDC;EAApD,IAA0EL,MAAhF;EAEA,OAAO,IAAAM,wDAAA,EAA4B;IAC/BL,SAD+B;IAE/BC,WAF+B;IAG/BC,SAH+B;IAI/BC,aAJ+B;IAK/BC;EAL+B,CAA5B,CAAP;AAOH,CAVM"}
+{"version":3,"names":["createScheduler","params","getLocale","getIdentity","getTenant","getPermission","storageOperations","createScheduleActionMethods"],"sources":["index.ts"],"sourcesContent":["import { createScheduleActionMethods } from \"./createScheduleActionMethods\";\nimport { ApwScheduleActionCrud, CreateScheduleActionParams } from \"./types\";\n\nexport const createScheduler = (params: CreateScheduleActionParams): ApwScheduleActionCrud => {\n    const { getLocale, getIdentity, getTenant, getPermission, storageOperations } = params;\n\n    return createScheduleActionMethods({\n        getLocale,\n        getIdentity,\n        getTenant,\n        getPermission,\n        storageOperations\n    });\n};\n"],"mappings":";;;;;;AAAA;AAGO,MAAMA,eAAe,GAAIC,MAAkC,IAA4B;EAC1F,MAAM;IAAEC,SAAS;IAAEC,WAAW;IAAEC,SAAS;IAAEC,aAAa;IAAEC;EAAkB,CAAC,GAAGL,MAAM;EAEtF,OAAO,IAAAM,wDAA2B,EAAC;IAC/BL,SAAS;IACTC,WAAW;IACXC,SAAS;IACTC,aAAa;IACbC;EACJ,CAAC,CAAC;AACN,CAAC;AAAC"}

package/scheduler/types.d.ts

@@ -3,6 +3,7 @@ import { SecurityIdentity, SecurityPermission } from "@webiny/api-security/types
 import { I18NLocale, I18NContext } from "@webiny/api-i18n/types";
 import { Tenant } from "@webiny/api-tenancy/types";
 import { TenancyContext } from "@webiny/api-tenancy/types";
+import { ApwIdentity } from "../types";
 export interface ListWhere {
     /**
      * Fields.
@@ -29,25 +30,6 @@ export interface ListParams {
     limit?: number;
     after?: string;
 }
-/**
- * A interface describing the reference to a user that created some data in the database.
- *
- * @category General
- */
-export interface CreatedBy {
-    /**
-     * ID if the user.
-     */
-    id: string;
-    /**
-     * Full name of the user.
-     */
-    displayName: string | null;
-    /**
-     * Type of the user (admin, user)
-     */
-    type: string;
-}
 export interface ListMeta {
     /**
      * A cursor for pagination.
@@ -70,7 +52,7 @@ export interface BaseFields {
     id: string;
     createdOn: string;
     savedOn?: string;
-    createdBy: CreatedBy;
+    createdBy: ApwIdentity;
     tenant: string;
     locale: string;
 }

package/scheduler/types.js

@@ -4,31 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.InvocationTypes = exports.ApwScheduleActionTypes = exports.ApwContentTypes = void 0;
-
-/**
- * A interface describing the reference to a user that created some data in the database.
- *
- * @category General
- */
 let ApwContentTypes;
 exports.ApwContentTypes = ApwContentTypes;
-
 (function (ApwContentTypes) {
   ApwContentTypes["PAGE"] = "page";
   ApwContentTypes["CMS_ENTRY"] = "cms_entry";
 })(ApwContentTypes || (exports.ApwContentTypes = ApwContentTypes = {}));
-
 let ApwScheduleActionTypes;
 exports.ApwScheduleActionTypes = ApwScheduleActionTypes;
-
 (function (ApwScheduleActionTypes) {
   ApwScheduleActionTypes["PUBLISH"] = "publish";
   ApwScheduleActionTypes["UNPUBLISH"] = "unpublish";
 })(ApwScheduleActionTypes || (exports.ApwScheduleActionTypes = ApwScheduleActionTypes = {}));
-
 let InvocationTypes;
 exports.InvocationTypes = InvocationTypes;
-
 (function (InvocationTypes) {
   InvocationTypes["SCHEDULED"] = "scheduled";
 })(InvocationTypes || (exports.InvocationTypes = InvocationTypes = {}));

package/scheduler/types.js.map

@@ -1 +1 @@
-{"version":3,"names":["ApwContentTypes","ApwScheduleActionTypes","InvocationTypes"],"sources":["types.ts"],"sourcesContent":["import { Context } from \"@webiny/api/types\";\nimport { SecurityIdentity, SecurityPermission } from \"@webiny/api-security/types\";\nimport { I18NLocale, I18NContext } from \"@webiny/api-i18n/types\";\nimport { Tenant } from \"@webiny/api-tenancy/types\";\nimport { TenancyContext } from \"@webiny/api-tenancy/types\";\n\nexport interface ListWhere {\n    /**\n     * Fields.\n     */\n    id?: string;\n    id_in?: string[];\n    id_not?: string;\n    id_not_in?: string[];\n    /**\n     * Who created the entry?\n     */\n    createdBy?: string;\n    createdBy_not?: string;\n    createdBy_in?: string[];\n    createdBy_not_in?: string[];\n    /**\n     * By datetime field.\n     */\n    datetime_startsWith?: string;\n}\n\nexport interface ListParams {\n    where: ListWhere;\n    sort?: (\"datetime_ASC\" | \"datetime_DESC\")[];\n    limit?: number;\n    after?: string;\n}\n\n/**\n * A interface describing the reference to a user that created some data in the database.\n *\n * @category General\n */\nexport interface CreatedBy {\n    /**\n     * ID if the user.\n     */\n    id: string;\n    /**\n     * Full name of the user.\n     */\n    displayName: string | null;\n    /**\n     * Type of the user (admin, user)\n     */\n    type: string;\n}\n\nexport interface ListMeta {\n    /**\n     * A cursor for pagination.\n     */\n    cursor: string | null;\n    /**\n     * Is there more items to load?\n     */\n    hasMoreItems: boolean;\n    /**\n     * Total count of the items in the storage.\n     */\n    totalCount: number;\n}\n\nexport enum ApwContentTypes {\n    PAGE = \"page\",\n    CMS_ENTRY = \"cms_entry\"\n}\n\nexport interface BaseFields {\n    id: string;\n    createdOn: string;\n    savedOn?: string;\n    createdBy: CreatedBy;\n    tenant: string;\n    locale: string;\n}\n\nexport interface ApwScheduleAction extends BaseFields {\n    data: ApwScheduleActionData;\n}\n\nexport enum ApwScheduleActionTypes {\n    PUBLISH = \"publish\",\n    UNPUBLISH = \"unpublish\"\n}\n\nexport interface ApwScheduleActionData {\n    action: ApwScheduleActionTypes;\n    type: ApwContentTypes;\n    datetime: string;\n    entryId: string;\n    /**\n     * We will add modelId to the data for now.\n     * TODO extract in separate package?\n     */\n    modelId?: string;\n}\n\nexport enum InvocationTypes {\n    SCHEDULED = \"scheduled\"\n}\n\ninterface BaseApwCrud<TEntry, TCreateEntryParams, TUpdateEntryParams> {\n    get(id: string): Promise<TEntry | null>;\n\n    create(data: TCreateEntryParams): Promise<TEntry>;\n\n    update(id: string, data: TUpdateEntryParams): Promise<TEntry>;\n\n    delete(id: string): Promise<Boolean>;\n}\n\nexport interface ApwScheduleActionCrud\n    extends BaseApwCrud<ApwScheduleAction, ApwScheduleActionData, ApwScheduleActionData> {\n    list(params: ListParams): Promise<[ApwScheduleAction[], ListMeta]>;\n\n    getCurrentTask(): Promise<ApwScheduleAction | null>;\n\n    updateCurrentTask(item: ApwScheduleAction): Promise<ApwScheduleAction>;\n\n    deleteCurrentTask(): Promise<Boolean>;\n}\n\nexport interface ScheduleActionContext extends Context, I18NContext, TenancyContext {\n    scheduleAction: ApwScheduleActionCrud;\n}\n\nexport interface CreateScheduleActionParams {\n    getLocale: () => I18NLocale;\n    getIdentity: () => SecurityIdentity;\n    getTenant: () => Tenant;\n    getPermission: (name: string) => Promise<SecurityPermission | null>;\n    storageOperations: ApwScheduleActionStorageOperations;\n}\n\ninterface CreateApwScheduleActionParams {\n    item: ApwScheduleAction;\n    input: ApwScheduleActionData;\n}\n\ninterface StorageOperationsGetParams {\n    where: {\n        id: string;\n        tenant: string;\n        locale: string;\n    };\n}\n\ninterface StorageOperationsDeleteParams {\n    id: string;\n    tenant: string;\n    locale: string;\n}\n\nexport interface ApwScheduleActionListParams extends ListParams {\n    where: ListWhere & {\n        tenant: string;\n        locale: string;\n    };\n}\n\nexport type StorageOperationsGetScheduleActionParams = StorageOperationsGetParams;\n\nexport type StorageOperationsDeleteScheduleActionParams = StorageOperationsDeleteParams;\nexport type StorageOperationsListScheduleActionsParams = ApwScheduleActionListParams;\n\nexport type StorageOperationsCreateScheduleActionParams = CreateApwScheduleActionParams;\n\nexport interface StorageOperationsUpdateScheduleActionParams {\n    item: ApwScheduleAction;\n    input: ApwScheduleActionData;\n}\n\nexport type StorageOperationsListScheduleActionsResponse = [ApwScheduleAction[], ListMeta];\n\nexport interface StorageOperationsUpdateCurrentTaskParams {\n    item: ApwScheduleAction;\n}\n\nexport interface StorageOperationsGetCurrentTaskParams {\n    where: Pick<StorageOperationsGetParams[\"where\"], \"tenant\" | \"locale\">;\n}\n\nexport type StorageOperationsDeleteCurrentTaskParams = Pick<\n    StorageOperationsDeleteParams,\n    \"tenant\" | \"locale\"\n>;\n\nexport interface ApwScheduleActionStorageOperations {\n    get(params: StorageOperationsGetScheduleActionParams): Promise<ApwScheduleAction | null>;\n\n    list(\n        params: StorageOperationsListScheduleActionsParams\n    ): Promise<StorageOperationsListScheduleActionsResponse>;\n\n    create(params: StorageOperationsCreateScheduleActionParams): Promise<ApwScheduleAction>;\n\n    update(params: StorageOperationsUpdateScheduleActionParams): Promise<ApwScheduleAction>;\n\n    delete(params: StorageOperationsDeleteScheduleActionParams): Promise<Boolean>;\n\n    getCurrentTask(\n        params: StorageOperationsGetCurrentTaskParams\n    ): Promise<ApwScheduleAction | null>;\n\n    updateCurrentTask(params: StorageOperationsUpdateCurrentTaskParams): Promise<ApwScheduleAction>;\n\n    deleteCurrentTask(params: StorageOperationsDeleteCurrentTaskParams): Promise<Boolean>;\n}\n\nexport interface CreateApwContextParams {\n    storageOperations: ApwScheduleActionStorageOperations;\n}\n"],"mappings":";;;;;;;AAkCA;AACA;AACA;AACA;AACA;IA+BYA,e;;;WAAAA,e;EAAAA,e;EAAAA,e;GAAAA,e,+BAAAA,e;;IAkBAC,sB;;;WAAAA,sB;EAAAA,sB;EAAAA,sB;GAAAA,sB,sCAAAA,sB;;IAiBAC,e;;;WAAAA,e;EAAAA,e;GAAAA,e,+BAAAA,e"}
+{"version":3,"names":["ApwContentTypes","ApwScheduleActionTypes","InvocationTypes"],"sources":["types.ts"],"sourcesContent":["import { Context } from \"@webiny/api/types\";\nimport { SecurityIdentity, SecurityPermission } from \"@webiny/api-security/types\";\nimport { I18NLocale, I18NContext } from \"@webiny/api-i18n/types\";\nimport { Tenant } from \"@webiny/api-tenancy/types\";\nimport { TenancyContext } from \"@webiny/api-tenancy/types\";\nimport { ApwIdentity } from \"~/types\";\n\nexport interface ListWhere {\n    /**\n     * Fields.\n     */\n    id?: string;\n    id_in?: string[];\n    id_not?: string;\n    id_not_in?: string[];\n    /**\n     * Who created the entry?\n     */\n    createdBy?: string;\n    createdBy_not?: string;\n    createdBy_in?: string[];\n    createdBy_not_in?: string[];\n    /**\n     * By datetime field.\n     */\n    datetime_startsWith?: string;\n}\n\nexport interface ListParams {\n    where: ListWhere;\n    sort?: (\"datetime_ASC\" | \"datetime_DESC\")[];\n    limit?: number;\n    after?: string;\n}\n\nexport interface ListMeta {\n    /**\n     * A cursor for pagination.\n     */\n    cursor: string | null;\n    /**\n     * Is there more items to load?\n     */\n    hasMoreItems: boolean;\n    /**\n     * Total count of the items in the storage.\n     */\n    totalCount: number;\n}\n\nexport enum ApwContentTypes {\n    PAGE = \"page\",\n    CMS_ENTRY = \"cms_entry\"\n}\n\nexport interface BaseFields {\n    id: string;\n    createdOn: string;\n    savedOn?: string;\n    createdBy: ApwIdentity;\n    tenant: string;\n    locale: string;\n}\n\nexport interface ApwScheduleAction extends BaseFields {\n    data: ApwScheduleActionData;\n}\n\nexport enum ApwScheduleActionTypes {\n    PUBLISH = \"publish\",\n    UNPUBLISH = \"unpublish\"\n}\n\nexport interface ApwScheduleActionData {\n    action: ApwScheduleActionTypes;\n    type: ApwContentTypes;\n    datetime: string;\n    entryId: string;\n    /**\n     * We will add modelId to the data for now.\n     * TODO extract in separate package?\n     */\n    modelId?: string;\n}\n\nexport enum InvocationTypes {\n    SCHEDULED = \"scheduled\"\n}\n\ninterface BaseApwCrud<TEntry, TCreateEntryParams, TUpdateEntryParams> {\n    get(id: string): Promise<TEntry | null>;\n\n    create(data: TCreateEntryParams): Promise<TEntry>;\n\n    update(id: string, data: TUpdateEntryParams): Promise<TEntry>;\n\n    delete(id: string): Promise<Boolean>;\n}\n\nexport interface ApwScheduleActionCrud\n    extends BaseApwCrud<ApwScheduleAction, ApwScheduleActionData, ApwScheduleActionData> {\n    list(params: ListParams): Promise<[ApwScheduleAction[], ListMeta]>;\n\n    getCurrentTask(): Promise<ApwScheduleAction | null>;\n\n    updateCurrentTask(item: ApwScheduleAction): Promise<ApwScheduleAction>;\n\n    deleteCurrentTask(): Promise<Boolean>;\n}\n\nexport interface ScheduleActionContext extends Context, I18NContext, TenancyContext {\n    scheduleAction: ApwScheduleActionCrud;\n}\n\nexport interface CreateScheduleActionParams {\n    getLocale: () => I18NLocale;\n    getIdentity: () => SecurityIdentity;\n    getTenant: () => Tenant;\n    getPermission: (name: string) => Promise<SecurityPermission | null>;\n    storageOperations: ApwScheduleActionStorageOperations;\n}\n\ninterface CreateApwScheduleActionParams {\n    item: ApwScheduleAction;\n    input: ApwScheduleActionData;\n}\n\ninterface StorageOperationsGetParams {\n    where: {\n        id: string;\n        tenant: string;\n        locale: string;\n    };\n}\n\ninterface StorageOperationsDeleteParams {\n    id: string;\n    tenant: string;\n    locale: string;\n}\n\nexport interface ApwScheduleActionListParams extends ListParams {\n    where: ListWhere & {\n        tenant: string;\n        locale: string;\n    };\n}\n\nexport type StorageOperationsGetScheduleActionParams = StorageOperationsGetParams;\n\nexport type StorageOperationsDeleteScheduleActionParams = StorageOperationsDeleteParams;\nexport type StorageOperationsListScheduleActionsParams = ApwScheduleActionListParams;\n\nexport type StorageOperationsCreateScheduleActionParams = CreateApwScheduleActionParams;\n\nexport interface StorageOperationsUpdateScheduleActionParams {\n    item: ApwScheduleAction;\n    input: ApwScheduleActionData;\n}\n\nexport type StorageOperationsListScheduleActionsResponse = [ApwScheduleAction[], ListMeta];\n\nexport interface StorageOperationsUpdateCurrentTaskParams {\n    item: ApwScheduleAction;\n}\n\nexport interface StorageOperationsGetCurrentTaskParams {\n    where: Pick<StorageOperationsGetParams[\"where\"], \"tenant\" | \"locale\">;\n}\n\nexport type StorageOperationsDeleteCurrentTaskParams = Pick<\n    StorageOperationsDeleteParams,\n    \"tenant\" | \"locale\"\n>;\n\nexport interface ApwScheduleActionStorageOperations {\n    get(params: StorageOperationsGetScheduleActionParams): Promise<ApwScheduleAction | null>;\n\n    list(\n        params: StorageOperationsListScheduleActionsParams\n    ): Promise<StorageOperationsListScheduleActionsResponse>;\n\n    create(params: StorageOperationsCreateScheduleActionParams): Promise<ApwScheduleAction>;\n\n    update(params: StorageOperationsUpdateScheduleActionParams): Promise<ApwScheduleAction>;\n\n    delete(params: StorageOperationsDeleteScheduleActionParams): Promise<Boolean>;\n\n    getCurrentTask(\n        params: StorageOperationsGetCurrentTaskParams\n    ): Promise<ApwScheduleAction | null>;\n\n    updateCurrentTask(params: StorageOperationsUpdateCurrentTaskParams): Promise<ApwScheduleAction>;\n\n    deleteCurrentTask(params: StorageOperationsDeleteCurrentTaskParams): Promise<Boolean>;\n}\n\nexport interface CreateApwContextParams {\n    storageOperations: ApwScheduleActionStorageOperations;\n}\n"],"mappings":";;;;;;IAkDYA,eAAe;AAAA;AAAA,WAAfA,eAAe;EAAfA,eAAe;EAAfA,eAAe;AAAA,GAAfA,eAAe,+BAAfA,eAAe;AAAA,IAkBfC,sBAAsB;AAAA;AAAA,WAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;AAAA,GAAtBA,sBAAsB,sCAAtBA,sBAAsB;AAAA,IAiBtBC,eAAe;AAAA;AAAA,WAAfA,eAAe;EAAfA,eAAe;AAAA,GAAfA,eAAe,+BAAfA,eAAe"}

package/storageOperations/changeRequestStorageOperations.js

@@ -1,46 +1,36 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.createChangeRequestStorageOperations = void 0;
-
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-
 var _index = require("./index");
-
 var _fieldResolver = require("../utils/fieldResolver");
-
 var _error = _interopRequireDefault(require("@webiny/error"));
-
 const createChangeRequestStorageOperations = params => {
   const {
     cms,
     getCmsContext,
     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");
     }
-
     return model;
   };
-
   const getChangeRequest = async ({
     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,
@@ -48,19 +38,16 @@ const createChangeRequestStorageOperations = params => {
       transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
     });
   };
-
   return {
     getChangeRequestModel,
     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, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
+          where: (0, _objectSpread2.default)({}, params.where)
+        }));
+      });
       try {
         const all = await Promise.all(entries.map(entry => (0, _fieldResolver.getFieldValues)({
           entry,
@@ -73,12 +60,11 @@ const createChangeRequestStorageOperations = params => {
         throw new _error.default(ex.message, ex.code, ex.data);
       }
     },
-
     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,
@@ -86,20 +72,18 @@ const createChangeRequestStorageOperations = params => {
         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.
        */
-
       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();
+      const entry = await security.withoutAuthorization(async () => {
+        return cms.updateEntry(model, params.id, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, existingEntry), params.data));
+      });
       return (0, _fieldResolver.getFieldValues)({
         entry,
         fields: _index.baseFields,
@@ -107,16 +91,13 @@ const createChangeRequestStorageOperations = params => {
         transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
       });
     },
-
     async deleteChangeRequest(params) {
       const model = await getChangeRequestModel();
-      security.disableAuthorization();
-      await cms.deleteEntry(model, params.id);
-      security.enableAuthorization();
+      await security.withoutAuthorization(async () => {
+        return cms.deleteEntry(model, params.id);
+      });
       return true;
     }
-
   };
 };
-
 exports.createChangeRequestStorageOperations = createChangeRequestStorageOperations;

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":["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","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        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             * 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            const entry = await security.withoutAuthorization(async () => {\n                return cms.updateEntry(model, params.id, {\n                    ...existingEntry,\n                    ...params.data\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            await security.withoutAuthorization(async () => {\n                return cms.deleteEntry(model, params.id);\n            });\n            return true;\n        }\n    };\n};\n"],"mappings":"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"}

package/storageOperations/commentStorageOperations.js

@@ -1,57 +1,44 @@
 "use strict";
 
 var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
-
 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 _error = _interopRequireDefault(require("@webiny/error"));
-
 var _comment = require("./models/comment.model");
-
 const pickIdFromChangeRequest = obj => {
   const rawValue = obj["changeRequest"];
-
   if (!rawValue) {
     return obj;
   }
-
   obj["changeRequest"] = rawValue.id;
   return obj;
 };
-
 const createCommentStorageOperations = ({
   cms,
   getCmsContext,
   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");
     }
-
     return model;
   };
-
   const getComment = async ({
     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,
@@ -59,19 +46,17 @@ const createCommentStorageOperations = ({
       transformers: [(0, _fieldResolver.getTransformer)(model, "body")]
     });
   };
-
   return {
     getCommentModel,
     getComment: async params => {
       const values = await getComment(params);
       return pickIdFromChangeRequest(values);
     },
-
     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,
@@ -81,18 +66,17 @@ const createCommentStorageOperations = ({
       const all = values.map(value => pickIdFromChangeRequest(value));
       return [all, meta];
     },
-
     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, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, params.data), {}, {
+          changeRequest: {
+            id: params.data.changeRequest,
+            modelId: refModel.modelId
+          }
+        }));
+      });
       const values = await (0, _fieldResolver.getFieldValues)({
         entry,
         fields: _index.baseFields,
@@ -101,20 +85,18 @@ const createCommentStorageOperations = ({
       });
       return pickIdFromChangeRequest(values);
     },
-
     async updateComment(params) {
       const model = await getCommentModel();
       /**
        * 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.
        */
-
       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, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, existingEntry), params.data));
+      });
       const values = await (0, _fieldResolver.getFieldValues)({
         entry,
         fields: _index.baseFields,
@@ -123,16 +105,13 @@ const createCommentStorageOperations = ({
       });
       return pickIdFromChangeRequest(values);
     },
-
     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;

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":["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","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        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                });\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":"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"}