payload-plugin-newsletter 0.16.1 → 0.16.3

package/dist/collections.js

@@ -1149,6 +1149,29 @@ function wrapInEmailTemplate(content, preheader) {
 </html>`;
 }
 
+// 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/collections/Broadcasts.ts
 var createBroadcastsCollection = (pluginConfig) => {
   const hasProviders = !!(pluginConfig.providers?.broadcast || pluginConfig.providers?.resend);
@@ -1389,9 +1412,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));
@@ -1423,7 +1446,17 @@ var createBroadcastsCollection = (pluginConfig) => {
               providerData: providerBroadcast.providerData
             };
           } catch (error) {
-            req.payload.logger.error("Failed to create broadcast in provider:", error);
+            if (error instanceof Error) {
+              req.payload.logger.error("Failed to create broadcast in provider:", {
+                message: error.message,
+                stack: error.stack,
+                name: error.name,
+                // If it's a BroadcastProviderError, it might have additional details
+                ...error.details
+              });
+            } else {
+              req.payload.logger.error("Failed to create broadcast in provider:", error);
+            }
             return doc;
           }
         },
@@ -1437,13 +1470,13 @@ var createBroadcastsCollection = (pluginConfig) => {
               return doc;
             }
             try {
-              const broadcastConfig = pluginConfig.providers?.broadcast;
+              const broadcastConfig = await getBroadcastConfig(req, pluginConfig);
               const resendConfig = pluginConfig.providers?.resend;
               if (!broadcastConfig && !resendConfig) {
-                req.payload.logger.error("No provider configured for sending");
+                req.payload.logger.error("No provider configured for sending in Newsletter Settings or environment variables");
                 return doc;
               }
-              if (broadcastConfig) {
+              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);
@@ -1459,7 +1492,17 @@ var createBroadcastsCollection = (pluginConfig) => {
               });
               req.payload.logger.info(`Broadcast ${doc.id} sent successfully`);
             } catch (error) {
-              req.payload.logger.error(`Failed to send broadcast ${doc.id}:`, error);
+              if (error instanceof Error) {
+                req.payload.logger.error(`Failed to send broadcast ${doc.id}:`, {
+                  message: error.message,
+                  stack: error.stack,
+                  name: error.name,
+                  // If it's a BroadcastProviderError, it might have additional details
+                  ...error.details
+                });
+              } else {
+                req.payload.logger.error(`Failed to send broadcast ${doc.id}:`, error);
+              }
               await req.payload.update({
                 collection: "broadcasts",
                 id: doc.id,
@@ -1478,9 +1521,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));
@@ -1514,7 +1557,17 @@ var createBroadcastsCollection = (pluginConfig) => {
               await provider.update(originalDoc.providerId, updates);
             }
           } catch (error) {
-            req.payload.logger.error("Failed to update broadcast in provider:", error);
+            if (error instanceof Error) {
+              req.payload.logger.error("Failed to update broadcast in provider:", {
+                message: error.message,
+                stack: error.stack,
+                name: error.name,
+                // If it's a BroadcastProviderError, it might have additional details
+                ...error.details
+              });
+            } else {
+              req.payload.logger.error("Failed to update broadcast in provider:", error);
+            }
           }
           return data;
         }
@@ -1524,9 +1577,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));
@@ -1536,7 +1589,17 @@ var createBroadcastsCollection = (pluginConfig) => {
               await provider.delete(doc.providerId);
             }
           } catch (error) {
-            req.payload.logger.error("Failed to delete broadcast from provider:", error);
+            if (error instanceof Error) {
+              req.payload.logger.error("Failed to delete broadcast from provider:", {
+                message: error.message,
+                stack: error.stack,
+                name: error.name,
+                // If it's a BroadcastProviderError, it might have additional details
+                ...error.details
+              });
+            } else {
+              req.payload.logger.error("Failed to delete broadcast from provider:", error);
+            }
           }
           return doc;
         }