@growth-labs/mailer 0.6.3 → 0.6.5

package/dist/routes/unsubscribe.d.ts

@@ -1,4 +1,21 @@
 import type { APIRoute } from 'astro';
-export declare const GET: APIRoute;
-export declare const POST: APIRoute;
+import type { Subscriber } from '../types.js';
+export type UnsubscribeSubscriber = Pick<Subscriber, 'id' | 'email' | 'name'>;
+export interface UnsubscribeRouteHooks {
+    /** Called only after the existing token verification succeeds. Read-only. */
+    lookupSubscriber?: (subscriberId: string) => Promise<UnsubscribeSubscriber | null>;
+    /**
+     * Commit the unsubscribe and return the subscriber ID used by the existing
+     * confirmation send and preferences page. Useful when a consumer keeps a
+     * canonical consent store and a legacy delivery/preferences mirror.
+     * Called only on POST, never on GET.
+     */
+    commitUnsubscribe?: (subscriber: UnsubscribeSubscriber) => Promise<string>;
+}
+/** Reuse the signed route, confirmation UI and one-click protocol with a consumer's subscriber store. */
+export declare function createUnsubscribeHandlers(hooks?: UnsubscribeRouteHooks): {
+    GET: APIRoute;
+    POST: APIRoute;
+};
+export declare const GET: APIRoute, POST: APIRoute;
 //# sourceMappingURL=unsubscribe.d.ts.map

