payload-plugin-newsletter 0.25.1 → 0.25.3

package/dist/server.js

@@ -1602,7 +1602,7 @@ var createSubscribeEndpoint = (config) => {
   return {
     path: "/newsletter/subscribe",
     method: "post",
-    handler: async (req) => {
+    handler: (async (req) => {
       try {
         const data = await req.json();
         const {
@@ -1837,7 +1837,7 @@ var createSubscribeEndpoint = (config) => {
           error: "Failed to subscribe. Please try again."
         }, { status: 500 });
       }
-    }
+    })
   };
 };
 
@@ -1846,7 +1846,7 @@ var createVerifyMagicLinkEndpoint = (config) => {
   return {
     path: "/newsletter/verify-magic-link",
     method: "post",
-    handler: async (req) => {
+    handler: (async (req) => {
       try {
         const data = await req.json();
         const { token } = data;
@@ -1966,7 +1966,7 @@ var createVerifyMagicLinkEndpoint = (config) => {
           error: "Failed to verify magic link"
         }, { status: 500 });
       }
-    }
+    })
   };
 };
 
@@ -1975,7 +1975,7 @@ var createPreferencesEndpoint = (config) => {
   return {
     path: "/newsletter/preferences",
     method: "get",
-    handler: async (req) => {
+    handler: (async (req) => {
       try {
         const authHeader = req.headers.get("authorization");
         if (!authHeader || !authHeader.startsWith("Bearer ")) {
@@ -2028,14 +2028,14 @@ var createPreferencesEndpoint = (config) => {
           error: "Failed to get preferences"
         }, { status: 500 });
       }
-    }
+    })
   };
 };
 var createUpdatePreferencesEndpoint = (config) => {
   return {
     path: "/newsletter/preferences",
     method: "post",
-    handler: async (req) => {
+    handler: (async (req) => {
       try {
         const authHeader = req.headers.get("authorization");
         if (!authHeader || !authHeader.startsWith("Bearer ")) {
@@ -2095,7 +2095,7 @@ var createUpdatePreferencesEndpoint = (config) => {
           error: "Failed to update preferences"
         }, { status: 500 });
       }
-    }
+    })
   };
 };
 
@@ -2104,7 +2104,7 @@ var createUnsubscribeEndpoint = (config) => {
   return {
     path: "/newsletter/unsubscribe",
     method: "post",
-    handler: async (req) => {
+    handler: (async (req) => {
       try {
         const data = await req.json();
         const { email, token } = data;
@@ -2195,7 +2195,7 @@ var createUnsubscribeEndpoint = (config) => {
           error: "Failed to unsubscribe. Please try again."
         }, { status: 500 });
       }
-    }
+    })
   };
 };
 
@@ -2252,7 +2252,7 @@ var createSigninEndpoint = (config) => {
   return {
     path: "/newsletter/signin",
     method: "post",
-    handler: async (req) => {
+    handler: (async (req) => {
       try {
         const data = await req.json();
         const { email, redirectUrl } = data;
@@ -2339,7 +2339,7 @@ var createSigninEndpoint = (config) => {
           error: "Failed to process sign-in request"
         }, { status: 500 });
       }
-    }
+    })
   };
 };
 
@@ -2348,7 +2348,7 @@ var createMeEndpoint = (config) => {
   return {
     path: "/newsletter/me",
     method: "get",
-    handler: async (req) => {
+    handler: (async (req) => {
       try {
         const cookieHeader = req.headers.get("cookie") || "";
         const cookies = Object.fromEntries(
@@ -2407,7 +2407,7 @@ var createMeEndpoint = (config) => {
           error: "Internal server error"
         }, { status: 500 });
       }
-    }
+    })
   };
 };
 
@@ -2416,7 +2416,7 @@ var createSignoutEndpoint = (_config) => {
   return {
     path: "/newsletter/signout",
     method: "post",
-    handler: (_req) => {
+    handler: ((_req) => {
       try {
         const headers = new Headers();
         headers.append("Set-Cookie", `newsletter-auth=; HttpOnly; Secure=${process.env.NODE_ENV === "production"}; SameSite=Lax; Path=/; Max-Age=0`);
@@ -2431,7 +2431,7 @@ var createSignoutEndpoint = (_config) => {
           error: "Failed to sign out"
         }, { status: 500 });
       }
-    }
+    })
   };
 };
 
