Merge branch 'next' of github.com:webiny/webiny-js into next

webiny · Mar 26, 2024 · b11d5db · b11d5db
2 parents fcb7643 + fa56f2a
commit b11d5db
Show file tree

Hide file tree

Showing 180 changed files with 3,082 additions and 2,822 deletions.
diff --git a/packages/api-admin-users-cognito-so-ddb/LICENSE b/packages/api-admin-users-cognito-so-ddb/LICENSE
diff --git a/packages/api-admin-users-cognito-so-ddb/README.md b/packages/api-admin-users-cognito-so-ddb/README.md
diff --git a/packages/api-admin-users-cognito-so-ddb/index.js b/packages/api-admin-users-cognito-so-ddb/index.js
diff --git a/packages/api-admin-users-cognito-so-ddb/package.json b/packages/api-admin-users-cognito-so-ddb/package.json
diff --git a/packages/api-admin-users-cognito/LICENSE b/packages/api-admin-users-cognito/LICENSE
diff --git a/packages/api-admin-users-cognito/README.md b/packages/api-admin-users-cognito/README.md
diff --git a/packages/api-admin-users-cognito/index.js b/packages/api-admin-users-cognito/index.js
diff --git a/packages/api-admin-users-cognito/package.json b/packages/api-admin-users-cognito/package.json
diff --git a/packages/api-headless-cms/src/context.ts b/packages/api-headless-cms/src/context.ts
@@ -9,9 +9,6 @@ import { createModelsCrud } from "~/crud/contentModel.crud";
 import { createContentEntryCrud } from "~/crud/contentEntry.crud";
 import { StorageOperationsCmsModelPlugin } from "~/plugins";
 import { createCmsModelFieldConvertersAttachFactory } from "~/utils/converters/valueKeyStorageConverter";
-import { ModelsPermissions } from "~/utils/permissions/ModelsPermissions";
-import { ModelGroupsPermissions } from "./utils/permissions/ModelGroupsPermissions";
-import { EntriesPermissions } from "./utils/permissions/EntriesPermissions";
 import { createExportCrud } from "~/export";
 import { createImportCrud } from "~/export/crud/importing";
 
@@ -63,25 +60,6 @@ export const createContextPlugin = ({ storageOperations }: CrudParams) => {
         await context.benchmark.measure("headlessCms.createContext", async () => {
             await storageOperations.beforeInit(context);
 
-            const modelGroupsPermissions = new ModelGroupsPermissions({
-                getIdentity: context.security.getIdentity,
-                getPermissions: () => context.security.getPermissions("cms.contentModelGroup"),
-                fullAccessPermissionName: "cms.*"
-            });
-
-            const modelsPermissions = new ModelsPermissions({
-                getIdentity: context.security.getIdentity,
-                getPermissions: () => context.security.getPermissions("cms.contentModel"),
-                fullAccessPermissionName: "cms.*",
-                modelGroupsPermissions
-            });
-
-            const entriesPermissions = new EntriesPermissions({
-                getIdentity: context.security.getIdentity,
-                getPermissions: () => context.security.getPermissions("cms.contentEntry"),
-                fullAccessPermissionName: "cms.*"
-            });
-
             const accessControl = new AccessControl({
                 getIdentity: context.security.getIdentity,
                 getGroupsPermissions: () =>
@@ -103,14 +81,6 @@ export const createContextPlugin = ({ storageOperations }: CrudParams) => {
                 PREVIEW: type === "preview",
                 MANAGE: type === "manage",
                 storageOperations,
-
-                // TODO: remove with 5.40 release.
-                permissions: {
-                    groups: modelGroupsPermissions,
-                    models: modelsPermissions,
-                    entries: entriesPermissions
-                },
-
                 accessControl,
                 ...createSystemCrud({
                     context,

diff --git a/packages/api-headless-cms/src/types.ts b/packages/api-headless-cms/src/types.ts
@@ -12,18 +12,9 @@ import { Topic } from "@webiny/pubsub/types";
 import { CmsModelConverterCallable } from "~/utils/converters/ConverterCollection";
 import { HeadlessCmsExport, HeadlessCmsImport } from "~/export/types";
 import { AccessControl } from "~/crud/AccessControl/AccessControl";
-import { ModelGroupsPermissions } from "~/utils/permissions/ModelGroupsPermissions";
-import { ModelsPermissions } from "~/utils/permissions/ModelsPermissions";
-import { EntriesPermissions } from "~/utils/permissions/EntriesPermissions";
 
 export type ApiEndpoint = "manage" | "preview" | "read";
 
-interface HeadlessCmsPermissions {
-    groups: ModelGroupsPermissions;
-    models: ModelsPermissions;
-    entries: EntriesPermissions;
-}
-
 export interface HeadlessCms
     extends CmsSystemContext,
         CmsGroupContext,
@@ -63,13 +54,6 @@ export interface HeadlessCms
      */
     accessControl: AccessControl;
 
-    /**
-     * Permissions for groups, models and entries.
-     * @internal
-     * @deprecated Will be removed with the 5.40.0 release. Use `accessControl` instead.
-     */
-    permissions: HeadlessCmsPermissions;
-
     /**
      * Export operations.
      */

diff --git a/packages/api-headless-cms/src/utils/permissions/EntriesPermissions.ts b/packages/api-headless-cms/src/utils/permissions/EntriesPermissions.ts
diff --git a/packages/api-headless-cms/src/utils/permissions/ModelGroupsPermissions.ts b/packages/api-headless-cms/src/utils/permissions/ModelGroupsPermissions.ts
diff --git a/packages/api-headless-cms/src/utils/permissions/ModelsPermissions.ts b/packages/api-headless-cms/src/utils/permissions/ModelsPermissions.ts
diff --git a/packages/api-i18n/src/graphql/crud/locales.crud.ts b/packages/api-i18n/src/graphql/crud/locales.crud.ts
@@ -53,18 +53,6 @@ export const createLocalesCrud = (params: CreateLocalesCrudParams): LocalesCRUD
     );
 
     return {
-        /**
-         * Deprecated in 5.34.0
-         */
-        onBeforeCreate: onLocaleBeforeCreate,
-        onAfterCreate: onLocaleAfterCreate,
-        onBeforeUpdate: onLocaleBeforeUpdate,
-        onAfterUpdate: onLocaleAfterUpdate,
-        onBeforeDelete: onLocaleBeforeDelete,
-        onAfterDelete: onLocaleAfterDelete,
-        /**
-         * Introduced in 5.34.0
-         */
         onLocaleBeforeCreate,
         onLocaleAfterCreate,
         onLocaleBeforeUpdate,

diff --git a/packages/api-i18n/src/graphql/crud/system.crud.ts b/packages/api-i18n/src/graphql/crud/system.crud.ts
@@ -31,14 +31,6 @@ export const createSystemCrud = (params: CreateSystemCrudParams): SystemCRUD =>
     );
 
     return {
-        /**
-         * Deprecated in 5.34.0
-         */
-        onBeforeInstall: onSystemBeforeInstall,
-        onAfterInstall: onSystemAfterInstall,
-        /**
-         * Introduced in 5.34.0
-         */
         onSystemBeforeInstall,
         onSystemAfterInstall,
         storageOperations,