@webiny/api-headless-cms 5.17.4 → 5.18.0-beta.3

package/plugins/crud/system.crud.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.createSystemCrud = void 0;
 
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
@@ -15,13 +15,9 @@ var _apiSecurity = require("@webiny/api-security");
 
 var _apiUpgrade = require("@webiny/api-upgrade");
 
-var _ContextPlugin = require("@webiny/handler/plugins/ContextPlugin");
-
 var _error = _interopRequireDefault(require("@webiny/error"));
 
-var _InstallationPlugin = require("../InstallationPlugin");
-
-var _utils = require("../../utils");
+var _pubsub = require("@webiny/pubsub");
 
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
 
@@ -34,136 +30,153 @@ const initialContentModelGroup = {
   icon: "fas/star"
 };
 
-var _default = new _ContextPlugin.ContextPlugin(async context => {
-  /**
-   * If cms is not defined on the context, do not continue, but log it.
-   */
-  if (!context.cms) {
-    return;
-  }
-
-  const pluginType = "cms-system-storage-operations-provider";
-  const providerPlugins = context.plugins.byType(pluginType);
-  const providerPlugin = providerPlugins[providerPlugins.length - 1];
-
-  if (!providerPlugin) {
-    throw new _error.default(`Missing "${pluginType}" plugin.`, "PLUGIN_NOT_FOUND", {
-      type: pluginType
-    });
-  }
-
-  const storageOperations = await providerPlugin.provide({
-    context
-  });
+const createSystemCrud = params => {
+  const {
+    getTenant,
+    storageOperations,
+    context,
+    getIdentity
+  } = params;
+  const onBeforeInstall = (0, _pubsub.createTopic)();
+  const onAfterInstall = (0, _pubsub.createTopic)();
 
   const createReadAPIKey = () => {
     return _crypto.default.randomBytes(Math.ceil(48 / 2)).toString("hex");
   };
 
-  context.cms = _objectSpread(_objectSpread({}, context.cms), {}, {
-    system: {
-      async getVersion() {
-        if (!context.tenancy.getCurrentTenant()) {
-          return null;
-        }
-
-        const system = await storageOperations.get();
-        return system ? system.version : null;
-      },
-
-      async setVersion(version) {
-        const system = await storageOperations.get();
-
-        if (!system) {
-          await storageOperations.create({
-            version
-          });
-          return;
-        }
-
-        await storageOperations.update({
-          version
+  const getVersion = async () => {
+    if (!getTenant()) {
+      return null;
+    }
+
+    const system = await storageOperations.system.get({
+      tenant: getTenant().id
+    });
+    return system ? system.version : null;
+  };
+
+  const setVersion = async version => {
+    const original = await storageOperations.system.get({
+      tenant: getTenant().id
+    });
+
+    const system = _objectSpread(_objectSpread({}, original || {}), {}, {
+      version,
+      tenant: getTenant().id
+    });
+
+    if (!original) {
+      await storageOperations.system.create({
+        system
+      });
+      return;
+    }
+
+    await storageOperations.system.update({
+      original,
+      system
+    });
+  };
+
+  return {
+    onBeforeSystemInstall: onBeforeInstall,
+    onAfterSystemInstall: onAfterInstall,
+    getSystemVersion: getVersion,
+    setSystemVersion: setVersion,
+    getReadAPIKey: async () => {
+      const original = await storageOperations.system.get({
+        tenant: getTenant().id
+      });
+
+      if (!original) {
+        return null;
+      }
+
+      if (!original.readAPIKey) {
+        const readAPIKey = createReadAPIKey();
+
+        const system = _objectSpread(_objectSpread({}, original), {}, {
+          readAPIKey
         });
-      },
-
-      getReadAPIKey: async () => {
-        const system = await storageOperations.get();
-
-        if (!system) {
-          return null;
-        }
-
-        if (!system.readAPIKey) {
-          const apiKey = createReadAPIKey();
-          await context.cms.system.setReadAPIKey(apiKey);
-          return apiKey;
-        }
-
-        return system.readAPIKey;
-      },
-      setReadAPIKey: async apiKey => {
-        await storageOperations.update({
-          readAPIKey: apiKey
+
+        await storageOperations.system.update({
+          original,
+          system
         });
-      },
-      install: async () => {
-        const identity = context.security.getIdentity();
-
-        if (!identity) {
-          throw new _apiSecurity.NotAuthorizedError();
-        }
-
-        const version = await context.cms.system.getVersion();
-
-        if (version) {
-          return;
-        }
-
-        const installationPlugins = context.plugins.byType(_InstallationPlugin.InstallationPlugin.type);
-        await (0, _utils.executeCallbacks)(installationPlugins, "beforeInstall", {
-          context
-        }); // Add default content model group.
-
-        try {
-          await context.cms.groups.create(initialContentModelGroup);
-        } catch (ex) {
-          throw new _error.default(ex.message, "CMS_INSTALLATION_CONTENT_MODEL_GROUP_ERROR", {
-            group: initialContentModelGroup
-          });
-        }
-
-        await (0, _utils.executeCallbacks)(installationPlugins, "afterInstall", {
-          context
-        }); // Set app version
-
-        await context.cms.system.setVersion(context.WEBINY_VERSION); // Set internal API key to access Read API
-
-        await context.cms.system.setReadAPIKey(createReadAPIKey());
-      },
-
-      async upgrade(version) {
-        const identity = context.security.getIdentity();
-
-        if (!identity) {
-          throw new _apiSecurity.NotAuthorizedError();
-        }
-
-        const upgradePlugins = context.plugins.byType("api-upgrade").filter(pl => pl.app === "headless-cms");
-        const plugin = (0, _apiUpgrade.getApplicablePlugin)({
-          deployedVersion: context.WEBINY_VERSION,
-          installedAppVersion: await this.getVersion(),
-          upgradePlugins,
-          upgradeToVersion: version
+        return readAPIKey;
+      }
+
+      return original.readAPIKey;
+    },
+    installSystem: async () => {
+      const identity = getIdentity();
+
+      if (!identity) {
+        throw new _apiSecurity.NotAuthorizedError();
+      }
+
+      const version = await getVersion();
+
+      if (version) {
+        return;
+      }
+
+      await onBeforeInstall.publish({
+        tenant: getTenant().id
+      });
+      /**
+       * Add default content model group.
+       */
+
+      try {
+        await context.cms.createGroup(initialContentModelGroup);
+      } catch (ex) {
+        throw new _error.default(ex.message, "CMS_INSTALLATION_CONTENT_MODEL_GROUP_ERROR", {
+          group: initialContentModelGroup
         });
-        await plugin.apply(context); // Store new app version
+      }
 
-        await context.cms.system.setVersion(version);
-        return true;
+      await onAfterInstall.publish({
+        tenant: getTenant().id
+      });
+      const system = {
+        version: context.WEBINY_VERSION,
+        readAPIKey: createReadAPIKey(),
+        tenant: getTenant().id
+      };
+      /**
+       * We need to create the system data.
+       */
+
+      await storageOperations.system.create({
+        system
+      });
+    },
+
+    async upgradeSystem(version) {
+      const identity = getIdentity();
+
+      if (!identity) {
+        throw new _apiSecurity.NotAuthorizedError();
       }
 
+      const upgradePlugins = context.plugins.byType("api-upgrade").filter(pl => pl.app === "headless-cms");
+      const plugin = (0, _apiUpgrade.getApplicablePlugin)({
+        deployedVersion: context.WEBINY_VERSION,
+        installedAppVersion: await this.getVersion(),
+        upgradePlugins,
+        upgradeToVersion: version
+      });
+      await plugin.apply(context);
+      /**
+       * Store new app version.
+       */
+
+      await setVersion(version);
+      return true;
     }
-  });
-});
 
-exports.default = _default;
-//# sourceMappingURL=system.crud.js.map
+  };
+};
+
+exports.createSystemCrud = createSystemCrud;

package/plugins/graphql/system.js

@@ -28,7 +28,7 @@ var _default = {
     CmsQuery: {
       version: async (_, __, context) => {
         try {
-          return context.cms.system.getVersion();
+          return context.cms.getSystemVersion();
         } catch (e) {
           return new _handlerGraphql.ErrorResponse(e);
         }
@@ -39,7 +39,7 @@ var _default = {
         cms
       }) => {
         try {
-          const version = await cms.system.getVersion();
+          const version = await cms.getSystemVersion();
 
           if (version) {
             return new _handlerGraphql.ErrorResponse({
@@ -48,7 +48,7 @@ var _default = {
             });
           }
 
-          await cms.system.install();
+          await cms.installSystem();
           return new _handlerGraphql.Response(true);
         } catch (e) {
           return new _handlerGraphql.ErrorResponse(e);
@@ -60,7 +60,7 @@ var _default = {
         cms
       }) => {
         try {
-          await cms.system.upgrade(version);
+          await cms.upgradeSystem(version);
           return new _handlerGraphql.Response(true);
         } catch (e) {
           return new _handlerGraphql.ErrorResponse(e);
@@ -69,5 +69,4 @@ var _default = {
     }
   }
 };
-exports.default = _default;
-//# sourceMappingURL=system.js.map
+exports.default = _default;

package/plugins/graphql.d.ts

@@ -1,3 +1,2 @@
 import { GraphQLSchemaPlugin } from "@webiny/handler-graphql/types";
-declare const _default: () => GraphQLSchemaPlugin<import("@webiny/handler/types").ContextInterface>[];
-export default _default;
+export declare const createGraphQLPlugin: () => GraphQLSchemaPlugin;

package/plugins/graphql.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.createGraphQLPlugin = void 0;
 
 var _merge = _interopRequireDefault(require("lodash/merge"));
 
@@ -13,58 +13,58 @@ var _system = _interopRequireDefault(require("./graphql/system"));
 
 const emptyResolver = () => ({});
 
-var _default = () => [{
+const createGraphQLPlugin = () => ({
   name: "graphql-schema-headless",
   type: "graphql-schema",
   schema: {
     typeDefs:
     /* GraphQL */
     `
-                type CmsError {
-                    code: String
-                    message: String
-                    data: JSON
-                }
-
-                type CmsCursors {
-                    next: String
-                    previous: String
-                }
-
-                type CmsListMeta {
-                    cursor: String
-                    hasMoreItems: Boolean
-                    totalCount: Int
-                }
-
-                type CmsDeleteResponse {
-                    data: Boolean
-                    error: CmsError
-                }
-
-                type CmsBooleanResponse {
-                    data: Boolean
-                    error: CmsError
-                }
-
-                extend type Query {
-                    cms: CmsQuery
-                }
-
-                extend type Mutation {
-                    cms: CmsMutation
-                }
-
-                type CmsQuery {
-                    _empty: String
-                }
-
-                type CmsMutation {
-                    _empty: String
-                }
-
-                ${_system.default.typeDefs}
-            `,
+            type CmsError {
+                code: String
+                message: String
+                data: JSON
+            }
+
+            type CmsCursors {
+                next: String
+                previous: String
+            }
+
+            type CmsListMeta {
+                cursor: String
+                hasMoreItems: Boolean
+                totalCount: Int
+            }
+
+            type CmsDeleteResponse {
+                data: Boolean
+                error: CmsError
+            }
+
+            type CmsBooleanResponse {
+                data: Boolean
+                error: CmsError
+            }
+
+            extend type Query {
+                cms: CmsQuery
+            }
+
+            extend type Mutation {
+                cms: CmsMutation
+            }
+
+            type CmsQuery {
+                _empty: String
+            }
+
+            type CmsMutation {
+                _empty: String
+            }
+
+            ${_system.default.typeDefs}
+        `,
     resolvers: (0, _merge.default)({
       Query: {
         cms: emptyResolver
@@ -74,7 +74,6 @@ var _default = () => [{
       }
     }, _system.default.resolvers)
   }
-}];
+});
 
-exports.default = _default;
-//# sourceMappingURL=graphql.js.map
+exports.createGraphQLPlugin = createGraphQLPlugin;

package/plugins/upgrades/index.js

@@ -11,5 +11,4 @@ var _v = _interopRequireDefault(require("./v5.5.0"));
 
 var _default = () => [_v.default];
 
-exports.default = _default;
-//# sourceMappingURL=index.js.map
+exports.default = _default;

package/plugins/upgrades/v5.5.0/helpers.js

@@ -7,5 +7,4 @@ exports.isCmsContentPermission = void 0;
 
 const isCmsContentPermission = permission => permission.name.includes("cms.") && !permission.name.includes("cms.endpoint.");
 
-exports.isCmsContentPermission = isCmsContentPermission;
-//# sourceMappingURL=helpers.js.map
+exports.isCmsContentPermission = isCmsContentPermission;

package/plugins/upgrades/v5.5.0/index.js

@@ -54,7 +54,7 @@ const plugin = {
         } // Migrate CMS permissions
 
 
-        const newCMSContentPermissions = await (0, _migrateCMSPermissions.migrateCMSPermissions)(CmsContentPermissions, cms.models.get);
+        const newCMSContentPermissions = await (0, _migrateCMSPermissions.migrateCMSPermissions)(CmsContentPermissions, cms.getModel);
         const newPermissions = [...restPermissions, ...newCMSContentPermissions];
         console.log(`Saving new permissions for group: ${securityGroup.slug}`);
         console.log("newPermissions: ", JSON.stringify(newPermissions, null, 2)); // Save group
@@ -103,7 +103,7 @@ const plugin = {
         } // Migrate CMS permissions.
 
 
-        const newCMSContentPermissions = await (0, _migrateCMSPermissions.migrateCMSPermissions)(CmsContentPermissions, cms.models.get);
+        const newCMSContentPermissions = await (0, _migrateCMSPermissions.migrateCMSPermissions)(CmsContentPermissions, cms.getModel);
         const newPermissions = [...restPermissions, ...newCMSContentPermissions];
         console.log(`Saving new permissions for API key: ${apiKey.name}`);
         console.log("newPermissions: ", JSON.stringify(newPermissions, null, 2)); // Save API key
@@ -126,5 +126,4 @@ const plugin = {
 
 };
 var _default = plugin;
-exports.default = _default;
-//# sourceMappingURL=index.js.map
+exports.default = _default;

package/transformers.js

@@ -22,5 +22,4 @@ Object.defineProperty(exports, "entryToStorageTransform", {
   }
 });
 
-var _entryStorage = require("./content/plugins/utils/entryStorage");
-//# sourceMappingURL=transformers.js.map
+var _entryStorage = require("./content/plugins/utils/entryStorage");