@@ -4059,7 +4059,7 @@ var createSendBroadcastEndpoint = (config, collectionSlug) => {
   return {
     path: "/:id/send",
     method: "post",
-    handler: async (req) => {
+    handler: (async (req) => {
       try {
         const auth = await requireAdmin(req, config);
         if (!auth.authorized) {
@@ -4133,7 +4133,7 @@ var createSendBroadcastEndpoint = (config, collectionSlug) => {
           error: "Failed to send broadcast"
         }, { status: 500 });
       }
-    }
+    })
   };
 };
 
@@ -4142,7 +4142,7 @@ var createScheduleBroadcastEndpoint = (config, collectionSlug) => {
   return {
     path: "/:id/schedule",
     method: "post",
-    handler: async (req) => {
+    handler: (async (req) => {
       try {
         const auth = await requireAdmin(req, config);
         if (!auth.authorized) {
@@ -4236,7 +4236,7 @@ var createScheduleBroadcastEndpoint = (config, collectionSlug) => {
           error: "Failed to schedule broadcast"
         }, { status: 500 });
       }
-    }
+    })
   };
 };
 
@@ -4245,7 +4245,7 @@ var createTestBroadcastEndpoint = (config, collectionSlug) => {
   return {
     path: "/:id/test",
     method: "post",
-    handler: async (req) => {
+    handler: (async (req) => {
       try {
         const auth = await requireAdmin(req, config);
         if (!auth.authorized) {
@@ -4319,7 +4319,7 @@ var createTestBroadcastEndpoint = (config, collectionSlug) => {
           error: "Failed to send test email"
         }, { status: 500 });
       }
-    }
+    })
   };
 };
 
@@ -4395,6 +4395,10 @@ async function populateBlockMediaFields(node, payload, config) {
             }
           }
         }
+        if (field.type === "richText" && node.fields[field.name]) {
+          await populateRichTextUploads(node.fields[field.name], payload);
+          payload.logger?.info(`Processed rich text field ${field.name} for upload nodes`);
+        }
       }
     }
   }
@@ -4404,11 +4408,51 @@ async function populateBlockMediaFields(node, payload, config) {
     }
   }
 }
+async function populateRichTextUploads(content, payload) {
+  if (!content || typeof content !== "object") return;
+  if (content.root?.children) {
+    await processNodeArray(content.root.children);
+  }
+  if (Array.isArray(content)) {
+    await processNodeArray(content);
+  }
+  async function processNodeArray(nodes) {
+    await Promise.all(nodes.map(processNode));
+  }
+  async function processNode(node) {
+    if (!node || typeof node !== "object") return;
+    if (node.type === "upload" && node.relationTo === "media" && typeof node.value === "string" && node.value.match(/^[a-f0-9]{24}$/i)) {
+      try {
+        const media = await payload.findByID({
+          collection: "media",
+          id: node.value,
+          depth: 0
+        });
+        if (media) {
+          node.value = media;
+          payload.logger?.info(`Populated rich text upload node:`, {
+            mediaId: node.value,
+            mediaUrl: media.url,
+            filename: media.filename
+          });
+        }
+      } catch (error) {
+        payload.logger?.error(`Failed to populate rich text upload ${node.value}:`, error);
+      }
+    }
+    if (node.children && Array.isArray(node.children)) {
+      await processNodeArray(node.children);
+    }
+    if (node.root?.children && Array.isArray(node.root.children)) {
+      await processNodeArray(node.root.children);
+    }
+  }
+}
 var createBroadcastPreviewEndpoint = (config, _collectionSlug) => {
   return {
     path: "/preview",
     method: "post",
-    handler: async (req) => {
+    handler: (async (req) => {
       try {
         const data = await (req.json?.() || Promise.resolve({}));
         const { content, preheader, subject, documentData } = data;
@@ -4448,7 +4492,7 @@ var createBroadcastPreviewEndpoint = (config, _collectionSlug) => {
           error: "Failed to generate email preview"
         }, { status: 500 });
       }
-    }
+    })
   };
 };
 
