public/mailtrain
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix subscription widget

Browse source
This commit is contained in:
Lawrence Elitzer 2020-08-29 07:30:06 -05:00
parent 490031c8b5
commit 7a765018f2
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
server/routes/subscription.js
View file

@ -281,6 +281,9 @@ router.postAsync('/:cid/subscribe', passport.parseForm, corsOrCsrfProtection, as
if (existingSubscription && existingSubscription.status === SubscriptionStatus.SUBSCRIBED) { if (existingSubscription && existingSubscription.status === SubscriptionStatus.SUBSCRIBED) {
await mailHelpers.sendAlreadySubscribed(req.locale, list, email, existingSubscription); await mailHelpers.sendAlreadySubscribed(req.locale, list, email, existingSubscription);
if (req.xhr) {
throw new Error(tUI('listEmailAddressAlreadyRegistered', req.locale, {list: list.name}));
}
res.redirect('/subscription/' + encodeURIComponent(req.params.cid) + '/confirm-subscription-notice'); res.redirect('/subscription/' + encodeURIComponent(req.params.cid) + '/confirm-subscription-notice');
} else { } else {
@ -325,7 +328,7 @@ router.getAsync('/:cid/widget', cors(corsOptions), async (req, res) => {
title: list.name, title: list.name,
cid: list.cid, cid: list.cid,
publicKeyUrl: getTrustedUrl('subscription/publickey'), publicKeyUrl: getTrustedUrl('subscription/publickey'),
subscribeUrl: getTrustedUrl(`subscription/${list.cid}/subscribe`), subscribeUrl: getPublicUrl(`subscription/${list.cid}/subscribe`),
hasPubkey: !!configItems.pgpPrivateKey, hasPubkey: !!configItems.pgpPrivateKey,
customFields: await fields.forHbs(contextHelpers.getAdminContext(), list.id), customFields: await fields.forHbs(contextHelpers.getAdminContext(), list.id),
template: {}, template: {},