Compare commits
4 Commits
fix/astro6
...
fix/newsle
| Author | SHA1 | Date | |
|---|---|---|---|
| 770db3067d | |||
| 6ba58c3a86 | |||
| 8a99290209 | |||
| c04d43d9d7 |
@ -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,
|
||||
);
|
||||
};
|
||||
|
||||
@ -18,7 +18,11 @@ import {
|
||||
|
||||
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') {
|
||||
return {
|
||||
subject: 'Confirm your NexStudio newsletter subscription',
|
||||
@ -29,6 +33,9 @@ function confirmEmailCopy(locale: string, confirmUrl: string): { subject: string
|
||||
confirmUrl,
|
||||
'',
|
||||
'If you did not request this, you can ignore this message.',
|
||||
'',
|
||||
'Unsubscribe:',
|
||||
unsubscribeUrl,
|
||||
].join('\n'),
|
||||
};
|
||||
}
|
||||
@ -42,6 +49,9 @@ function confirmEmailCopy(locale: string, confirmUrl: string): { subject: string
|
||||
confirmUrl,
|
||||
'',
|
||||
'หากคุณไม่ได้ขอสมัคร สามารถเพิกเฉยต่อข้อความนี้ได้',
|
||||
'',
|
||||
'ยกเลิกการสมัคร:',
|
||||
unsubscribeUrl,
|
||||
].join('\n'),
|
||||
};
|
||||
}
|
||||
@ -54,6 +64,9 @@ function confirmEmailCopy(locale: string, confirmUrl: string): { subject: string
|
||||
confirmUrl,
|
||||
'',
|
||||
'Se non hai richiesto l’iscrizione, puoi ignorare questo messaggio.',
|
||||
'',
|
||||
'Per disiscriverti:',
|
||||
unsubscribeUrl,
|
||||
].join('\n'),
|
||||
};
|
||||
}
|
||||
@ -83,9 +96,9 @@ export const POST: APIRoute = async ({ request, locals, url }) => {
|
||||
}
|
||||
const email = normalizeEmail(emailRaw);
|
||||
|
||||
const turnstileSecret =
|
||||
readEnv('NEWSLETTER_TURNSTILE_SECRET_KEY', runtimeEnv) ||
|
||||
readEnv('CONTACT_TURNSTILE_SECRET_KEY', runtimeEnv);
|
||||
// Turnstile solo se configurato esplicitamente per la newsletter.
|
||||
// Non riusare CONTACT_TURNSTILE_SECRET_KEY: il form footer non ha il widget.
|
||||
const turnstileSecret = readEnv('NEWSLETTER_TURNSTILE_SECRET_KEY', runtimeEnv);
|
||||
if (turnstileSecret) {
|
||||
const turnstileToken = required(form.get('cf-turnstile-response'));
|
||||
const isHuman = await verifyTurnstile(
|
||||
@ -102,6 +115,10 @@ export const POST: APIRoute = async ({ request, locals, url }) => {
|
||||
const unsubscribeToken = createToken();
|
||||
const origin = siteOrigin(url, runtimeEnv);
|
||||
const confirmUrl = absoluteUrl(origin, `/api/newsletter/confirm?token=${confirmToken}`);
|
||||
const unsubscribeUrl = absoluteUrl(
|
||||
origin,
|
||||
`/api/newsletter/unsubscribe?token=${unsubscribeToken}`,
|
||||
);
|
||||
|
||||
if (mode !== 'live') {
|
||||
console.info('[newsletter:dev] Subscription request', {
|
||||
@ -170,7 +187,7 @@ export const POST: APIRoute = async ({ request, locals, url }) => {
|
||||
.run();
|
||||
}
|
||||
|
||||
const copy = confirmEmailCopy(locale, confirmUrl);
|
||||
const copy = confirmEmailCopy(locale, confirmUrl, unsubscribeUrl);
|
||||
try {
|
||||
await sendCloudflareEmail(emailBinding, {
|
||||
fromEmail,
|
||||
|
||||
@ -1,5 +1,10 @@
|
||||
---
|
||||
import SubpageLayout from '../../layouts/SubpageLayout.astro';
|
||||
|
||||
const unsubToken = Astro.url.searchParams.get('unsub')?.trim() ?? '';
|
||||
const unsubHref = unsubToken
|
||||
? `/api/newsletter/unsubscribe?token=${encodeURIComponent(unsubToken)}`
|
||||
: '';
|
||||
---
|
||||
|
||||
<SubpageLayout
|
||||
@ -10,8 +15,19 @@ import SubpageLayout from '../../layouts/SubpageLayout.astro';
|
||||
>
|
||||
<p>
|
||||
Puoi disiscriverti in qualsiasi momento dal link presente in fondo a ogni
|
||||
messaggio.
|
||||
messaggio della newsletter.
|
||||
</p>
|
||||
{
|
||||
unsubHref ? (
|
||||
<p>
|
||||
Oppure disiscriviti subito:{' '}
|
||||
<a class="text-sky-400/90 hover:text-sky-300" href={unsubHref}>
|
||||
Annulla iscrizione
|
||||
</a>
|
||||
.
|
||||
</p>
|
||||
) : null
|
||||
}
|
||||
<p>
|
||||
<a class="text-sky-400/90 hover:text-sky-300" href="/">Torna alla home</a>
|
||||
</p>
|
||||
|
||||
Reference in New Issue
Block a user