package/dist/routes/unsubscribe.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"unsubscribe.d.ts","sourceRoot":"","sources":["../../src/routes/unsubscribe.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAgFrC,eAAO,MAAM,GAAG,EAAE,QA6BjB,CAAA;AAGD,eAAO,MAAM,IAAI,EAAE,QAkBlB,CAAA"}
+{"version":3,"file":"unsubscribe.d.ts","sourceRoot":"","sources":["../../src/routes/unsubscribe.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAA;AAGrC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AAmB7C,MAAM,MAAM,qBAAqB,GAAG,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,OAAO,GAAG,MAAM,CAAC,CAAA;AAE7E,MAAM,WAAW,qBAAqB;IACrC,6EAA6E;IAC7E,gBAAgB,CAAC,EAAE,CAAC,YAAY,EAAE,MAAM,KAAK,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC,CAAA;IAClF;;;;;OAKG;IACH,iBAAiB,CAAC,EAAE,CAAC,UAAU,EAAE,qBAAqB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAA;CAC1E;AAED,yGAAyG;AACzG,wBAAgB,yBAAyB,CAAC,KAAK,GAAE,qBAA0B,GAAG;IAC7E,GAAG,EAAE,QAAQ,CAAA;IACb,IAAI,EAAE,QAAQ,CAAA;CACd,CAwIA;AAED,eAAO,MAAQ,GAAG,YAAE,IAAI,UAAgC,CAAA"}

package/dist/routes/unsubscribe.js

@@ -6,109 +6,142 @@ import { emitMailerAnalyticsEvent } from '../utils/analytics.js';
 import { resolveSigningSecret, runtimeSecretErrorResponse, siteHost, } from '../utils/runtime-secrets.js';
 import { sendTransactional } from '../utils/send.js';
 import { getSubscriberById, unsubscribeSubscriber } from '../utils/subscribers.js';
+import { renderEmail } from '../utils/templates.js';
 import { generateToken, verifyToken } from '../utils/tokens.js';
 import { buildSiteUrl } from '../utils/urls.js';
-async function processUnsubscribe(token, context, request) {
-    const bindingsEnv = cloudflareEnv;
-    const requestUrl = request?.url ?? context?.url.toString() ?? config.siteUrl;
-    const signingSecret = await resolveSigningSecret(bindingsEnv, config, requestUrl);
-    if (!signingSecret.ok)
-        return { secretFailure: signingSecret };
-    // Verify token
-    const payload = await verifyToken(signingSecret.secret, token, siteHost(config.siteUrl));
-    if (!payload || payload.action !== 'unsubscribe') {
-        return { error: 'Invalid or expired token', status: 400 };
-    }
-    // Resolve bindings
-    const d1 = bindingsEnv[config.d1Binding];
-    // Schema probe — short-circuit with a Response on miss; both GET and POST
-    // handlers below forward it unchanged.
-    const schema = await probeMailerSchema(d1, config.d1Binding);
-    if (!schema.ok)
-        return { schemaMissing: true };
-    const db = drizzle(d1);
-    // Get subscriber
-    const subscriber = await getSubscriberById(db, payload.subscriberId);
-    if (!subscriber) {
-        return { error: 'Subscriber not found', status: 404 };
+const unsubscribeHeaders = {
+    'Cache-Control': 'private, no-store',
+    'Referrer-Policy': 'no-referrer',
+    'X-Robots-Tag': 'noindex, nofollow',
+};
+/** Reuse the signed route, confirmation UI and one-click protocol with a consumer's subscriber store. */
+export function createUnsubscribeHandlers(hooks = {}) {
+    async function resolveUnsubscribe(context) {
+        const { url, request } = context;
+        const token = url.searchParams.get('token');
+        if (!token) {
+            return {
+                ok: false,
+                response: new Response('Missing token', { status: 400, headers: unsubscribeHeaders }),
+            };
+        }
+        const bindingsEnv = cloudflareEnv;
+        const signingSecret = await resolveSigningSecret(bindingsEnv, config, request.url);
+        if (!signingSecret.ok)
+            return { ok: false, response: runtimeSecretErrorResponse(signingSecret) };
+        const payload = await verifyToken(signingSecret.secret, token, siteHost(config.siteUrl));
+        if (!payload || payload.action !== 'unsubscribe') {
+            return {
+                ok: false,
+                response: new Response('Invalid or expired token', {
+                    status: 400,
+                    headers: unsubscribeHeaders,
+                }),
+            };
+        }
+        const d1 = bindingsEnv[config.d1Binding];
+        const schema = await probeMailerSchema(d1, config.d1Binding);
+        if (!schema.ok)
+            return { ok: false, response: schemaMissingResponse() };
+        const db = drizzle(d1);
+        const subscriber = hooks.lookupSubscriber
+            ? await hooks.lookupSubscriber(payload.subscriberId)
+            : await getSubscriberById(db, payload.subscriberId);
+        if (!subscriber) {
+            return {
+                ok: false,
+                response: new Response('Subscriber not found', {
+                    status: 404,
+                    headers: unsubscribeHeaders,
+                }),
+            };
+        }
+        return { ok: true, db, subscriber, signingSecret: signingSecret.secret, token };
     }
-    // Unsubscribe
-    await unsubscribeSubscriber(db, payload.subscriberId);
-    // Send confirmation email — pass the full Worker env so config.d1Binding,
-    // config.queueBinding, and config.sendsD1Binding all resolve correctly.
-    await sendTransactional(bindingsEnv, config, {
-        to: subscriber.email,
-        subscriberId: subscriber.id,
-        subject: `You've been unsubscribed from ${config.senderName}`,
-        template: 'unsubscribe-confirm',
-        data: {
-            name: subscriber.name,
-            resubscribeUrl: buildSiteUrl(config.siteUrl, config.subscribePath),
-        },
-    });
-    emitMailerAnalyticsEvent(config, bindingsEnv, 'newsletter_unsubscribed', {
-        request,
-        context,
-        contentSlug: subscriber.id,
-        label: {
-            subscriberId: subscriber.id,
-            email: subscriber.email,
-        },
-    });
-    return {
-        success: true,
-        subscriberId: payload.subscriberId,
-        signingSecret: signingSecret.secret,
+    // GET: Link scanners may fetch this URL. Only POST may change consent.
+    const GET = async (context) => {
+        const result = await resolveUnsubscribe(context);
+        if (!result.ok)
+            return result.response;
+        const actionUrl = buildSiteUrl(config.siteUrl, config.unsubscribePath, {
+            token: result.token,
+            confirm: true,
+        });
+        return new Response(renderEmail(`<!doctype html>
+<html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1">
+<title>Unsubscribe — {{senderName}}</title></head>
+<body><main><h1>Unsubscribe</h1><form method="post" action="{{actionUrl}}"><button type="submit">Confirm</button></form></main></body></html>`, {
+            senderName: config.senderName,
+            siteUrl: config.siteUrl,
+            unsubscribeUrl: actionUrl,
+            preferencesUrl: '',
+            brand: config.brand,
+            actionUrl,
+        }), {
+            status: 200,
+            headers: {
+                ...unsubscribeHeaders,
+                // no-referrer makes native form POSTs send Origin: null. Keep the
+                // token out of Referer without breaking the host's CSRF check.
+                'Referrer-Policy': 'strict-origin',
+                'Content-Type': 'text/html; charset=utf-8',
+            },
+        });
+    };
+    // POST: the explicit confirmation or RFC 8058 List-Unsubscribe-Post.
+    const POST = async (context) => {
+        const result = await resolveUnsubscribe(context);
+        if (!result.ok)
+            return result.response;
+        const { db, subscriber, signingSecret } = result;
+        const { request, url } = context;
+        const bindingsEnv = cloudflareEnv;
+        let confirmationSubscriberId;
+        if (hooks.commitUnsubscribe) {
+            confirmationSubscriberId = await hooks.commitUnsubscribe(subscriber);
+        }
+        else {
+            await unsubscribeSubscriber(db, subscriber.id);
+            confirmationSubscriberId = subscriber.id;
+        }
+        // Pass the full Worker env so custom/split DB and queue bindings still work.
+        await sendTransactional(bindingsEnv, config, {
+            to: subscriber.email,
+            subscriberId: confirmationSubscriberId,
+            subject: `You've been unsubscribed from ${config.senderName}`,
+            template: 'unsubscribe-confirm',
+            data: {
+                name: subscriber.name,
+                resubscribeUrl: buildSiteUrl(config.siteUrl, config.subscribePath),
+            },
+        });
+        emitMailerAnalyticsEvent(config, bindingsEnv, 'newsletter_unsubscribed', {
+            request,
+            context,
+            contentSlug: subscriber.id,
+            label: { subscriberId: subscriber.id, email: subscriber.email },
+        });
+        if (url.searchParams.get('confirm') === 'true') {
+            const preferencesToken = await generateToken(signingSecret, {
+                subscriberId: confirmationSubscriberId,
+                action: 'preferences',
+                host: siteHost(config.siteUrl),
+            });
+            return new Response(null, {
+                status: 303,
+                headers: {
+                    ...unsubscribeHeaders,
+                    Location: buildSiteUrl(config.siteUrl, config.preferencesPath, {
+                        token: preferencesToken,
+                        unsubscribed: true,
+                    }),
+                },
+            });
+        }
+        // RFC 8058 one-click requests require no cookies and never redirect.
+        return new Response('OK', { status: 200, headers: unsubscribeHeaders });
     };
+    return { GET, POST };
 }
-// GET: Link from email footer
-export const GET = async (context) => {
-    const { url, request } = context;
-    const token = url.searchParams.get('token');
-    if (!token) {
-        return Response.json({ error: 'Missing token' }, { status: 400 });
-    }
-    const result = await processUnsubscribe(token, context, request);
-    if (result.secretFailure)
-        return runtimeSecretErrorResponse(result.secretFailure);
-    if ('schemaMissing' in result)
-        return schemaMissingResponse();
-    if ('error' in result) {
-        return Response.json({ error: result.error }, { status: result.status });
-    }
-    // Generate preferences token for the redirect
-    const preferencesToken = await generateToken(result.signingSecret, {
-        subscriberId: result.subscriberId,
-        action: 'preferences',
-        host: siteHost(config.siteUrl),
-    });
-    const preferencesUrl = buildSiteUrl(config.siteUrl, config.preferencesPath, {
-        token: preferencesToken,
-        unsubscribed: true,
-    });
-    return new Response(null, {
-        status: 302,
-        headers: { Location: preferencesUrl },
-    });
-};
-// POST: RFC 8058 List-Unsubscribe-Post
-export const POST = async (context) => {
-    const { request } = context;
-    // RFC 8058: body is "List-Unsubscribe=One-Click"
-    // Token comes from List-Unsubscribe header URL
-    const url = new URL(request.url);
-    const token = url.searchParams.get('token');
-    if (!token) {
-        return new Response('Missing token', { status: 400 });
-    }
-    const result = await processUnsubscribe(token, context, request);
-    if (result.secretFailure)
-        return runtimeSecretErrorResponse(result.secretFailure);
-    if ('schemaMissing' in result)
-        return schemaMissingResponse();
-    if ('error' in result) {
-        return new Response(result.error, { status: result.status });
-    }
-    return new Response('OK', { status: 200 });
-};
+export const { GET, POST } = createUnsubscribeHandlers();
 //# sourceMappingURL=unsubscribe.js.map

package/dist/routes/unsubscribe.js.map

@@ -1 +1 @@
-{"version":3,"file":"unsubscribe.js","sourceRoot":"","sources":["../../src/routes/unsubscribe.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"unsubscribe.js","sourceRoot":"","sources":["../../src/routes/unsubscribe.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,IAAI,aAAa,EAAE,MAAM,oBAAoB,CAAA;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,mCAAmC,CAAA;AAE1D,OAAO,EAAE,OAAO,EAAE,MAAM,gBAAgB,CAAA;AACxC,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AAEvF,OAAO,EAAE,wBAAwB,EAAE,MAAM,uBAAuB,CAAA;AAChE,OAAO,EACN,oBAAoB,EACpB,0BAA0B,EAC1B,QAAQ,GACR,MAAM,6BAA6B,CAAA;AACpC,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAA;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAA;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAA;AAE/C,MAAM,kBAAkB,GAAG;IAC1B,eAAe,EAAE,mBAAmB;IACpC,iBAAiB,EAAE,aAAa;IAChC,cAAc,EAAE,mBAAmB;CACnC,CAAA;AAgBD,yGAAyG;AACzG,MAAM,UAAU,yBAAyB,CAAC,QAA+B,EAAE;IAI1E,KAAK,UAAU,kBAAkB,CAAC,OAAgC;QACjE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,OAAO,CAAA;QAChC,MAAM,KAAK,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;QAC3C,IAAI,CAAC,KAAK,EAAE,CAAC;YACZ,OAAO;gBACN,EAAE,EAAE,KAAc;gBAClB,QAAQ,EAAE,IAAI,QAAQ,CAAC,eAAe,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC;aACrF,CAAA;QACF,CAAC;QACD,MAAM,WAAW,GAAG,aAAwC,CAAA;QAC5D,MAAM,aAAa,GAAG,MAAM,oBAAoB,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,CAAA;QAClF,IAAI,CAAC,aAAa,CAAC,EAAE;YACpB,OAAO,EAAE,EAAE,EAAE,KAAc,EAAE,QAAQ,EAAE,0BAA0B,CAAC,aAAa,CAAC,EAAE,CAAA;QAEnF,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,aAAa,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAA;QACxF,IAAI,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,KAAK,aAAa,EAAE,CAAC;YAClD,OAAO;gBACN,EAAE,EAAE,KAAc;gBAClB,QAAQ,EAAE,IAAI,QAAQ,CAAC,0BAA0B,EAAE;oBAClD,MAAM,EAAE,GAAG;oBACX,OAAO,EAAE,kBAAkB;iBAC3B,CAAC;aACF,CAAA;QACF,CAAC;QACD,MAAM,EAAE,GAAG,WAAW,CAAC,MAAM,CAAC,SAAS,CAAe,CAAA;QACtD,MAAM,MAAM,GAAG,MAAM,iBAAiB,CAAC,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,CAAA;QAC5D,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,OAAO,EAAE,EAAE,EAAE,KAAc,EAAE,QAAQ,EAAE,qBAAqB,EAAE,EAAE,CAAA;QAChF,MAAM,EAAE,GAAG,OAAO,CAAC,EAAE,CAAC,CAAA;QACtB,MAAM,UAAU,GAAG,KAAK,CAAC,gBAAgB;YACxC,CAAC,CAAC,MAAM,KAAK,CAAC,gBAAgB,CAAC,OAAO,CAAC,YAAY,CAAC;YACpD,CAAC,CAAC,MAAM,iBAAiB,CAAC,EAAE,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;QACpD,IAAI,CAAC,UAAU,EAAE,CAAC;YACjB,OAAO;gBACN,EAAE,EAAE,KAAc;gBAClB,QAAQ,EAAE,IAAI,QAAQ,CAAC,sBAAsB,EAAE;oBAC9C,MAAM,EAAE,GAAG;oBACX,OAAO,EAAE,kBAAkB;iBAC3B,CAAC;aACF,CAAA;QACF,CAAC;QACD,OAAO,EAAE,EAAE,EAAE,IAAa,EAAE,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,aAAa,CAAC,MAAM,EAAE,KAAK,EAAE,CAAA;IACzF,CAAC;IAED,uEAAuE;IACvE,MAAM,GAAG,GAAa,KAAK,EAAE,OAAO,EAAE,EAAE;QACvC,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAA;QAChD,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,OAAO,MAAM,CAAC,QAAQ,CAAA;QAEtC,MAAM,SAAS,GAAG,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,eAAe,EAAE;YACtE,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,OAAO,EAAE,IAAI;SACb,CAAC,CAAA;QACF,OAAO,IAAI,QAAQ,CAClB,WAAW,CACV;;;8IAG0I,EAC1I;YACC,UAAU,EAAE,MAAM,CAAC,UAAU;YAC7B,OAAO,EAAE,MAAM,CAAC,OAAO;YACvB,cAAc,EAAE,SAAS;YACzB,cAAc,EAAE,EAAE;YAClB,KAAK,EAAE,MAAM,CAAC,KAAK;YACnB,SAAS;SACT,CACD,EACD;YACC,MAAM,EAAE,GAAG;YACX,OAAO,EAAE;gBACR,GAAG,kBAAkB;gBACrB,kEAAkE;gBAClE,+DAA+D;gBAC/D,iBAAiB,EAAE,eAAe;gBAClC,cAAc,EAAE,0BAA0B;aAC1C;SACD,CACD,CAAA;IACF,CAAC,CAAA;IAED,qEAAqE;IACrE,MAAM,IAAI,GAAa,KAAK,EAAE,OAAO,EAAE,EAAE;QACxC,MAAM,MAAM,GAAG,MAAM,kBAAkB,CAAC,OAAO,CAAC,CAAA;QAChD,IAAI,CAAC,MAAM,CAAC,EAAE;YAAE,OAAO,MAAM,CAAC,QAAQ,CAAA;QACtC,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,MAAM,CAAA;QAChD,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,GAAG,OAAO,CAAA;QAChC,MAAM,WAAW,GAAG,aAAwC,CAAA;QAE5D,IAAI,wBAAgC,CAAA;QACpC,IAAI,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC7B,wBAAwB,GAAG,MAAM,KAAK,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAA;QACrE,CAAC;aAAM,CAAC;YACP,MAAM,qBAAqB,CAAC,EAAE,EAAE,UAAU,CAAC,EAAE,CAAC,CAAA;YAC9C,wBAAwB,GAAG,UAAU,CAAC,EAAE,CAAA;QACzC,CAAC;QACD,6EAA6E;QAC7E,MAAM,iBAAiB,CAAC,WAAW,EAAE,MAAM,EAAE;YAC5C,EAAE,EAAE,UAAU,CAAC,KAAK;YACpB,YAAY,EAAE,wBAAwB;YACtC,OAAO,EAAE,iCAAiC,MAAM,CAAC,UAAU,EAAE;YAC7D,QAAQ,EAAE,qBAAqB;YAC/B,IAAI,EAAE;gBACL,IAAI,EAAE,UAAU,CAAC,IAAI;gBACrB,cAAc,EAAE,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,aAAa,CAAC;aAClE;SACD,CAAC,CAAA;QACF,wBAAwB,CAAC,MAAM,EAAE,WAAW,EAAE,yBAAyB,EAAE;YACxE,OAAO;YACP,OAAO;YACP,WAAW,EAAE,UAAU,CAAC,EAAE;YAC1B,KAAK,EAAE,EAAE,YAAY,EAAE,UAAU,CAAC,EAAE,EAAE,KAAK,EAAE,UAAU,CAAC,KAAK,EAAE;SAC/D,CAAC,CAAA;QAEF,IAAI,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,MAAM,EAAE,CAAC;YAChD,MAAM,gBAAgB,GAAG,MAAM,aAAa,CAAC,aAAa,EAAE;gBAC3D,YAAY,EAAE,wBAAwB;gBACtC,MAAM,EAAE,aAAa;gBACrB,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC;aAC9B,CAAC,CAAA;YACF,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE;gBACzB,MAAM,EAAE,GAAG;gBACX,OAAO,EAAE;oBACR,GAAG,kBAAkB;oBACrB,QAAQ,EAAE,YAAY,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,eAAe,EAAE;wBAC9D,KAAK,EAAE,gBAAgB;wBACvB,YAAY,EAAE,IAAI;qBAClB,CAAC;iBACF;aACD,CAAC,CAAA;QACH,CAAC;QACD,qEAAqE;QACrE,OAAO,IAAI,QAAQ,CAAC,IAAI,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC,CAAA;IACxE,CAAC,CAAA;IAED,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,CAAA;AACrB,CAAC;AAED,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,yBAAyB,EAAE,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@growth-labs/mailer",
-  "version": "0.6.3",
+  "version": "0.6.5",
   "type": "module",
   "types": "./dist/index.d.ts",
   "exports": {

package/src/routes/unsubscribe.ts

@@ -3,6 +3,7 @@ import { config } from 'virtual:growth-labs/mailer/config'
 import type { APIRoute } from 'astro'
 import { drizzle } from 'drizzle-orm/d1'
 import { probeMailerSchema, schemaMissingResponse } from '../_internal/schema-probe.js'
+import type { Subscriber } from '../types.js'
 import { emitMailerAnalyticsEvent } from '../utils/analytics.js'
 import {
 	resolveSigningSecret,
@@ -11,123 +12,170 @@ import {
 } from '../utils/runtime-secrets.js'
 import { sendTransactional } from '../utils/send.js'
 import { getSubscriberById, unsubscribeSubscriber } from '../utils/subscribers.js'
+import { renderEmail } from '../utils/templates.js'
 import { generateToken, verifyToken } from '../utils/tokens.js'
 import { buildSiteUrl } from '../utils/urls.js'
 
-async function processUnsubscribe(
-	token: string,
-	context?: Parameters<APIRoute>[0],
-	request?: Request,
-) {
-	const bindingsEnv = cloudflareEnv as Record<string, unknown>
-	const requestUrl = request?.url ?? context?.url.toString() ?? config.siteUrl
-	const signingSecret = await resolveSigningSecret(bindingsEnv, config, requestUrl)
-	if (!signingSecret.ok) return { secretFailure: signingSecret }
-
-	// Verify token
-	const payload = await verifyToken(signingSecret.secret, token, siteHost(config.siteUrl))
-	if (!payload || payload.action !== 'unsubscribe') {
-		return { error: 'Invalid or expired token', status: 400 }
-	}
-
-	// Resolve bindings
-	const d1 = bindingsEnv[config.d1Binding] as D1Database
-
-	// Schema probe — short-circuit with a Response on miss; both GET and POST
-	// handlers below forward it unchanged.
-	const schema = await probeMailerSchema(d1, config.d1Binding)
-	if (!schema.ok) return { schemaMissing: true as const }
-
-	const db = drizzle(d1)
-
-	// Get subscriber
-	const subscriber = await getSubscriberById(db, payload.subscriberId)
-	if (!subscriber) {
-		return { error: 'Subscriber not found', status: 404 }
-	}
-
-	// Unsubscribe
-	await unsubscribeSubscriber(db, payload.subscriberId)
-
-	// Send confirmation email — pass the full Worker env so config.d1Binding,
-	// config.queueBinding, and config.sendsD1Binding all resolve correctly.
-	await sendTransactional(bindingsEnv, config, {
-		to: subscriber.email,
-		subscriberId: subscriber.id,
-		subject: `You've been unsubscribed from ${config.senderName}`,
-		template: 'unsubscribe-confirm',
-		data: {
-			name: subscriber.name,
-			resubscribeUrl: buildSiteUrl(config.siteUrl, config.subscribePath),
-		},
-	})
-
-	emitMailerAnalyticsEvent(config, bindingsEnv, 'newsletter_unsubscribed', {
-		request,
-		context,
-		contentSlug: subscriber.id,
-		label: {
-			subscriberId: subscriber.id,
-			email: subscriber.email,
-		},
-	})
+const unsubscribeHeaders = {
+	'Cache-Control': 'private, no-store',
+	'Referrer-Policy': 'no-referrer',
+	'X-Robots-Tag': 'noindex, nofollow',
+}
 
-	return {
-		success: true,
-		subscriberId: payload.subscriberId,
-		signingSecret: signingSecret.secret,
-	}
+export type UnsubscribeSubscriber = Pick<Subscriber, 'id' | 'email' | 'name'>
+
+export interface UnsubscribeRouteHooks {
+	/** Called only after the existing token verification succeeds. Read-only. */
+	lookupSubscriber?: (subscriberId: string) => Promise<UnsubscribeSubscriber | null>
+	/**
+	 * Commit the unsubscribe and return the subscriber ID used by the existing
+	 * confirmation send and preferences page. Useful when a consumer keeps a
+	 * canonical consent store and a legacy delivery/preferences mirror.
+	 * Called only on POST, never on GET.
+	 */
+	commitUnsubscribe?: (subscriber: UnsubscribeSubscriber) => Promise<string>
 }
 
-// GET: Link from email footer
-export const GET: APIRoute = async (context) => {
-	const { url, request } = context
-	const token = url.searchParams.get('token')
-	if (!token) {
-		return Response.json({ error: 'Missing token' }, { status: 400 })
+/** Reuse the signed route, confirmation UI and one-click protocol with a consumer's subscriber store. */
+export function createUnsubscribeHandlers(hooks: UnsubscribeRouteHooks = {}): {
+	GET: APIRoute
+	POST: APIRoute
+} {
+	async function resolveUnsubscribe(context: Parameters<APIRoute>[0]) {
+		const { url, request } = context
+		const token = url.searchParams.get('token')
+		if (!token) {
+			return {
+				ok: false as const,
+				response: new Response('Missing token', { status: 400, headers: unsubscribeHeaders }),
+			}
+		}
+		const bindingsEnv = cloudflareEnv as Record<string, unknown>
+		const signingSecret = await resolveSigningSecret(bindingsEnv, config, request.url)
+		if (!signingSecret.ok)
+			return { ok: false as const, response: runtimeSecretErrorResponse(signingSecret) }
+
+		const payload = await verifyToken(signingSecret.secret, token, siteHost(config.siteUrl))
+		if (!payload || payload.action !== 'unsubscribe') {
+			return {
+				ok: false as const,
+				response: new Response('Invalid or expired token', {
+					status: 400,
+					headers: unsubscribeHeaders,
+				}),
+			}
+		}
+		const d1 = bindingsEnv[config.d1Binding] as D1Database
+		const schema = await probeMailerSchema(d1, config.d1Binding)
+		if (!schema.ok) return { ok: false as const, response: schemaMissingResponse() }
+		const db = drizzle(d1)
+		const subscriber = hooks.lookupSubscriber
+			? await hooks.lookupSubscriber(payload.subscriberId)
+			: await getSubscriberById(db, payload.subscriberId)
+		if (!subscriber) {
+			return {
+				ok: false as const,
+				response: new Response('Subscriber not found', {
+					status: 404,
+					headers: unsubscribeHeaders,
+				}),
+			}
+		}
+		return { ok: true as const, db, subscriber, signingSecret: signingSecret.secret, token }
 	}
 
-	const result = await processUnsubscribe(token, context, request)
-	if (result.secretFailure) return runtimeSecretErrorResponse(result.secretFailure)
-	if ('schemaMissing' in result) return schemaMissingResponse()
-	if ('error' in result) {
-		return Response.json({ error: result.error }, { status: result.status })
+	// GET: Link scanners may fetch this URL. Only POST may change consent.
+	const GET: APIRoute = async (context) => {
+		const result = await resolveUnsubscribe(context)
+		if (!result.ok) return result.response
+
+		const actionUrl = buildSiteUrl(config.siteUrl, config.unsubscribePath, {
+			token: result.token,
+			confirm: true,
+		})
+		return new Response(
+			renderEmail(
+				`<!doctype html>
+<html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1">
+<title>Unsubscribe — {{senderName}}</title></head>
+<body><main><h1>Unsubscribe</h1><form method="post" action="{{actionUrl}}"><button type="submit">Confirm</button></form></main></body></html>`,
+				{
+					senderName: config.senderName,
+					siteUrl: config.siteUrl,
+					unsubscribeUrl: actionUrl,
+					preferencesUrl: '',
+					brand: config.brand,
+					actionUrl,
+				},
+			),
+			{
+				status: 200,
+				headers: {
+					...unsubscribeHeaders,
+					// no-referrer makes native form POSTs send Origin: null. Keep the
+					// token out of Referer without breaking the host's CSRF check.
+					'Referrer-Policy': 'strict-origin',
+					'Content-Type': 'text/html; charset=utf-8',
+				},
+			},
+		)
 	}
 
-	// Generate preferences token for the redirect
-	const preferencesToken = await generateToken(result.signingSecret, {
-		subscriberId: result.subscriberId,
-		action: 'preferences',
-		host: siteHost(config.siteUrl),
-	})
-	const preferencesUrl = buildSiteUrl(config.siteUrl, config.preferencesPath, {
-		token: preferencesToken,
-		unsubscribed: true,
-	})
-
-	return new Response(null, {
-		status: 302,
-		headers: { Location: preferencesUrl },
-	})
-}
-
-// POST: RFC 8058 List-Unsubscribe-Post
-export const POST: APIRoute = async (context) => {
-	const { request } = context
-	// RFC 8058: body is "List-Unsubscribe=One-Click"
-	// Token comes from List-Unsubscribe header URL
-	const url = new URL(request.url)
-	const token = url.searchParams.get('token')
-	if (!token) {
-		return new Response('Missing token', { status: 400 })
-	}
-
-	const result = await processUnsubscribe(token, context, request)
-	if (result.secretFailure) return runtimeSecretErrorResponse(result.secretFailure)
-	if ('schemaMissing' in result) return schemaMissingResponse()
-	if ('error' in result) {
-		return new Response(result.error, { status: result.status })
+	// POST: the explicit confirmation or RFC 8058 List-Unsubscribe-Post.
+	const POST: APIRoute = async (context) => {
+		const result = await resolveUnsubscribe(context)
+		if (!result.ok) return result.response
+		const { db, subscriber, signingSecret } = result
+		const { request, url } = context
+		const bindingsEnv = cloudflareEnv as Record<string, unknown>
+
+		let confirmationSubscriberId: string
+		if (hooks.commitUnsubscribe) {
+			confirmationSubscriberId = await hooks.commitUnsubscribe(subscriber)
+		} else {
+			await unsubscribeSubscriber(db, subscriber.id)
+			confirmationSubscriberId = subscriber.id
+		}
+		// Pass the full Worker env so custom/split DB and queue bindings still work.
+		await sendTransactional(bindingsEnv, config, {
+			to: subscriber.email,
+			subscriberId: confirmationSubscriberId,
+			subject: `You've been unsubscribed from ${config.senderName}`,
+			template: 'unsubscribe-confirm',
+			data: {
+				name: subscriber.name,
+				resubscribeUrl: buildSiteUrl(config.siteUrl, config.subscribePath),
+			},
+		})
+		emitMailerAnalyticsEvent(config, bindingsEnv, 'newsletter_unsubscribed', {
+			request,
+			context,
+			contentSlug: subscriber.id,
+			label: { subscriberId: subscriber.id, email: subscriber.email },
+		})
+
+		if (url.searchParams.get('confirm') === 'true') {
+			const preferencesToken = await generateToken(signingSecret, {
+				subscriberId: confirmationSubscriberId,
+				action: 'preferences',
+				host: siteHost(config.siteUrl),
+			})
+			return new Response(null, {
+				status: 303,
+				headers: {
+					...unsubscribeHeaders,
+					Location: buildSiteUrl(config.siteUrl, config.preferencesPath, {
+						token: preferencesToken,
+						unsubscribed: true,
+					}),
+				},
+			})
+		}
+		// RFC 8058 one-click requests require no cookies and never redirect.
+		return new Response('OK', { status: 200, headers: unsubscribeHeaders })
 	}
 
-	return new Response('OK', { status: 200 })
+	return { GET, POST }
 }
+
+export const { GET, POST } = createUnsubscribeHandlers()