@webiny/api-headless-cms 0.0.0-unstable.c2780f51fe → 0.0.0-unstable.c7dec08bb0

package/crud/contentModel/validation.d.ts

@@ -24,26 +24,26 @@ export declare const createModelCreateValidation: () => zod.ZodObject<{
                 label: zod.ZodString;
                 selected: zod.ZodDefault<zod.ZodOptional<zod.ZodBoolean>>;
             }, "strip", zod.ZodTypeAny, {
-                label: string;
                 value: string;
+                label: string;
                 selected: boolean;
             }, {
                 selected?: boolean | undefined;
-                label: string;
                 value: string;
+                label: string;
             }>, "many">>;
         }, "strip", zod.ZodTypeAny, {
             values: {
-                label: string;
                 value: string;
+                label: string;
                 selected: boolean;
             }[];
             enabled: boolean;
         }, {
             values?: {
                 selected?: boolean | undefined;
-                label: string;
                 value: string;
+                label: string;
             }[] | undefined;
             enabled: boolean;
         }>>>;
@@ -60,19 +60,19 @@ export declare const createModelCreateValidation: () => zod.ZodObject<{
             settings: zod.ZodDefault<zod.ZodEffects<zod.ZodNullable<zod.ZodOptional<zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, {}, {}>>>>, {}, {} | null | undefined>>;
         }, "strip", zod.ZodTypeAny, {
             name: string;
-            settings: {};
             message: string;
+            settings: {};
         }, {
-            settings?: {} | null | undefined;
             message?: string | undefined;
+            settings?: {} | null | undefined;
             name: string;
         }>, "many">>>>>, {
             name: string;
-            settings: {};
             message: string;
+            settings: {};
         }[], {
-            settings?: {} | null | undefined;
             message?: string | undefined;
+            settings?: {} | null | undefined;
             name: string;
         }[] | null | undefined>;
         listValidation: zod.ZodEffects<zod.ZodDefault<zod.ZodOptional<zod.ZodNullable<zod.ZodOptional<zod.ZodArray<zod.ZodObject<{
@@ -81,27 +81,27 @@ export declare const createModelCreateValidation: () => zod.ZodObject<{
             settings: zod.ZodDefault<zod.ZodEffects<zod.ZodNullable<zod.ZodOptional<zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, {}, {}>>>>, {}, {} | null | undefined>>;
         }, "strip", zod.ZodTypeAny, {
             name: string;
-            settings: {};
             message: string;
+            settings: {};
         }, {
-            settings?: {} | null | undefined;
             message?: string | undefined;
+            settings?: {} | null | undefined;
             name: string;
         }>, "many">>>>>, {
             name: string;
-            settings: {};
             message: string;
+            settings: {};
         }[], {
-            settings?: {} | null | undefined;
             message?: string | undefined;
+            settings?: {} | null | undefined;
             name: string;
         }[] | null | undefined>;
         settings: zod.ZodDefault<zod.ZodEffects<zod.ZodNullable<zod.ZodOptional<zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, {}, {}>>>>, {}, {} | null | undefined>>;
     }, "strip", zod.ZodTypeAny, {
         predefinedValues?: {
             values: {
-                label: string;
                 value: string;
+                label: string;
                 selected: boolean;
             }[];
             enabled: boolean;
@@ -109,8 +109,9 @@ export declare const createModelCreateValidation: () => zod.ZodObject<{
         renderer?: {
             name: string;
         } | undefined;
-        id: string;
         type: string;
+        id: string;
+        settings: {};
         storageId: string;
         fieldId: string;
         label: string;
@@ -118,26 +119,26 @@ export declare const createModelCreateValidation: () => zod.ZodObject<{
         placeholderText: string | null;
         validation: {
             name: string;
-            settings: {};
             message: string;
+            settings: {};
         }[];
         listValidation: {
             name: string;
-            settings: {};
             message: string;
+            settings: {};
         }[];
         multipleValues: boolean;
         tags: string[];
-        settings: {};
     }, {
+        settings?: {} | null | undefined;
         storageId?: string | undefined;
         helpText?: string | null | undefined;
         placeholderText?: string | null | undefined;
         predefinedValues?: {
             values?: {
                 selected?: boolean | undefined;
-                label: string;
                 value: string;
+                label: string;
             }[] | undefined;
             enabled: boolean;
         } | undefined;
@@ -145,20 +146,19 @@ export declare const createModelCreateValidation: () => zod.ZodObject<{
             name: string;
         } | undefined;
         validation?: {
-            settings?: {} | null | undefined;
             message?: string | undefined;
+            settings?: {} | null | undefined;
             name: string;
         }[] | null | undefined;
         listValidation?: {
-            settings?: {} | null | undefined;
             message?: string | undefined;
+            settings?: {} | null | undefined;
             name: string;
         }[] | null | undefined;
         multipleValues?: boolean | null | undefined;
         tags?: string[] | undefined;
-        settings?: {} | null | undefined;
-        id: string;
         type: string;
+        id: string;
         fieldId: string;
         label: string;
     }>, "many">>;
@@ -177,12 +177,13 @@ export declare const createModelCreateValidation: () => zod.ZodObject<{
     descriptionFieldId?: string | null | undefined;
     imageFieldId?: string | null | undefined;
     defaultFields?: boolean | null | undefined;
+    group: string;
     name: string;
     fields: {
         predefinedValues?: {
             values: {
-                label: string;
                 value: string;
+                label: string;
                 selected: boolean;
             }[];
             enabled: boolean;
@@ -190,8 +191,9 @@ export declare const createModelCreateValidation: () => zod.ZodObject<{
         renderer?: {
             name: string;
         } | undefined;
-        id: string;
         type: string;
+        id: string;
+        settings: {};
         storageId: string;
         fieldId: string;
         label: string;
@@ -199,35 +201,32 @@ export declare const createModelCreateValidation: () => zod.ZodObject<{
         placeholderText: string | null;
         validation: {
             name: string;
-            settings: {};
             message: string;
+            settings: {};
         }[];
         listValidation: {
             name: string;
-            settings: {};
             message: string;
+            settings: {};
         }[];
         multipleValues: boolean;
         tags: string[];
-        settings: {};
     }[];
     layout: string[][];
     singularApiName: string;
     pluralApiName: string;
-    group: string;
 }, {
     description?: string | null | undefined;
-    icon?: string | null | undefined;
-    tags?: string[] | undefined;
     fields?: {
+        settings?: {} | null | undefined;
         storageId?: string | undefined;
         helpText?: string | null | undefined;
         placeholderText?: string | null | undefined;
         predefinedValues?: {
             values?: {
                 selected?: boolean | undefined;
-                label: string;
                 value: string;
+                label: string;
             }[] | undefined;
             enabled: boolean;
         } | undefined;
@@ -235,33 +234,34 @@ export declare const createModelCreateValidation: () => zod.ZodObject<{
             name: string;
         } | undefined;
         validation?: {
-            settings?: {} | null | undefined;
             message?: string | undefined;
+            settings?: {} | null | undefined;
             name: string;
         }[] | null | undefined;
         listValidation?: {
-            settings?: {} | null | undefined;
             message?: string | undefined;
+            settings?: {} | null | undefined;
             name: string;
         }[] | null | undefined;
         multipleValues?: boolean | null | undefined;
         tags?: string[] | undefined;
-        settings?: {} | null | undefined;
-        id: string;
         type: string;
+        id: string;
         fieldId: string;
         label: string;
     }[] | undefined;
+    icon?: string | null | undefined;
+    tags?: string[] | undefined;
     layout?: string[][] | undefined;
     modelId?: string | undefined;
     titleFieldId?: string | null | undefined;
     descriptionFieldId?: string | null | undefined;
     imageFieldId?: string | null | undefined;
     defaultFields?: boolean | null | undefined;
+    group: string;
     name: string;
     singularApiName: string;
     pluralApiName: string;
-    group: string;
 }>;
 export declare const createModelCreateFromValidation: () => zod.ZodObject<{
     name: zod.ZodString;
@@ -273,23 +273,23 @@ export declare const createModelCreateFromValidation: () => zod.ZodObject<{
     icon: zod.ZodNullable<zod.ZodOptional<zod.ZodOptional<zod.ZodString>>>;
     locale: zod.ZodOptional<zod.ZodString>;
 }, "strip", zod.ZodTypeAny, {
-    locale?: string | undefined;
     description?: string | null | undefined;
+    locale?: string | undefined;
     icon?: string | null | undefined;
     modelId?: string | undefined;
+    group: string;
     name: string;
     singularApiName: string;
     pluralApiName: string;
-    group: string;
 }, {
-    locale?: string | undefined;
     description?: string | null | undefined;
+    locale?: string | undefined;
     icon?: string | null | undefined;
     modelId?: string | undefined;
+    group: string;
     name: string;
     singularApiName: string;
     pluralApiName: string;
-    group: string;
 }>;
 export declare const createModelUpdateValidation: () => zod.ZodObject<{
     name: zod.ZodOptional<zod.ZodString>;
@@ -315,26 +315,26 @@ export declare const createModelUpdateValidation: () => zod.ZodObject<{
                 label: zod.ZodString;
                 selected: zod.ZodDefault<zod.ZodOptional<zod.ZodBoolean>>;
             }, "strip", zod.ZodTypeAny, {
-                label: string;
                 value: string;
+                label: string;
                 selected: boolean;
             }, {
                 selected?: boolean | undefined;
-                label: string;
                 value: string;
+                label: string;
             }>, "many">>;
         }, "strip", zod.ZodTypeAny, {
             values: {
-                label: string;
                 value: string;
+                label: string;
                 selected: boolean;
             }[];
             enabled: boolean;
         }, {
             values?: {
                 selected?: boolean | undefined;
-                label: string;
                 value: string;
+                label: string;
             }[] | undefined;
             enabled: boolean;
         }>>>;
@@ -351,19 +351,19 @@ export declare const createModelUpdateValidation: () => zod.ZodObject<{
             settings: zod.ZodDefault<zod.ZodEffects<zod.ZodNullable<zod.ZodOptional<zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, {}, {}>>>>, {}, {} | null | undefined>>;
         }, "strip", zod.ZodTypeAny, {
             name: string;
-            settings: {};
             message: string;
+            settings: {};
         }, {
-            settings?: {} | null | undefined;
             message?: string | undefined;
+            settings?: {} | null | undefined;
             name: string;
         }>, "many">>>>>, {
             name: string;
-            settings: {};
             message: string;
+            settings: {};
         }[], {
-            settings?: {} | null | undefined;
             message?: string | undefined;
+            settings?: {} | null | undefined;
             name: string;
         }[] | null | undefined>;
         listValidation: zod.ZodEffects<zod.ZodDefault<zod.ZodOptional<zod.ZodNullable<zod.ZodOptional<zod.ZodArray<zod.ZodObject<{
@@ -372,27 +372,27 @@ export declare const createModelUpdateValidation: () => zod.ZodObject<{
             settings: zod.ZodDefault<zod.ZodEffects<zod.ZodNullable<zod.ZodOptional<zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, {}, {}>>>>, {}, {} | null | undefined>>;
         }, "strip", zod.ZodTypeAny, {
             name: string;
-            settings: {};
             message: string;
+            settings: {};
         }, {
-            settings?: {} | null | undefined;
             message?: string | undefined;
+            settings?: {} | null | undefined;
             name: string;
         }>, "many">>>>>, {
             name: string;
-            settings: {};
             message: string;
+            settings: {};
         }[], {
-            settings?: {} | null | undefined;
             message?: string | undefined;
+            settings?: {} | null | undefined;
             name: string;
         }[] | null | undefined>;
         settings: zod.ZodDefault<zod.ZodEffects<zod.ZodNullable<zod.ZodOptional<zod.ZodOptional<zod.ZodObject<{}, "passthrough", zod.ZodTypeAny, {}, {}>>>>, {}, {} | null | undefined>>;
     }, "strip", zod.ZodTypeAny, {
         predefinedValues?: {
             values: {
-                label: string;
                 value: string;
+                label: string;
                 selected: boolean;
             }[];
             enabled: boolean;
@@ -400,8 +400,9 @@ export declare const createModelUpdateValidation: () => zod.ZodObject<{
         renderer?: {
             name: string;
         } | undefined;
-        id: string;
         type: string;
+        id: string;
+        settings: {};
         storageId: string;
         fieldId: string;
         label: string;
@@ -409,26 +410,26 @@ export declare const createModelUpdateValidation: () => zod.ZodObject<{
         placeholderText: string | null;
         validation: {
             name: string;
-            settings: {};
             message: string;
+            settings: {};
         }[];
         listValidation: {
             name: string;
-            settings: {};
             message: string;
+            settings: {};
         }[];
         multipleValues: boolean;
         tags: string[];
-        settings: {};
     }, {
+        settings?: {} | null | undefined;
         storageId?: string | undefined;
         helpText?: string | null | undefined;
         placeholderText?: string | null | undefined;
         predefinedValues?: {
             values?: {
                 selected?: boolean | undefined;
-                label: string;
                 value: string;
+                label: string;
             }[] | undefined;
             enabled: boolean;
         } | undefined;
@@ -436,20 +437,19 @@ export declare const createModelUpdateValidation: () => zod.ZodObject<{
             name: string;
         } | undefined;
         validation?: {
-            settings?: {} | null | undefined;
             message?: string | undefined;
+            settings?: {} | null | undefined;
             name: string;
         }[] | null | undefined;
         listValidation?: {
-            settings?: {} | null | undefined;
             message?: string | undefined;
+            settings?: {} | null | undefined;
             name: string;
         }[] | null | undefined;
         multipleValues?: boolean | null | undefined;
         tags?: string[] | undefined;
-        settings?: {} | null | undefined;
-        id: string;
         type: string;
+        id: string;
         fieldId: string;
         label: string;
     }>, "many">;
@@ -459,21 +459,21 @@ export declare const createModelUpdateValidation: () => zod.ZodObject<{
     imageFieldId: zod.ZodNullable<zod.ZodOptional<zod.ZodOptional<zod.ZodString>>>;
     tags: zod.ZodOptional<zod.ZodArray<zod.ZodString, "many">>;
 }, "strip", zod.ZodTypeAny, {
-    name?: string | undefined;
     description?: string | null | undefined;
+    group?: string | undefined;
+    name?: string | undefined;
     icon?: string | null | undefined;
     tags?: string[] | undefined;
     singularApiName?: string | undefined;
     pluralApiName?: string | undefined;
-    group?: string | undefined;
     titleFieldId?: string | null | undefined;
     descriptionFieldId?: string | null | undefined;
     imageFieldId?: string | null | undefined;
     fields: {
         predefinedValues?: {
             values: {
-                label: string;
                 value: string;
+                label: string;
                 selected: boolean;
             }[];
             enabled: boolean;
@@ -481,8 +481,9 @@ export declare const createModelUpdateValidation: () => zod.ZodObject<{
         renderer?: {
             name: string;
         } | undefined;
-        id: string;
         type: string;
+        id: string;
+        settings: {};
         storageId: string;
         fieldId: string;
         label: string;
@@ -490,39 +491,39 @@ export declare const createModelUpdateValidation: () => zod.ZodObject<{
         placeholderText: string | null;
         validation: {
             name: string;
-            settings: {};
             message: string;
+            settings: {};
         }[];
         listValidation: {
             name: string;
-            settings: {};
             message: string;
+            settings: {};
         }[];
         multipleValues: boolean;
         tags: string[];
-        settings: {};
     }[];
     layout: string[][];
 }, {
-    name?: string | undefined;
     description?: string | null | undefined;
+    group?: string | undefined;
+    name?: string | undefined;
     icon?: string | null | undefined;
     tags?: string[] | undefined;
     singularApiName?: string | undefined;
     pluralApiName?: string | undefined;
-    group?: string | undefined;
     titleFieldId?: string | null | undefined;
     descriptionFieldId?: string | null | undefined;
     imageFieldId?: string | null | undefined;
     fields: {
+        settings?: {} | null | undefined;
         storageId?: string | undefined;
         helpText?: string | null | undefined;
         placeholderText?: string | null | undefined;
         predefinedValues?: {
             values?: {
                 selected?: boolean | undefined;
-                label: string;
                 value: string;
+                label: string;
             }[] | undefined;
             enabled: boolean;
         } | undefined;
@@ -530,20 +531,19 @@ export declare const createModelUpdateValidation: () => zod.ZodObject<{
             name: string;
         } | undefined;
         validation?: {
-            settings?: {} | null | undefined;
             message?: string | undefined;
+            settings?: {} | null | undefined;
             name: string;
         }[] | null | undefined;
         listValidation?: {
-            settings?: {} | null | undefined;
             message?: string | undefined;
+            settings?: {} | null | undefined;
             name: string;
         }[] | null | undefined;
         multipleValues?: boolean | null | undefined;
         tags?: string[] | undefined;
-        settings?: {} | null | undefined;
-        id: string;
         type: string;
+        id: string;
         fieldId: string;
         label: string;
     }[];

package/crud/contentModel.crud.d.ts

@@ -2,10 +2,12 @@ import { CmsContext, CmsModelContext, HeadlessCmsStorageOperations } from "../ty
 import { Tenant } from "@webiny/api-tenancy/types";
 import { I18NLocale } from "@webiny/api-i18n/types";
 import { SecurityIdentity } from "@webiny/api-security/types";
+import { ModelsPermissions } from "../utils/permissions/ModelsPermissions";
 export interface CreateModelsCrudParams {
     getTenant: () => Tenant;
     getLocale: () => I18NLocale;
     storageOperations: HeadlessCmsStorageOperations;
+    modelsPermissions: ModelsPermissions;
     context: CmsContext;
     getIdentity: () => SecurityIdentity;
 }

package/crud/contentModel.crud.js

@@ -20,10 +20,7 @@ var _afterUpdate = require("./contentModel/afterUpdate");
 var _afterDelete = require("./contentModel/afterDelete");
 var _afterCreateFrom = require("./contentModel/afterCreateFrom");
 var _CmsModelPlugin = require("../plugins/CmsModelPlugin");
-var _permissions = require("../utils/permissions");
 var _filterAsync = require("../utils/filterAsync");
-var _ownership = require("../utils/ownership");
-var _access = require("../utils/access");
 var _validation = require("./contentModel/validation");
 var _utils = require("@webiny/utils");
 var _defaultFields = require("./contentModel/defaultFields");
@@ -47,6 +44,7 @@ const createModelsCrud = params => {
     getIdentity,
     getLocale,
     storageOperations,
+    modelsPermissions,
     context
   } = params;
   const loaders = {
@@ -83,9 +81,9 @@ const createModelsCrud = params => {
     managers.set(model.modelId, manager);
     return manager;
   };
-  const checkModelPermissions = check => {
-    return (0, _permissions.checkPermissions)(context, "cms.contentModel", {
-      rwd: check
+  const checkModelPermissions = rwd => {
+    return modelsPermissions.ensure({
+      rwd
     });
   };
   const getModelsAsPlugins = () => {
@@ -141,22 +139,34 @@ const createModelsCrud = params => {
   };
   const listModels = async () => {
     return context.benchmark.measure("headlessCms.crud.models.listModels", async () => {
-      const permission = await checkModelPermissions("r");
       const models = await modelsList();
       return (0, _filterAsync.filterAsync)(models, async model => {
-        if (!(0, _ownership.validateOwnership)(context, permission, model)) {
+        const ownsModel = await modelsPermissions.ensure({
+          owns: model.createdBy
+        }, {
+          throw: false
+        });
+        if (!ownsModel) {
           return false;
         }
-        return (0, _access.validateModelAccess)(context, model);
+        return modelsPermissions.canAccessModel({
+          model,
+          locale: getLocale().code
+        });
       });
     });
   };
   const getModel = async modelId => {
     return context.benchmark.measure("headlessCms.crud.models.getModel", async () => {
-      const permission = await checkModelPermissions("r");
+      await checkModelPermissions("r");
       const model = await modelsGet(modelId);
-      (0, _ownership.checkOwnership)(context, permission, model);
-      await (0, _access.checkModelAccess)(context, model);
+      await modelsPermissions.ensure({
+        owns: model.createdBy
+      });
+      await modelsPermissions.ensureCanAccessModel({
+        model,
+        locale: getLocale().code
+      });
       return model;
     });
   };