payload-plugin-newsletter 0.13.2 → 0.14.0

package/dist/index.js

@@ -1261,6 +1261,44 @@ var createNewsletterSettingsGlobal = (pluginConfig) => {
               }
             ]
           },
+          {
+            label: "Brand Settings",
+            fields: [
+              {
+                name: "brandSettings",
+                type: "group",
+                label: "Brand Settings",
+                fields: [
+                  {
+                    name: "siteName",
+                    type: "text",
+                    label: "Site Name",
+                    required: true,
+                    defaultValue: "Newsletter",
+                    admin: {
+                      description: "Your website or newsletter name"
+                    }
+                  },
+                  {
+                    name: "siteUrl",
+                    type: "text",
+                    label: "Site URL",
+                    admin: {
+                      description: "Your website URL (optional)"
+                    }
+                  },
+                  {
+                    name: "logoUrl",
+                    type: "text",
+                    label: "Logo URL",
+                    admin: {
+                      description: "URL to your logo image (optional)"
+                    }
+                  }
+                ]
+              }
+            ]
+          },
           {
             label: "Email Templates",
             fields: [
@@ -1944,10 +1982,13 @@ function verifySessionToken(token) {
     throw error;
   }
 }
-function generateMagicLinkURL(token, baseURL, config) {
+function generateMagicLinkURL(token, baseURL, config, redirectUrl) {
   const path = config.auth?.magicLinkPath || "/newsletter/verify";
   const url = new URL(path, baseURL);
   url.searchParams.set("token", token);
+  if (redirectUrl) {
+    url.searchParams.set("redirect", redirectUrl);
+  }
   return url.toString();
 }
 
@@ -2001,20 +2042,93 @@ var createSubscribeEndpoint = (config) => {
         if (existing.docs.length > 0) {
           const subscriber2 = existing.docs[0];
           if (subscriber2.subscriptionStatus === "unsubscribed") {
+            const allowResubscribe = config.auth?.allowResubscribe ?? false;
+            if (!allowResubscribe) {
+              return Response.json({
+                success: false,
+                error: "This email has been unsubscribed. Please contact support to resubscribe."
+              }, { status: 400 });
+            }
+            const updated = await req.payload.update({
+              collection: config.subscribersSlug || "subscribers",
+              id: subscriber2.id,
+              data: {
+                subscriptionStatus: "active",
+                resubscribedAt: (/* @__PURE__ */ new Date()).toISOString(),
+                // Preserve preferences but update metadata
+                signupMetadata: {
+                  ...metadata,
+                  source: source || "resubscribe",
+                  resubscribedFrom: subscriber2.signupMetadata?.source
+                }
+              },
+              overrideAccess: true
+            });
+            if (config.hooks?.afterSubscribe) {
+              await config.hooks.afterSubscribe({
+                doc: updated,
+                req
+              });
+            }
+            const emailService = req.payload.newsletterEmailService;
+            if (emailService) {
+              const settings2 = await req.payload.findGlobal({
+                slug: config.settingsSlug || "newsletter-settings"
+              });
+              const html = await renderEmail("welcome", {
+                name: updated.name || "",
+                email: updated.email,
+                siteName: settings2?.brandSettings?.siteName || "Newsletter",
+                siteUrl: req.payload.config.serverURL || ""
+              });
+              await emailService.send({
+                to: updated.email,
+                subject: `Welcome back to ${settings2?.brandSettings?.siteName || "our newsletter"}!`,
+                html
+              });
+            }
             return Response.json({
-              success: false,
-              error: "This email has been unsubscribed. Please contact support to resubscribe."
-            }, { status: 400 });
+              success: true,
+              message: "Welcome back! You have been resubscribed.",
+              subscriber: {
+                id: updated.id,
+                email: updated.email,
+                subscriptionStatus: updated.subscriptionStatus
+              },
+              wasResubscribed: true
+            });
           }
-          return Response.json({
-            success: false,
-            error: "Already subscribed",
-            subscriber: {
-              id: subscriber2.id,
-              email: subscriber2.email,
-              subscriptionStatus: subscriber2.subscriptionStatus
+          if (subscriber2.subscriptionStatus === "active") {
+            const token = generateMagicLinkToken(
+              String(subscriber2.id),
+              subscriber2.email,
+              config
+            );
+            const serverURL = req.payload.config.serverURL || process.env.PAYLOAD_PUBLIC_SERVER_URL || "";
+            const magicLinkURL = generateMagicLinkURL(token, serverURL, config);
+            const emailService = req.payload.newsletterEmailService;
+            if (emailService) {
+              const settings2 = await req.payload.findGlobal({
+                slug: config.settingsSlug || "newsletter-settings"
+              });
+              const html = await renderEmail("signin", {
+                magicLink: magicLinkURL,
+                email: subscriber2.email,
+                siteName: settings2?.brandSettings?.siteName || "Newsletter",
+                expiresIn: config.auth?.tokenExpiration || "7d"
+              });
+              await emailService.send({
+                to: subscriber2.email,
+                subject: `Sign in to ${settings2?.brandSettings?.siteName || "your account"}`,
+                html
+              });
             }
-          }, { status: 400 });
+            return Response.json({
+              success: true,
+              message: "You are already subscribed! Check your email for a sign-in link.",
+              alreadySubscribed: true
+            });
+          }
         }
         const ipAddress = req.ip || req.connection?.remoteAddress;
         const maxPerIP = settings?.subscriptionSettings?.maxSubscribersPerIP || 10;
@@ -2536,7 +2650,7 @@ var createSigninEndpoint = (config) => {
     handler: async (req) => {
       try {
         const data = await req.json();
-        const { email } = data;
+        const { email, redirectUrl } = data;
         const validation = validateSubscriberData({ email });
         if (!validation.valid) {
           return Response.json({
@@ -2555,8 +2669,7 @@ var createSigninEndpoint = (config) => {
         const result = await req.payload.find({
           collection: config.subscribersSlug || "subscribers",
           where: {
-            email: { equals: email.toLowerCase() },
-            subscriptionStatus: { equals: "active" }
+            email: { equals: email.toLowerCase() }
           },
           limit: 1,
           overrideAccess: true
@@ -2565,17 +2678,31 @@ var createSigninEndpoint = (config) => {
         if (result.docs.length === 0) {
           return Response.json({
             success: false,
-            error: "Email not found. Please subscribe first."
+            error: "Email not found. Please subscribe first.",
+            requiresSubscribe: true
           }, { status: 404 });
         }
         const subscriber = result.docs[0];
+        const allowUnsubscribed = config.auth?.allowUnsubscribedSignin ?? false;
+        if (subscriber.subscriptionStatus === "unsubscribed" && !allowUnsubscribed) {
+          return Response.json({
+            success: false,
+            error: "Your subscription is inactive. Please resubscribe to sign in.",
+            subscriber: {
+              id: subscriber.id,
+              email: subscriber.email,
+              subscriptionStatus: subscriber.subscriptionStatus
+            },
+            requiresResubscribe: true
+          }, { status: 403 });
+        }
         const token = generateMagicLinkToken(
           String(subscriber.id),
           subscriber.email,
           config
         );
         const serverURL = req.payload.config.serverURL || process.env.PAYLOAD_PUBLIC_SERVER_URL || "";
-        const magicLinkURL = generateMagicLinkURL(token, serverURL, config);
+        const magicLinkURL = generateMagicLinkURL(token, serverURL, config, redirectUrl);
         const emailService = req.payload.newsletterEmailService;
         if (emailService) {
           const settings = await req.payload.findGlobal({