@strapi/content-manager 5.4.0 → 5.4.2

package/dist/server/index.mjs

@@ -1,5 +1,5 @@
 import strapiUtils, { validateYupSchema, errors, async, contentTypes as contentTypes$1, yup as yup$1, validateYupSchemaSync, policy, traverse, setCreatorFields, isOperatorOfType, relations as relations$1, traverseEntity, pagination } from "@strapi/utils";
-import { pick, omit, difference, castArray, intersection, pipe, propOr, isEqual, isEmpty, set, isNil as isNil$1, has, prop, assoc, mapValues, flow, uniq, uniqBy, concat, getOr, propEq, merge, groupBy } from "lodash/fp";
+import { pick, omit, difference, castArray, mergeWith, intersection, pipe, propOr, isEqual, isEmpty, set, isNil as isNil$1, has, prop, assoc, mapValues, flow, uniq, uniqBy, concat, getOr, propEq, merge, groupBy } from "lodash/fp";
 import "@strapi/types";
 import * as yup from "yup";
 import { scheduleJob } from "node-schedule";
@@ -714,13 +714,6 @@ const getFeature$1 = () => {
   };
 };
 const history = getFeature$1();
-const register = async ({ strapi: strapi2 }) => {
-  await history.register?.({ strapi: strapi2 });
-};
-const ALLOWED_WEBHOOK_EVENTS = {
-  ENTRY_PUBLISH: "entry.publish",
-  ENTRY_UNPUBLISH: "entry.unpublish"
-};
 const FEATURE_ID = "preview";
 const info = { pluginName: "content-manager", type: "admin" };
 const previewRouter = {
@@ -767,6 +760,10 @@ const validatePreviewUrl = async (strapi2, uid2, params) => {
     }
     newParams.documentId = doc?.documentId;
   }
+  if (!newParams.status) {
+    const isDPEnabled = model?.options?.draftAndPublish;
+    newParams.status = isDPEnabled ? "draft" : "published";
+  }
   return newParams;
 };
 const createPreviewController = () => {
@@ -812,8 +809,48 @@ const createPreviewService = ({ strapi: strapi2 }) => {
     }
   };
 };
+const extendMiddlewareConfiguration = (middleware = { name: "", config: {} }) => {
+  const middlewares = strapi.config.get("middlewares");
+  const configuredMiddlewares = middlewares.map((currentMiddleware) => {
+    if (currentMiddleware === middleware.name) {
+      return middleware;
+    }
+    if (currentMiddleware.name === middleware.name) {
+      return mergeWith(
+        (objValue, srcValue) => {
+          if (Array.isArray(objValue)) {
+            return objValue.concat(srcValue);
+          }
+          return void 0;
+        },
+        currentMiddleware,
+        middleware
+      );
+    }
+    return currentMiddleware;
+  });
+  strapi.config.set("middlewares", configuredMiddlewares);
+};
 const createPreviewConfigService = ({ strapi: strapi2 }) => {
   return {
+    register() {
+      if (!this.isEnabled()) {
+        return;
+      }
+      const config = strapi2.config.get("admin.preview");
+      if (config.config?.allowedOrigins) {
+        extendMiddlewareConfiguration({
+          name: "strapi::security",
+          config: {
+            contentSecurityPolicy: {
+              directives: {
+                "frame-src": config.config.allowedOrigins
+              }
+            }
+          }
+        });
+      }
+    },
     isEnabled() {
       const config = strapi2.config.get("admin.preview");
       if (!config) {
@@ -859,10 +896,12 @@ const getFeature = () => {
     return {};
   }
   return {
-    bootstrap() {
-      console.log("Bootstrapping preview server");
+    register() {
       const config = getService(strapi, "preview-config");
       config.validate();
+      config.register();
+    },
+    bootstrap() {
     },
     routes: routes$1,
     controllers: controllers$1,
@@ -870,6 +909,14 @@ const getFeature = () => {
   };
 };
 const preview = getFeature();
+const register = async ({ strapi: strapi2 }) => {
+  await history.register?.({ strapi: strapi2 });
+  await preview.register?.({ strapi: strapi2 });
+};
+const ALLOWED_WEBHOOK_EVENTS = {
+  ENTRY_PUBLISH: "entry.publish",
+  ENTRY_UNPUBLISH: "entry.unpublish"
+};
 const bootstrap = async () => {
   Object.entries(ALLOWED_WEBHOOK_EVENTS).forEach(([key, value]) => {
     strapi.get("webhookStore").addAllowedEvent(key, value);