Skip to content
This repository was archived by the owner on Sep 9, 2025. It is now read-only.

Added new regex to also support {ideaId} format used in global url& a… #300

Merged
LorenzoJokhan merged 1 commit into from
Apr 26, 2023
Merged

Added new regex to also support {ideaId} format used in global url& a… #300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 17 additions & 9 deletions src/lib/mail.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,15 +99,14 @@ function sendConceptEmail(resource, resourceType, site, user) {
const logo = siteConfig.getLogo();
const hostname = siteConfig.getCmsHostname();
const sitename = siteConfig.getTitle();

let inzendingPath = resourceConceptEmail.inzendingPath;
const inzendingURL = getInzendingURL(inzendingPath, url, resource, resourceType);

let fromAddress = resourceConceptEmail.from || config.email;
if (!fromAddress) return console.error('Email error: fromAddress not provided');
if (fromAddress.match(/^.+<(.+)>$/, '$1')) fromAddress = fromAddress.replace(/^.+<(.+)>$/, '$1');

let idRegex = new RegExp(`\\[\\[(?:${resourceType}|idea)?Id\\]\\]`, 'g');
inzendingPath = inzendingPath && inzendingPath.replace(idRegex, resource.id).replace(/\[\[resourceType\]\]/, resourceType) || "/";
const inzendingURL = url + inzendingPath;
const data = prepareEmailData(user, resource, hostname, sitename, inzendingURL, url, fromAddress, logo);

const template = resourceConceptEmail.template;
Expand All @@ -132,22 +131,21 @@ function sendConceptEmail(resource, resourceType, site, user) {
// send email to user that submitted a resource
function sendThankYouMail(resource, resourceType, site, user) {
const siteConfig = new MailConfig(site)

if (!resourceType) return console.error('sendThankYouMail error: resourceType not provided');

const url = siteConfig.getCmsUrl();
const hostname = siteConfig.getCmsHostname();
const sitename = siteConfig.getTitle();
let inzendingPath = siteConfig.getFeedbackEmailInzendingPath(resourceType);
const inzendingURL = getInzendingURL(inzendingPath, url, resource, resourceType);

let fromAddress = siteConfig.getFeedbackEmailFrom(resourceType) || config.email;
if (!fromAddress) return console.error('Email error: fromAddress not provided');
if (fromAddress.match(/^.+<(.+)>$/, '$1')) fromAddress = fromAddress.replace(/^.+<(.+)>$/, '$1');

// todo: als je dan toch met een siteConfig.get werkt, moet deze search-and-replace dan niet ook daar?
let idRegex = new RegExp(`\\[\\[(?:${resourceType}|idea)?Id\\]\\]`, 'g'); // 'idea' wegens backward compatible
const inzendingPath = (siteConfig.getFeedbackEmailInzendingPath(resourceType) && siteConfig.getFeedbackEmailInzendingPath(resourceType).replace(idRegex, resource.id).replace(/\[\[resourceType\]\]/, resourceType)) || "/";
const inzendingURL = url + inzendingPath;
const logo = siteConfig.getLogo();

const logo = siteConfig.getLogo();
const data = prepareEmailData(user, resource, hostname, sitename, inzendingURL, url, fromAddress, logo);

let template = siteConfig.getResourceFeedbackEmailTemplate(resourceType);
Expand Down Expand Up @@ -321,6 +319,16 @@ function sendInactiveWarningEmail(site, user) {

}

function getInzendingURL(inzendingPath, url, resource, resourceType) {
let idRegex = new RegExp(`\\{(?:${resourceType}|idea)?Id\\}`, 'g');
let oldIdRegex = new RegExp(`\\[\\[(?:${resourceType}|idea)?Id\\]\\]`, 'g');

inzendingPath = inzendingPath && inzendingPath
.replace(idRegex, resource.id)
.replace(oldIdRegex, resource.id)
.replace(/\[\[resourceType\]\]/, resourceType) || "/";
return url + inzendingPath;
}

module.exports = {
sendMail,
Expand Down