payload-plugin-newsletter 0.16.1 → 0.16.2

package/dist/index.js

@@ -2881,6 +2881,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 {
@@ -2922,11 +2945,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));
@@ -4387,13 +4410,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);
@@ -4428,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));
@@ -4474,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));