4 Commits

Author SHA1 Message Date
770db3067d Mostra il link di disiscrizione dopo la conferma newsletter.
Passa il token unsub alla pagina di conferma e lo include anche nell'email di double opt-in.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 14:45:54 +02:00
6ba58c3a86 Merge pull request #16 from javaxman/fix/newsletter-turnstile-optional
Fix Turnstile sul form newsletter
2026-07-29 14:40:21 +02:00
8a99290209 Non richiedere Turnstile contatti sul form newsletter.
Il footer non ha il widget Turnstile: evita il fallimento usando solo NEWSLETTER_TURNSTILE_SECRET_KEY.

Co-authored-by: Cursor <cursoragent@cursor.com>
2026-07-29 14:39:52 +02:00
c04d43d9d7 Merge pull request #15 from javaxman/fix/astro6-cloudflare-workers-env
Fix env Cloudflare per Astro 6 (contatti e newsletter)
2026-07-29 14:08:25 +02:00
3 changed files with 43 additions and 7 deletions

View File

@ -79,5 +79,8 @@ export const GET: APIRoute = async ({ request, locals, url }) => {
} }
} }
return Response.redirect(new URL(okPath, request.url).toString(), 303); return Response.redirect(
new URL(`${okPath}?unsub=${encodeURIComponent(row.unsubscribe_token)}`, request.url).toString(),
303,
);
}; };

View File

@ -18,7 +18,11 @@ import {
export const prerender = false; export const prerender = false;
function confirmEmailCopy(locale: string, confirmUrl: string): { subject: string; text: string } { function confirmEmailCopy(
locale: string,
confirmUrl: string,
unsubscribeUrl: string,
): { subject: string; text: string } {
if (locale === 'en') { if (locale === 'en') {
return { return {
subject: 'Confirm your NexStudio newsletter subscription', subject: 'Confirm your NexStudio newsletter subscription',
@ -29,6 +33,9 @@ function confirmEmailCopy(locale: string, confirmUrl: string): { subject: string
confirmUrl, confirmUrl,
'', '',
'If you did not request this, you can ignore this message.', 'If you did not request this, you can ignore this message.',
'',
'Unsubscribe:',
unsubscribeUrl,
].join('\n'), ].join('\n'),
}; };
} }
@ -42,6 +49,9 @@ function confirmEmailCopy(locale: string, confirmUrl: string): { subject: string
confirmUrl, confirmUrl,
'', '',
'หากคุณไม่ได้ขอสมัคร สามารถเพิกเฉยต่อข้อความนี้ได้', 'หากคุณไม่ได้ขอสมัคร สามารถเพิกเฉยต่อข้อความนี้ได้',
'',
'ยกเลิกการสมัคร:',
unsubscribeUrl,
].join('\n'), ].join('\n'),
}; };
} }
@ -54,6 +64,9 @@ function confirmEmailCopy(locale: string, confirmUrl: string): { subject: string
confirmUrl, confirmUrl,
'', '',
'Se non hai richiesto liscrizione, puoi ignorare questo messaggio.', 'Se non hai richiesto liscrizione, puoi ignorare questo messaggio.',
'',
'Per disiscriverti:',
unsubscribeUrl,
].join('\n'), ].join('\n'),
}; };
} }
@ -83,9 +96,9 @@ export const POST: APIRoute = async ({ request, locals, url }) => {
} }
const email = normalizeEmail(emailRaw); const email = normalizeEmail(emailRaw);
const turnstileSecret = // Turnstile solo se configurato esplicitamente per la newsletter.
readEnv('NEWSLETTER_TURNSTILE_SECRET_KEY', runtimeEnv) || // Non riusare CONTACT_TURNSTILE_SECRET_KEY: il form footer non ha il widget.
readEnv('CONTACT_TURNSTILE_SECRET_KEY', runtimeEnv); const turnstileSecret = readEnv('NEWSLETTER_TURNSTILE_SECRET_KEY', runtimeEnv);
if (turnstileSecret) { if (turnstileSecret) {
const turnstileToken = required(form.get('cf-turnstile-response')); const turnstileToken = required(form.get('cf-turnstile-response'));
const isHuman = await verifyTurnstile( const isHuman = await verifyTurnstile(
@ -102,6 +115,10 @@ export const POST: APIRoute = async ({ request, locals, url }) => {
const unsubscribeToken = createToken(); const unsubscribeToken = createToken();
const origin = siteOrigin(url, runtimeEnv); const origin = siteOrigin(url, runtimeEnv);
const confirmUrl = absoluteUrl(origin, `/api/newsletter/confirm?token=${confirmToken}`); const confirmUrl = absoluteUrl(origin, `/api/newsletter/confirm?token=${confirmToken}`);
const unsubscribeUrl = absoluteUrl(
origin,
`/api/newsletter/unsubscribe?token=${unsubscribeToken}`,
);
if (mode !== 'live') { if (mode !== 'live') {
console.info('[newsletter:dev] Subscription request', { console.info('[newsletter:dev] Subscription request', {
@ -170,7 +187,7 @@ export const POST: APIRoute = async ({ request, locals, url }) => {
.run(); .run();
} }
const copy = confirmEmailCopy(locale, confirmUrl); const copy = confirmEmailCopy(locale, confirmUrl, unsubscribeUrl);
try { try {
await sendCloudflareEmail(emailBinding, { await sendCloudflareEmail(emailBinding, {
fromEmail, fromEmail,

View File

@ -1,5 +1,10 @@
--- ---
import SubpageLayout from '../../layouts/SubpageLayout.astro'; import SubpageLayout from '../../layouts/SubpageLayout.astro';
const unsubToken = Astro.url.searchParams.get('unsub')?.trim() ?? '';
const unsubHref = unsubToken
? `/api/newsletter/unsubscribe?token=${encodeURIComponent(unsubToken)}`
: '';
--- ---
<SubpageLayout <SubpageLayout
@ -10,8 +15,19 @@ import SubpageLayout from '../../layouts/SubpageLayout.astro';
> >
<p> <p>
Puoi disiscriverti in qualsiasi momento dal link presente in fondo a ogni Puoi disiscriverti in qualsiasi momento dal link presente in fondo a ogni
messaggio. messaggio della newsletter.
</p> </p>
{
unsubHref ? (
<p>
Oppure disiscriviti subito:{' '}
<a class="text-sky-400/90 hover:text-sky-300" href={unsubHref}>
Annulla iscrizione
</a>
.
</p>
) : null
}
<p> <p>
<a class="text-sky-400/90 hover:text-sky-300" href="/">Torna alla home</a> <a class="text-sky-400/90 hover:text-sky-300" href="/">Torna alla home</a>
</p> </p>