payload-plugin-newsletter 0.16.0 → 0.16.2

package/dist/index.cjs

@@ -2898,6 +2898,29 @@ async function requireAdmin(req, config) {
   };
 }
 
+// src/utils/getBroadcastConfig.ts
+async function getBroadcastConfig(req, pluginConfig) {
+  try {
+    const settings = await req.payload.findGlobal({
+      slug: pluginConfig.settingsSlug || "newsletter-settings",
+      req
+    });
+    if (settings?.provider === "broadcast" && settings?.broadcastSettings) {
+      return {
+        apiUrl: settings.broadcastSettings.apiUrl || pluginConfig.providers?.broadcast?.apiUrl || "",
+        token: settings.broadcastSettings.token || pluginConfig.providers?.broadcast?.token || "",
+        fromAddress: settings.fromAddress || pluginConfig.providers?.broadcast?.fromAddress || "",
+        fromName: settings.fromName || pluginConfig.providers?.broadcast?.fromName || "",
+        replyTo: settings.replyTo || pluginConfig.providers?.broadcast?.replyTo
+      };
+    }
+    return pluginConfig.providers?.broadcast || null;
+  } catch (error) {
+    req.payload.logger.error("Failed to get broadcast config from settings:", error);
+    return pluginConfig.providers?.broadcast || null;
+  }
+}
+
 // src/endpoints/broadcasts/send.ts
 var createSendBroadcastEndpoint = (config, collectionSlug) => {
   return {
@@ -2939,11 +2962,11 @@ var createSendBroadcastEndpoint = (config, collectionSlug) => {
             error: "Broadcast not found or not synced with provider"
           }, { status: 404 });
         }