@@ -4793,10 +4837,6 @@ var createBroadcastsCollection = (pluginConfig) => {
         async ({ doc, operation, req, previousDoc }) => {
           if (!hasProviders) return doc;
           if (operation === "create") {
-            if (!doc.subject || !doc.contentSection?.content) {
-              req.payload.logger.info("Skipping provider sync - broadcast has no subject or content yet");
-              return doc;
-            }
             try {
               const providerConfig = await getBroadcastConfig(req, pluginConfig);
               if (!providerConfig || !providerConfig.token) {
@@ -4805,45 +4845,32 @@ var createBroadcastsCollection = (pluginConfig) => {
               }
               const { BroadcastApiProvider: BroadcastApiProvider2 } = await import("./broadcast-VMCYSZRY.js");
               const provider = new BroadcastApiProvider2(providerConfig);
-              req.payload.logger.info("Populating media fields and converting content to HTML...");
-              const populatedContent = await populateMediaFields(doc.contentSection?.content, req.payload, pluginConfig);
-              const emailPreviewConfig = pluginConfig.customizations?.broadcasts?.emailPreview;
-              const htmlContent = await convertToEmailSafeHtml(populatedContent, {
-                wrapInTemplate: emailPreviewConfig?.wrapInTemplate ?? true,
-                customWrapper: emailPreviewConfig?.customWrapper,
-                preheader: doc.contentSection?.preheader,
-                subject: doc.subject,
-                documentData: doc,
-                // Pass entire document
-                customBlockConverter: pluginConfig.customizations?.broadcasts?.customBlockConverter
-              });
-              if (!htmlContent || htmlContent.trim() === "") {
-                req.payload.logger.info("Skipping provider sync - content is empty after conversion");
-                return doc;
-              }
+              const subject = doc.subject || `Draft Broadcast ${(/* @__PURE__ */ new Date()).toISOString()}`;
+              const htmlContent = doc.contentSection?.content ? await convertToEmailSafeHtml(
+                await populateMediaFields(doc.contentSection.content, req.payload, pluginConfig),
+                {
+                  wrapInTemplate: pluginConfig.customizations?.broadcasts?.emailPreview?.wrapInTemplate ?? true,
+                  customWrapper: pluginConfig.customizations?.broadcasts?.emailPreview?.customWrapper,
+                  preheader: doc.contentSection?.preheader,
+                  subject,
+                  documentData: doc,
+                  customBlockConverter: pluginConfig.customizations?.broadcasts?.customBlockConverter
+                }
+              ) : "<p>Draft content - to be updated</p>";
               const createData = {
-                name: doc.subject,
-                // Use subject as name since we removed the name field
-                subject: doc.subject,
-                preheader: doc.contentSection?.preheader,
+                name: subject,
+                // Use subject as name
+                subject,
+                preheader: doc.contentSection?.preheader || "",
                 content: htmlContent,
-                trackOpens: doc.settings?.trackOpens,
-                trackClicks: doc.settings?.trackClicks,
+                trackOpens: doc.settings?.trackOpens ?? true,
+                trackClicks: doc.settings?.trackClicks ?? true,
                 replyTo: doc.settings?.replyTo || providerConfig.replyTo,
-                audienceIds: doc.audienceIds?.map((a) => a.audienceId)
+                audienceIds: doc.audienceIds?.map((a) => a.audienceId) || []
               };
-              req.payload.logger.info("Creating broadcast with data:", {
-                name: createData.name,
+              req.payload.logger.info("Creating broadcast in provider with minimal data to establish association", {
                 subject: createData.subject,
-                preheader: createData.preheader || "NONE",
-                contentLength: htmlContent ? htmlContent.length : 0,
-                contentPreview: htmlContent ? htmlContent.substring(0, 100) + "..." : "EMPTY",
-                trackOpens: createData.trackOpens,
-                trackClicks: createData.trackClicks,
-                replyTo: createData.replyTo,
-                audienceIds: createData.audienceIds || [],
-                apiUrl: providerConfig.apiUrl,
-                hasToken: !!providerConfig.token
+                hasActualContent: !!doc.contentSection?.content
               });
               const providerBroadcast = await provider.create(createData);
               await req.payload.update({
@@ -4855,40 +4882,14 @@ var createBroadcastsCollection = (pluginConfig) => {
                 },
                 req
               });
+              req.payload.logger.info(`Broadcast ${doc.id} created in provider with ID ${providerBroadcast.id}`);
               return {
                 ...doc,
                 providerId: providerBroadcast.id,
                 providerData: providerBroadcast.providerData
               };
             } catch (error) {
-              req.payload.logger.error("Raw error from broadcast provider:");
-              req.payload.logger.error(error);
-              if (error instanceof Error) {
-                req.payload.logger.error("Error is instance of Error:", {
-                  message: error.message,
-                  stack: error.stack,
-                  name: error.name,
-                  // If it's a BroadcastProviderError, it might have additional details
-                  ...error.details,
-                  // Check if it's a fetch response error
-                  ...error.response,
-                  ...error.data,
-                  ...error.status,
-                  ...error.statusText
-                });
-              } else if (typeof error === "string") {
-                req.payload.logger.error("Error is a string:", error);
-              } else if (error && typeof error === "object") {
-                req.payload.logger.error("Error is an object:", JSON.stringify(error, null, 2));
-              } else {
-                req.payload.logger.error("Unknown error type:", typeof error);
-              }
-              req.payload.logger.error("Failed broadcast document:", {
-                id: doc.id,
-                subject: doc.subject,
-                hasContent: !!doc.contentSection?.content,
-                contentType: doc.contentSection?.content ? typeof doc.contentSection.content : "none"
-              });
+              req.payload.logger.error("Failed to create broadcast in provider during initial creation:", error);
               return doc;
             }
           }
@@ -4908,61 +4909,8 @@ var createBroadcastsCollection = (pluginConfig) => {
               const { BroadcastApiProvider: BroadcastApiProvider2 } = await import("./broadcast-VMCYSZRY.js");
               const provider = new BroadcastApiProvider2(providerConfig);
               if (!doc.providerId) {
-                if (!doc.subject || !doc.contentSection?.content) {
-                  req.payload.logger.info("Still missing required fields for provider sync");
-                  return doc;
-                }
-                req.payload.logger.info("Creating broadcast in provider (deferred from initial create)...");
-                const populatedContent = await populateMediaFields(doc.contentSection?.content, req.payload, pluginConfig);
-                const emailPreviewConfig = pluginConfig.customizations?.broadcasts?.emailPreview;
-                const htmlContent = await convertToEmailSafeHtml(populatedContent, {
-                  wrapInTemplate: emailPreviewConfig?.wrapInTemplate ?? true,
-                  customWrapper: emailPreviewConfig?.customWrapper,
-                  preheader: doc.contentSection?.preheader,
-                  subject: doc.subject,
-                  documentData: doc,
-                  // Pass entire document
-                  customBlockConverter: pluginConfig.customizations?.broadcasts?.customBlockConverter
-                });
-                if (!htmlContent || htmlContent.trim() === "") {
-                  req.payload.logger.info("Skipping provider sync - content is empty after conversion");
-                  return doc;
-                }
-                const createData = {
-                  name: doc.subject,
-                  subject: doc.subject,
-                  preheader: doc.contentSection?.preheader,
-                  content: htmlContent,
-                  trackOpens: doc.settings?.trackOpens,
-                  trackClicks: doc.settings?.trackClicks,
-                  replyTo: doc.settings?.replyTo || providerConfig.replyTo,
-                  audienceIds: doc.audienceIds?.map((a) => a.audienceId)
-                };
-                req.payload.logger.info("Creating broadcast with data:", {
-                  name: createData.name,
-                  subject: createData.subject,
-                  preheader: createData.preheader || "NONE",
-                  contentLength: htmlContent ? htmlContent.length : 0,
-                  contentPreview: htmlContent ? htmlContent.substring(0, 100) + "..." : "EMPTY",
-                  apiUrl: providerConfig.apiUrl,
-                  hasToken: !!providerConfig.token
-                });
-                const providerBroadcast = await provider.create(createData);
-                await req.payload.update({
-                  collection: "broadcasts",
-                  id: doc.id,
-                  data: {
-                    providerId: providerBroadcast.id,
-                    providerData: providerBroadcast.providerData
-                  },
-                  req
-                });
-                req.payload.logger.info(`Broadcast ${doc.id} created in provider successfully (deferred)`);
-                return {
-                  ...doc,
-                  providerId: providerBroadcast.id,
-                  providerData: providerBroadcast.providerData
-                };
+                req.payload.logger.warn(`Broadcast ${doc.id} has no providerId - provider sync skipped. This shouldn't happen with immediate creation.`);
+                return doc;
               }
               if (doc.providerId) {
                 const capabilities = provider.getCapabilities();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "payload-plugin-newsletter",
-  "version": "0.25.1",
+  "version": "0.25.3",
   "description": "Complete newsletter management plugin for Payload CMS with subscriber management, magic link authentication, and email service integration",
   "type": "module",
   "main": "./dist/index.js",

package/plugin-api-key-recommendations.md

@@ -1,117 +0,0 @@
-# Newsletter Plugin API Key Support Recommendations
-
-## Current Issue
-The broadcasts collection access control doesn't properly handle API key authentication. When users authenticate with `users API-Key {key}`, the `req.user` is undefined, causing 403 errors.
-
-## Recommended Changes
-
-### 1. Update Broadcasts Collection Access Control
-
-In `src/collections/Broadcasts.ts`, update the access control to check for API key authentication:
-
-```typescript
-access: {
-  read: () => true,
-  create: ({ req }) => {
-    // Check for standard user authentication
-    if (req.user) return true
-    
-    // Check for API key authentication
-    const authHeader = req.headers?.get?.('authorization') || 
-                      req.headers?.authorization || 
-                      req.headers?.['authorization']
-    
-    if (authHeader && typeof authHeader === 'string') {
-      // Payload uses "users API-Key {key}" format for API key auth
-      if (authHeader.startsWith('users API-Key ')) {
-        // When authenticated via API key, req.user might be undefined
-        // but the request is still authenticated
-        return true
-      }
-    }
-    
-    return false
-  },
-  update: ({ req }) => {
-    // Same logic as create
-    if (req.user) return true
-    
-    const authHeader = req.headers?.get?.('authorization') || 
-                      req.headers?.authorization || 
-                      req.headers?.['authorization']
-    
-    if (authHeader && typeof authHeader === 'string' && 
-        authHeader.startsWith('users API-Key ')) {
-      return true
-    }
-    
-    return false
-  },
-  delete: ({ req }) => {
-    // Same logic as create/update
-    if (req.user) return true
-    
-    const authHeader = req.headers?.get?.('authorization') || 
-                      req.headers?.authorization || 
-                      req.headers?.['authorization']
-    
-    if (authHeader && typeof authHeader === 'string' && 
-        authHeader.startsWith('users API-Key ')) {
-      return true
-    }
-    
-    return false
-  },
-},
-```
-
-### 2. Alternative: Create a Utility Function
-
-Create a utility function in `src/utils/checkApiKeyAuth.ts`:
-
-```typescript
-export function hasApiKeyAuth(req: any): boolean {
-  // Multiple ways to access headers depending on the request type
-  const authHeader = req.headers?.get?.('authorization') || 
-                     req.headers?.authorization || 
-                     req.headers?.['authorization']
-  
-  if (authHeader && typeof authHeader === 'string') {
-    return authHeader.startsWith('users API-Key ')
-  }
-  
-  return false
-}
-
-export function isAuthenticated(req: any): boolean {
-  return !!req.user || hasApiKeyAuth(req)
-}
-```
-
-Then use it in the access control:
-
-```typescript
-import { isAuthenticated } from '../utils/checkApiKeyAuth'
-
-// In Broadcasts collection
-access: {
-  read: () => true,
-  create: ({ req }) => isAuthenticated(req),
-  update: ({ req }) => isAuthenticated(req),
-  delete: ({ req }) => isAuthenticated(req),
-},
-```
-
-### 3. Version Bump
-After implementing these changes, bump the version to v0.16.5 with the changelog:
-- Fixed: API key authentication support for broadcasts collection
-- Fixed: Access control now properly handles requests authenticated via API keys
-
-## Testing
-The changes can be tested by:
-1. Creating an API key in Payload admin
-2. Making a POST request to `/api/broadcasts` with header `Authorization: users API-Key {key}`
-3. Verifying the broadcast is created successfully
-
-## Note
-The Payload CMS documentation doesn't clearly state that `req.user` is undefined for API key authenticated requests, but this is the observed behavior. The API key authentication is valid, but the user object isn't populated in the request context.