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

Merge pull request #948 from elitzer2/fix-subscription-widget

Browse source 
(v2) Fix subscription widget
This commit is contained in:
Tomas Bures 2020-08-30 07:50:20 +02:00 • committed by GitHub
commit 0f8682087e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
server/routes/subscription.js
View file

@ -281,6 +281,11 @@ 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) {
return res.status(200).json({
msg: tUI('pleaseConfirmSubscription', req.locale)
});
}
res.redirect('/subscription/' + encodeURIComponent(req.params.cid) + '/confirm-subscription-notice'); res.redirect('/subscription/' + encodeURIComponent(req.params.cid) + '/confirm-subscription-notice');
} else { } else {
@ -325,17 +330,18 @@ 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: 'subscription/widget-subscribe.hbs',
layout: null, layout: null,
}; };
await injectCustomFormData(req.query.fid || list.default_form, 'web_subscribe', data); await injectCustomFormData(req.query.fid || list.default_form, 'web_subscribe', data);
const renderAsync = bluebird.promisify(res.render.bind(res)); const htmlRenderer = await tools.getTemplate(data.template, req.locale);
const html = await renderAsync('subscription/widget-subscribe', data);
const html = htmlRenderer(data);
const response = { const response = {
data: { data: {