-        const providerConfig = config.providers?.broadcast;
-        if (!providerConfig) {
+        const providerConfig = await getBroadcastConfig(req, config);
+        if (!providerConfig || !providerConfig.token) {
           return Response.json({
             success: false,
-            error: "Broadcast provider not configured"
+            error: "Broadcast provider not configured in Newsletter Settings or environment variables"
           }, { status: 500 });
         }
         const { BroadcastApiProvider: BroadcastApiProvider2 } = await Promise.resolve().then(() => (init_broadcast2(), broadcast_exports));
@@ -4339,9 +4362,9 @@ var createBroadcastsCollection = (pluginConfig) => {
         async ({ doc, operation, req }) => {
           if (!hasProviders || operation !== "create") return doc;
           try {
-            const providerConfig = pluginConfig.providers?.broadcast;
-            if (!providerConfig) {
-              req.payload.logger.error("Broadcast provider not configured");
+            const providerConfig = await getBroadcastConfig(req, pluginConfig);
+            if (!providerConfig || !providerConfig.token) {
+              req.payload.logger.error("Broadcast provider not configured in Newsletter Settings or environment variables");
               return doc;
             }
             const { BroadcastApiProvider: BroadcastApiProvider2 } = await Promise.resolve().then(() => (init_broadcast2(), broadcast_exports));
@@ -4376,6 +4399,51 @@ var createBroadcastsCollection = (pluginConfig) => {
             req.payload.logger.error("Failed to create broadcast in provider:", error);
             return doc;
           }
+        },
+        // Hook to send when published
+        async ({ doc, operation, previousDoc, req }) => {
+          if (operation !== "update") return doc;
+          const wasUnpublished = !previousDoc?._status || previousDoc._status === "draft";
+          const isNowPublished = doc._status === "published";
+          if (wasUnpublished && isNowPublished && doc.providerId) {
+            if (doc.status === "sent" || doc.status === "sending") {
+              return doc;
+            }
+            try {
+              const broadcastConfig = await getBroadcastConfig(req, pluginConfig);
+              const resendConfig = pluginConfig.providers?.resend;
+              if (!broadcastConfig && !resendConfig) {
+                req.payload.logger.error("No provider configured for sending in Newsletter Settings or environment variables");
+                return doc;
+              }
+              if (broadcastConfig && broadcastConfig.token) {
+                const { BroadcastApiProvider: BroadcastApiProvider2 } = await Promise.resolve().then(() => (init_broadcast2(), broadcast_exports));
+                const provider = new BroadcastApiProvider2(broadcastConfig);
+                await provider.send(doc.providerId);
+              }
+              await req.payload.update({
+                collection: "broadcasts",
+                id: doc.id,
+                data: {
+                  status: "sending" /* SENDING */,
+                  sentAt: (/* @__PURE__ */ new Date()).toISOString()
+                },
+                req
+              });
+              req.payload.logger.info(`Broadcast ${doc.id} sent successfully`);
+            } catch (error) {
+              req.payload.logger.error(`Failed to send broadcast ${doc.id}:`, error);
+              await req.payload.update({
+                collection: "broadcasts",
+                id: doc.id,
+                data: {
+                  status: "failed" /* FAILED */
+                },
+                req
+              });
+            }
+          }
+          return doc;
         }
       ],
       // Sync updates with provider
@@ -4383,9 +4451,9 @@ var createBroadcastsCollection = (pluginConfig) => {
         async ({ data, originalDoc, operation, req }) => {
           if (!hasProviders || !originalDoc?.providerId || operation !== "update") return data;
           try {
-            const providerConfig = pluginConfig.providers?.broadcast;
-            if (!providerConfig) {
-              req.payload.logger.error("Broadcast provider not configured");
+            const providerConfig = await getBroadcastConfig(req, pluginConfig);
+            if (!providerConfig || !providerConfig.token) {
+              req.payload.logger.error("Broadcast provider not configured in Newsletter Settings or environment variables");
               return data;
             }
             const { BroadcastApiProvider: BroadcastApiProvider2 } = await Promise.resolve().then(() => (init_broadcast2(), broadcast_exports));
@@ -4429,9 +4497,9 @@ var createBroadcastsCollection = (pluginConfig) => {
         async ({ doc, req }) => {
           if (!hasProviders || !doc?.providerId) return doc;
           try {
-            const providerConfig = pluginConfig.providers?.broadcast;
-            if (!providerConfig) {
-              req.payload.logger.error("Broadcast provider not configured");
+            const providerConfig = await getBroadcastConfig(req, pluginConfig);
+            if (!providerConfig || !providerConfig.token) {
+              req.payload.logger.error("Broadcast provider not configured in Newsletter Settings or environment variables");
               return doc;
             }
             const { BroadcastApiProvider: BroadcastApiProvider2 } = await Promise.resolve().then(() => (init_broadcast2(), broadcast_exports));
@@ -4444,48 +4512,6 @@ var createBroadcastsCollection = (pluginConfig) => {
             req.payload.logger.error("Failed to delete broadcast from provider:", error);
           }
           return doc;
-        },
-        // Hook to send when published
-        async ({ doc, req }) => {
-          if (doc._status === "published" && doc.providerId) {
-            if (doc.status === "sent" || doc.status === "sending") {
-              return doc;
-            }
-            try {
-              const broadcastConfig = pluginConfig.providers?.broadcast;
-              const resendConfig = pluginConfig.providers?.resend;
-              if (!broadcastConfig && !resendConfig) {
-                req.payload.logger.error("No provider configured for sending");
-                return doc;
-              }
-              if (broadcastConfig) {
-                const { BroadcastApiProvider: BroadcastApiProvider2 } = await Promise.resolve().then(() => (init_broadcast2(), broadcast_exports));
-                const provider = new BroadcastApiProvider2(broadcastConfig);
-                await provider.send(doc.providerId);
-              }
-              await req.payload.update({
-                collection: "broadcasts",
-                id: doc.id,
-                data: {
-                  status: "sending" /* SENDING */,
-                  sentAt: (/* @__PURE__ */ new Date()).toISOString()
-                },
-                req
-              });
-              req.payload.logger.info(`Broadcast ${doc.id} sent successfully`);
-            } catch (error) {
-              req.payload.logger.error(`Failed to send broadcast ${doc.id}:`, error);
-              await req.payload.update({
-                collection: "broadcasts",
-                id: doc.id,
-                data: {
-                  status: "failed" /* FAILED */
-                },
-                req
-              });
-            }
-          }
-          return doc;
         }
       ]
     }