Merge pull request #4 from Mailtrain-org/development

Development

client/src/campaigns/CUD.js

@@ -721,7 +721,7 @@ export default class CUD extends Component {
 
             templateEdit = <div>
                 <Dropdown id="data_sourceCustom_type" label={t('type')} options={this.customTemplateTypeOptions}/>
-                <Dropdown id="data_sourceCustom_tag_language" label={t('Tag language')} options={this.customTemplateTagLanguageOptions} disabled={isEdit && (!customTemplateTypeKey || this.templateTypes[customTemplateTypeKey].isTagLanguageSelectorDisabledForEdit)}/>
+                <Dropdown id="data_sourceCustom_tag_language" label={t('Tag language')} options={this.customTemplateTagLanguageOptions} disabled={isEdit}/>
 
                 {customTemplateTypeForm}
             </div>;

client/src/campaigns/Content.js

@@ -277,7 +277,7 @@ export default class CustomContent extends Component {
                         {customTemplateTypeKey && this.templateTypes[customTemplateTypeKey].typeName}
                     </StaticField>
 
-                    <Dropdown id="data_sourceCustom_tag_language" label={t('Tag language')} options={this.customTemplateTagLanguageOptions} disabled={!customTemplateTypeKey || this.templateTypes[customTemplateTypeKey].isTagLanguageSelectorDisabledForEdit}/>
+                    <Dropdown id="data_sourceCustom_tag_language" label={t('Tag language')} options={this.customTemplateTagLanguageOptions} disabled={true}/>
 
                     {customTemplateTypeKey && getTypeForm(this, customTemplateTypeKey, true)}
 

client/src/campaigns/Status.js

@@ -10,7 +10,7 @@ import {getCampaignLabels} from './helpers';
 import {Table} from "../lib/table";
 import {Button, Icon, ModalDialog} from "../lib/bootstrap-components";
 import axios from "../lib/axios";
-import {getPublicUrl, getUrl} from "../lib/urls";
+import {getPublicUrl, getSandboxUrl, getUrl} from "../lib/urls";
 import interoperableErrors from '../../../shared/interoperable-errors';
 import {CampaignStatus, CampaignType} from "../../../shared/campaigns";
 import moment from 'moment-timezone';
@@ -58,10 +58,29 @@ class PreviewForTestUserModalDialog extends Component {
 
     async previewAsync() {
         if (this.isFormWithoutErrors()) {
-            const campaignCid = this.props.entity.cid;
+            const entity = this.props.entity;
+            const campaignCid = entity.cid;
             const [listCid, subscriptionCid] = this.getFormValue('testUser').split(':');
 
-            window.open(getPublicUrl(`archive/${campaignCid}/${listCid}/${subscriptionCid}`, {withLocale: true}), '_blank');
+            if (entity.type === CampaignType.RSS) {
+                const result = await axios.post(getUrl('rest/restricted-access-token'), {
+                    method: 'rssPreview',
+                    params: {
+                        campaignCid,
+                        listCid
+                    }
+                });
+
+                const accessToken = result.data;
+                window.open(getSandboxUrl(`cpgs/rss-preview/${campaignCid}/${listCid}/${subscriptionCid}`, accessToken, {withLocale: true}), '_blank');
+
+            } else if (entity.type === CampaignType.REGULAR) {
+                window.open(getPublicUrl(`archive/${campaignCid}/${listCid}/${subscriptionCid}`, {withLocale: true}), '_blank');
+
+            } else {
+                throw new Error('Preview not supported');
+            }
+
         } else {
             this.showFormValidation();
         }

client/src/lib/sandbox-common.js

@@ -0,0 +1,9 @@
+'use strict';
+
+export function getTagLanguageFromEntity(entity, entityTypeId) {
+    if (entityTypeId === 'template') {
+        return entity.tag_language;
+    } else if (entityTypeId === 'campaign') {
+        return entity.data.sourceCustom.tag_language;
+    }
+}

client/src/lib/sandboxed-ckeditor-root.js

@@ -27,7 +27,7 @@ class CKEditorSandbox extends Component {
         const trustedUrlBase = getTrustedUrl();
         const sandboxUrlBase = getSandboxUrl();
         const publicUrlBase = getPublicUrl();
-        const source = this.props.initialSource && base(this.props.initialSource, trustedUrlBase, sandboxUrlBase, publicUrlBase);
+        const source = this.props.initialSource && base(this.props.initialSource, this.props.tagLanguage, trustedUrlBase, sandboxUrlBase, publicUrlBase);
 
         this.state = {
             source
@@ -37,6 +37,7 @@ class CKEditorSandbox extends Component {
     static propTypes = {
         entityTypeId: PropTypes.string,
         entityId: PropTypes.number,
+        tagLanguage: PropTypes.string,
         initialSource: PropTypes.string
     }
 
@@ -48,7 +49,7 @@ class CKEditorSandbox extends Component {
         const preHtml = '<!doctype html><html><head><meta charset="utf-8"><title></title></head><body>';
         const postHtml = '</body></html>';
 
-        const unbasedSource = unbase(this.state.source, trustedUrlBase, sandboxUrlBase, publicUrlBase, true);
+        const unbasedSource = unbase(this.state.source, this.props.tagLanguage, trustedUrlBase, sandboxUrlBase, publicUrlBase, true);
 
         return {
             source: unbasedSource,

client/src/lib/sandboxed-ckeditor.js

@@ -11,6 +11,7 @@ import {getTrustedUrl} from "./urls";
 
 import {initialHeight} from "./sandboxed-ckeditor-shared";
 import {withComponentMixins} from "./decorator-helpers";
+import {getTagLanguageFromEntity} from "./sandbox-common";
 
 const navbarHeight = 34; // Sync this with navbarheight in sandboxed-ckeditor.scss
 
@@ -83,6 +84,7 @@ export class CKEditorHost extends Component {
         const editorData = {
             entityTypeId: this.props.entityTypeId,
             entityId: this.props.entity.id,
+            tagLanguage: getTagLanguageFromEntity(this.props.entity, this.props.entityTypeId),
             initialSource: this.props.initialSource
         };
 

client/src/lib/sandboxed-codeeditor-root.js

@@ -66,7 +66,7 @@ class CodeEditorSandbox extends Component {
         const trustedUrlBase = getTrustedUrl();
         const sandboxUrlBase = getSandboxUrl();
         const publicUrlBase = getPublicUrl();
-        const source = this.props.initialSource ? base(this.props.initialSource, trustedUrlBase, sandboxUrlBase, publicUrlBase) : defaultSource;
+        const source = this.props.initialSource ? base(this.props.initialSource, this.props.tagLanguage, trustedUrlBase, sandboxUrlBase, publicUrlBase) : defaultSource;
 
         this.state = {
             source,
@@ -87,6 +87,7 @@ class CodeEditorSandbox extends Component {
     static propTypes = {
         entityTypeId: PropTypes.string,
         entityId: PropTypes.number,
+        tagLanguage: PropTypes.string,
         initialSource: PropTypes.string,
         sourceType: PropTypes.string,
         initialPreview: PropTypes.bool,
@@ -98,8 +99,8 @@ class CodeEditorSandbox extends Component {
         const sandboxUrlBase = getSandboxUrl();
         const publicUrlBase = getPublicUrl();
         return {
-            html: unbase(this.getHtml(), trustedUrlBase, sandboxUrlBase, publicUrlBase, true),
+            html: unbase(this.getHtml(), this.props.tagLanguage, trustedUrlBase, sandboxUrlBase, publicUrlBase, true),
-            source: unbase(this.state.source, trustedUrlBase, sandboxUrlBase, publicUrlBase, true)
+            source: unbase(this.state.source, this.props.tagLanguage, trustedUrlBase, sandboxUrlBase, publicUrlBase, true)
         };
     }
 
@@ -149,7 +150,7 @@ class CodeEditorSandbox extends Component {
         });
 
         if (!this.refreshTimeoutId) {
-            this.refreshTimeoutId = setTimeout(() => this.refresh(), refreshTimeout);
+            this.refreshTimeoutId = setTimeout(this.refreshHandler, refreshTimeout);
         }
     }
 

client/src/lib/sandboxed-codeeditor.js

@@ -9,6 +9,7 @@ import {UntrustedContentHost} from './untrusted';
 import {Icon} from "./bootstrap-components";
 import {getTrustedUrl} from "./urls";
 import {withComponentMixins} from "./decorator-helpers";
+import {getTagLanguageFromEntity} from "./sandbox-common";
 
 @withComponentMixins([
     withTranslation
@@ -75,6 +76,7 @@ export class CodeEditorHost extends Component {
         const editorData = {
             entityTypeId: this.props.entityTypeId,
             entityId: this.props.entity.id,
+            tagLanguage: getTagLanguageFromEntity(this.props.entity, this.props.entityTypeId),
             initialSource: this.props.initialSource,
             sourceType: this.props.sourceType,
             initialPreview: this.state.preview,

client/src/lib/sandboxed-grapesjs-root.js

@@ -54,6 +54,7 @@ export class GrapesJSSandbox extends Component {
     static propTypes = {
         entityTypeId: PropTypes.string,
         entityId: PropTypes.number,
+        tagLanguage: PropTypes.string,
         initialSource: PropTypes.string,
         initialStyle: PropTypes.string,
         sourceType: PropTypes.string
@@ -75,8 +76,8 @@ export class GrapesJSSandbox extends Component {
         const sandboxUrlBase = getSandboxUrl();
         const publicUrlBase = getPublicUrl();
 
-        const source = unbase(editor.getHtml(), trustedUrlBase, sandboxUrlBase, publicUrlBase, true);
+        const source = unbase(editor.getHtml(), this.props.tagLanguage, trustedUrlBase, sandboxUrlBase, publicUrlBase, true);
-        const style = unbase(editor.getCss(), trustedUrlBase, sandboxUrlBase, publicUrlBase, true);
+        const style = unbase(editor.getCss(), this.props.tagLanguage, trustedUrlBase, sandboxUrlBase, publicUrlBase, true);
 
         let html;
 
@@ -96,7 +97,7 @@ export class GrapesJSSandbox extends Component {
 
             const preHtml = '<!doctype html><html><head><meta charset="utf-8"><title></title></head><body>';
             const postHtml = '</body></html>';
-            html = preHtml + unbase(htmlBody, trustedUrlBase, sandboxUrlBase, publicUrlBase, true) + postHtml;
+            html = preHtml + unbase(htmlBody, this.props.tagLanguage, trustedUrlBase, sandboxUrlBase, publicUrlBase, true) + postHtml;
         }
 
 
@@ -603,8 +604,8 @@ export class GrapesJSSandbox extends Component {
             config.plugins.push('gjs-preset-newsletter');
         }
 
-        config.components = props.initialSource ? base(props.initialSource, trustedUrlBase, sandboxUrlBase, publicUrlBase) : defaultSource;
+        config.components = props.initialSource ? base(props.initialSource, this.props.tagLanguage, trustedUrlBase, sandboxUrlBase, publicUrlBase) : defaultSource;
-        config.style = props.initialStyle ? base(props.initialStyle, trustedUrlBase, sandboxUrlBase, publicUrlBase) : defaultStyle;
+        config.style = props.initialStyle ? base(props.initialStyle, this.props.tagLanguage, trustedUrlBase, sandboxUrlBase, publicUrlBase) : defaultStyle;
 
         config.plugins.push('mailtrain-remove-buttons');
 

client/src/lib/sandboxed-grapesjs.js

@@ -10,6 +10,7 @@ import {Icon} from "./bootstrap-components";
 import {getTrustedUrl} from "./urls";
 import {withComponentMixins} from "./decorator-helpers";
 import {GrapesJSSourceType} from "./sandboxed-grapesjs-shared";
+import {getTagLanguageFromEntity} from "./sandbox-common";
 
 @withComponentMixins([
     withTranslation
@@ -57,6 +58,7 @@ export class GrapesJSHost extends Component {
         const editorData = {
             entityTypeId: this.props.entityTypeId,
             entityId: this.props.entity.id,
+            tagLanguage: getTagLanguageFromEntity(this.props.entity, this.props.entityTypeId),
             initialSource: this.props.initialSource,
             initialStyle: this.props.initialStyle,
             sourceType: this.props.sourceType

client/src/lib/sandboxed-mosaico-root.js

@@ -27,6 +27,7 @@ class MosaicoSandbox extends Component {
     static propTypes = {
         entityTypeId: PropTypes.string,
         entityId: PropTypes.number,
+        tagLanguage: PropTypes.string,
         templateId: PropTypes.number,
         templatePath: PropTypes.string,
         initialModel: PropTypes.string,
@@ -60,9 +61,9 @@ class MosaicoSandbox extends Component {
         html = juice(html);
 
         return {
-            html: unbase(html, trustedUrlBase, sandboxUrlBase, publicUrlBase, true),
+            html: unbase(html, this.props.tagLanguage, trustedUrlBase, sandboxUrlBase, publicUrlBase, true),
-            model: unbase(this.viewModel.exportJSON(), trustedUrlBase, sandboxUrlBase, publicUrlBase),
+            model: unbase(this.viewModel.exportJSON(), this.props.tagLanguage, trustedUrlBase, sandboxUrlBase, publicUrlBase),
-            metadata: unbase(this.viewModel.exportMetadata(), trustedUrlBase, sandboxUrlBase, publicUrlBase)
+            metadata: unbase(this.viewModel.exportMetadata(), this.props.tagLanguage, trustedUrlBase, sandboxUrlBase, publicUrlBase)
         };
     }
 
@@ -128,8 +129,8 @@ class MosaicoSandbox extends Component {
         const trustedUrlBase = getTrustedUrl();
         const sandboxUrlBase = getSandboxUrl();
         const publicUrlBase = getPublicUrl();
-        const metadata = this.props.initialMetadata && JSON.parse(base(this.props.initialMetadata, trustedUrlBase, sandboxUrlBase, publicUrlBase));
+        const metadata = this.props.initialMetadata && JSON.parse(base(this.props.initialMetadata, this.props.tagLanguage, trustedUrlBase, sandboxUrlBase, publicUrlBase));
-        const model = this.props.initialModel && JSON.parse(base(this.props.initialModel, trustedUrlBase, sandboxUrlBase, publicUrlBase));
+        const model = this.props.initialModel && JSON.parse(base(this.props.initialModel, this.props.tagLanguage, trustedUrlBase, sandboxUrlBase, publicUrlBase));
         const template = this.props.templateId ? getSandboxUrl(`mosaico/templates/${this.props.templateId}/index.html`) : this.props.templatePath;
 
         const allPlugins = plugins.concat(window.mosaicoPlugins);

client/src/lib/sandboxed-mosaico.js

@@ -9,6 +9,7 @@ import {UntrustedContentHost} from './untrusted';
 import {Icon} from "./bootstrap-components";
 import {getTrustedUrl} from "./urls";
 import {withComponentMixins} from "./decorator-helpers";
+import {getTagLanguageFromEntity} from "./sandbox-common";
 
 
 @withComponentMixins([
@@ -58,6 +59,7 @@ export class MosaicoHost extends Component {
         const editorData = {
             entityTypeId: this.props.entityTypeId,
             entityId: this.props.entity.id,
+            tagLanguage: getTagLanguageFromEntity(this.props.entity, this.props.entityTypeId),
             templateId: this.props.templateId,
             templatePath: this.props.templatePath,
             initialModel: this.props.initialModel,

client/src/lib/urls.js

@@ -15,9 +15,15 @@ function getTrustedUrl(path) {
     return mailtrainConfig.trustedUrlBase + (path || '');
 }
 
-function getSandboxUrl(path, customRestrictedAccessToken) {
+function getSandboxUrl(path, customRestrictedAccessToken, opts) {
     const localRestrictedAccessToken = customRestrictedAccessToken || restrictedAccessToken;
-    return mailtrainConfig.sandboxUrlBase + localRestrictedAccessToken + '/' + (path || '');
+     const url = new URL(localRestrictedAccessToken + '/' + (path || ''), mailtrainConfig.sandboxUrlBase);
+
+    if (opts && opts.withLocale) {
+        url.searchParams.append('locale', i18n.language);
+    }
+
+    return url.toString();
 }
 
 function getPublicUrl(path, opts) {

client/src/templates/CUD.js

@@ -376,7 +376,7 @@ export default class CUD extends Component {
 
                             {typeForm}
 
-                            <Dropdown id="tag_language" label={t('Tag language')} options={tagLanguageOptions} disabled={isEdit && (!typeKey || this.templateTypes[typeKey].isTagLanguageSelectorDisabledForEdit)}/>
+                            <Dropdown id="tag_language" label={t('Tag language')} options={tagLanguageOptions} disabled={isEdit}/>
                         </>
                     }
 

client/src/templates/helpers.js

@@ -167,7 +167,6 @@ export function getTemplateTypes(t, prefix = '', entityTypeId = ResourceType.TEM
                 mutState.setIn([prefix + 'mosaicoTemplate', 'value'], null);
             }
         },
-        isTagLanguageSelectorDisabledForEdit: true,
         validate: state => {
             const mosaicoTemplate = state.getIn([prefix + 'mosaicoTemplate', 'value']);
             if (!mosaicoTemplate) {
@@ -256,7 +255,6 @@ export function getTemplateTypes(t, prefix = '', entityTypeId = ResourceType.TEM
         },
         afterTagLanguageChange: (mutState, isEdit) => {
         },
-        isTagLanguageSelectorDisabledForEdit: false,
         validate: state => {
         }
     };
@@ -346,7 +344,6 @@ export function getTemplateTypes(t, prefix = '', entityTypeId = ResourceType.TEM
         },
         afterTagLanguageChange: (mutState, isEdit) => {
         },
-        isTagLanguageSelectorDisabledForEdit: false,
         validate: state => {
         }
     };
@@ -408,7 +405,6 @@ export function getTemplateTypes(t, prefix = '', entityTypeId = ResourceType.TEM
         },
         afterTagLanguageChange: (mutState, isEdit) => {
         },
-        isTagLanguageSelectorDisabledForEdit: false,
         validate: state => {
         }
     };
@@ -495,7 +491,6 @@ export function getTemplateTypes(t, prefix = '', entityTypeId = ResourceType.TEM
         },
         afterTagLanguageChange: (mutState, isEdit) => {
         },
-        isTagLanguageSelectorDisabledForEdit: false,
         validate: state => {
         }
     };
@@ -683,6 +678,14 @@ export function getEditForm(owner, typeKey, prefix = '') {
                                 <Trans i18nKey="rssEntryImageUrl">RSS entry image URL</Trans>
                             </td>
                         </tr>
+                        <tr>
+                            <th scope="row">
+                                {tg('RSS_ENTRY_CUSTOM_TAGS')}
+                            </th>
+                            <td>
+                                <Trans>Mailtrain custom tags. The custom tags can be passed in via <code>mt:entries-json</code> element in RSS entry. The text contents of the elements is interpreted as JSON-formatted object..</Trans>
+                            </td>
+                        </tr>
                         </tbody>
                     </table>
                 </div>}

docker-entrypoint.sh

@@ -12,6 +12,15 @@ Optional parameters:
   --mongoHost XXX       - sets mongo host (default: mongo)
   --redisHost XXX       - sets redis host (default: redis)
   --mySqlHost XXX       - sets mysql host (default: mysql)
+  --withLdap            - use if you want to enable LDAP authentication
+  --ldapHost XXX        - LDAP Host for authentication (default: ldap)
+  --ldapPort XXX        - LDAP port (default: 389)
+  --ldapSecure          - use if you want to use LDAP with ldaps protocol
+  --ldapBindUser XXX    - User for LDAP connexion
+  --ldapBindPass XXX    - Password for LDAP connexion
+  --ldapFilter XXX      - LDAP filter
+  --ldapBaseDN XXX      - LDAP base DN
+  --ldapUidTag XXX      - LDAP UID tag (e.g. uid/cn/username)
 EOF
 
     exit 1
@@ -22,6 +31,15 @@ urlBaseTrusted=http://localhost:3000
 urlBaseSandbox=http://localhost:3003
 urlBasePublic=http://localhost:3004
 wwwProxy=false
+withLdap=false
+ldapHost=ldap
+ldapPort=389
+ldapSecure=false
+ldapBindUser=""
+ldapBindPass=""
+ldapFilter=""
+ldapBaseDN=""
+ldapUidTag=""
 mongoHost=mongo
 redisHost=redis
 mySqlHost=mysql
@@ -59,12 +77,73 @@ while [ $# -gt 0 ]; do
             mySqlHost="$2"
             shift 2
             ;;
+        --withLdap)
+            withLdap=true
+            shift 1
+            ;;
+        --ldapHost)
+            ldapHost="$2"
+            shift 2
+            ;;
+        --ldapPort)
+            ldapPort="$2"
+            shift 2
+            ;;
+        --ldapSecure)
+            ldapSecure=true
+            shift 1
+            ;;
+        --ldapBindUser)
+            ldapBindUser="$2"
+            shift 2
+            ;;
+        --ldapBindPass)
+            ldapBindPass="$2"
+            shift 2
+            ;;
+        --ldapFilter)
+            ldapFilter="$2"
+            shift 2
+            ;;
+        --ldapBaseDN)
+            ldapBaseDN="$2"
+            shift 2
+            ;;
+        --ldapUidTag)
+            ldapUidTag="$2"
+            shift 2
+            ;;
         *)
             echo "Error: unrecognized option $1."
             printHelp
     esac
 done
 
+if [ "$ldapBindUser" == "" ]; then
+  ldapBindUserLine=""
+else
+  ldapBindUserLine="bindUser: $ldapBindUser"
+fi
+if [ "$ldapBindPass" == "" ]; then
+  ldapBindPassLine=""
+else
+  ldapBindPassLine="bindPassword: $ldapBindPass"
+fi
+if [ "$ldapFilter" == "" ]; then
+  ldapFilterLine=""
+else
+  ldapFilterLine="filter: $ldapFilter"
+fi
+if [ "$ldapBaseDN" == "" ]; then
+  ldapBaseDNLine=""
+else
+  ldapBaseDNLine="baseDN: $ldapBaseDN"
+fi
+if [ "$ldapUidTag" == "" ]; then
+  ldapUidTagLine=""
+else
+  ldapUidTagLine="uidTag: $ldapUidTag"
+fi
 
 cat > server/config/production.yaml <<EOT
 www:
@@ -93,6 +172,17 @@ builtinZoneMTA:
 
 queue:
   processes: 5
+
+ldap:
+  enabled: $withLdap
+  host: $ldapHost
+  port: $ldapPort
+  secure: $ldapSecure
+  $ldapBindUserLine
+  $ldapBindPassLine
+  $ldapFilterLine
+  $ldapBaseDNLine
+  $ldapUidTagLine
 EOT
 
 cat > server/services/workers/reports/config/production.yaml <<EOT

locales/en-US/common.json

@@ -157,7 +157,7 @@
   "campaign_plural": "Campaigns",
   "contentOfTheSelectedCampaignWillBeCopied": "Content of the selected campaign will be copied into this campaign.",
   "renderUrl": "Render URL",
-  "ifAMessageIsSentThenThisUrlWillBePosTed": "If a message is sent then this URL will be POSTed to using Merge Tags as POST body. Use this if you want to generate the HTML message yourself.",
+  "ifAMessageIsSentThenThisUrlWillBePosTed": "If a message is sent then this URL will be POSTed to using Merge Tags as POST body. Use this if you want to generate the HTML message yourself. Example: http://www.example.com/foo",
   "deletingCampaign": "Deleting campaign ...",
   "campaignDeleted": "Campaign deleted",
   "formCannotBeEditedBecauseTheCampaignIs": "Form cannot be edited because the campaign is currently being sent out. Wait till the sending is finished and refresh.",

server/app-builder.js

@@ -23,6 +23,7 @@ const api = require('./routes/api');
 const reports = require('./routes/reports');
 const quickReports = require('./routes/quick-reports');
 const subscriptions = require('./routes/subscriptions');
+const campaigns = require('./routes/campaigns');
 const subscription = require('./routes/subscription');
 const sandboxedMosaico = require('./routes/sandboxed-mosaico');
 const sandboxedCKEditor = require('./routes/sandboxed-ckeditor');
@@ -60,7 +61,7 @@ const index = require('./routes/index');
 
 const interoperableErrors = require('../shared/interoperable-errors');
 
-const { getTrustedUrl } = require('./lib/urls');
+const { getTrustedUrl, getSandboxUrl, getPublicUrl } = require('./lib/urls');
 const { AppType } = require('../shared/app');
 
 
@@ -274,6 +275,8 @@ async function createApp(appType) {
         useWith404Fallback('/files', files);
     }
 
+    useWith404Fallback('/cpgs', await campaigns.getRouter(appType)); // This needs to be different from "campaigns", which is already used by the UI
+
     useWith404Fallback('/mosaico', await sandboxedMosaico.getRouter(appType));
     useWith404Fallback('/ckeditor', await sandboxedCKEditor.getRouter(appType));
     useWith404Fallback('/grapesjs', await sandboxedGrapesJS.getRouter(appType));
@@ -357,11 +360,21 @@ async function createApp(appType) {
             if (err instanceof interoperableErrors.NotLoggedInError) {
                 return res.redirect(getTrustedUrl('/login?next=' + encodeURIComponent(req.originalUrl)));
             } else {
+                let publicPath;
+                if (appType === AppType.TRUSTED) {
+                    publicPath = getTrustedUrl();
+                } else if (appType === AppType.SANDBOXED) {
+                    publicPath = getSandboxUrl();
+                } else if (appType === AppType.PUBLIC) {
+                    publicPath = getPublicUrl();
+                }
+
                 log.verbose('HTTP', err);
                 res.status(err.status || 500);
                 res.render('error', {
                     message: err.message,
-                    error: config.sendStacktracesToClient ? err : {}
+                    error: config.sendStacktracesToClient ? err : {},
+                    publicPath
                 });
             }
         }

server/config/default.yaml

@@ -139,6 +139,8 @@ ldap:
   # method: ldapjs
   host: localhost
   port: 3002
+  # secure enables ldaps protocol if true. Otherwise, ldap protocol is used.
+  secure: false
   baseDN: ou=users,dc=company
   filter: (|(username={{username}})(mail={{username}}))
   # Username field in LDAP (uid/cn/username)

server/lib/campaign-content.js

@@ -1,7 +1,11 @@
 'use strict';
 
+const {renderTag} = require('../../shared/templates');
+
 function convertFileURLs(sourceCustom, fromEntityType, fromEntityId, toEntityType, toEntityId) {
 
+    const tagLanguage = sourceCustom.tag_language;
+
     function convertText(text) {
         if (text) {
             const fromUrl = `/files/${fromEntityType}/file/${fromEntityId}`;
@@ -10,10 +14,10 @@ function convertFileURLs(sourceCustom, fromEntityType, fromEntityId, toEntityTyp
             const encodedFromUrl = encodeURIComponent(fromUrl);
             const encodedToUrl = encodeURIComponent(toUrl);
 
-            text = text.split('[URL_BASE]' + fromUrl).join('[URL_BASE]' + toUrl);
+            text = text.split(renderTag(tagLanguage, 'URL_BASE') + fromUrl).join(renderTag(tagLanguage, 'URL_BASE') + toUrl);
-            text = text.split('[SANDBOX_URL_BASE]' + fromUrl).join('[SANDBOX_URL_BASE]' + toUrl);
+            text = text.split(renderTag(tagLanguage,'SANDBOX_URL_BASE') + fromUrl).join(renderTag(tagLanguage, 'SANDBOX_URL_BASE') + toUrl);
-            text = text.split('[ENCODED_URL_BASE]' + encodedFromUrl).join('[ENCODED_URL_BASE]' + encodedToUrl);
+            text = text.split(renderTag(tagLanguage, 'ENCODED_URL_BASE') + encodedFromUrl).join(renderTag(tagLanguage, 'ENCODED_URL_BASE') + encodedToUrl);
-            text = text.split('[ENCODED_SANDBOX_URL_BASE]' + encodedFromUrl).join('[ENCODED_SANDBOX_URL_BASE]' + encodedToUrl);
+            text = text.split(renderTag(tagLanguage, 'ENCODED_SANDBOX_URL_BASE') + encodedFromUrl).join(renderTag(tagLanguage, 'ENCODED_SANDBOX_URL_BASE') + encodedToUrl);
         }
 
         return text;

server/lib/feedcheck.js

@@ -5,6 +5,8 @@ const log = require('./log');
 const path = require('path');
 const senders = require('./senders');
 const bluebird = require('bluebird');
+const feedparser = require('feedparser-promised');
+const {getPublicUrl} = require('./urls');
 
 let messageTid = 0;
 let feedcheckProcess;
@@ -42,5 +44,79 @@ function scheduleCheck() {
     messageTid++;
 }
 
+async function fetch(url) {
+    const httpOptions = {
+        uri: url,
+        headers: {
+            'user-agent': 'Mailtrain',
+            'accept': 'text/html,application/xhtml+xml'
+        }
+    };
+
+    const items = await feedparser.parse(httpOptions);
+
+    const entries = [];
+    for (const item of items) {
+        const entry = {
+            title: item.title,
+            date: item.date || item.pubdate || item.pubDate || new Date(),
+            guid: item.guid || item.link,
+            link: item.link,
+            content: item.description || item.summary,
+            summary: item.summary || item.description,
+            imageUrl: item.image.url,
+        };
+
+        if ('mt:entries-json' in item) {
+            entry.customTags = JSON.parse(item['mt:entries-json']['#'])
+        }
+
+        entries.push(entry);
+    }
+
+    return entries;
+}
+
+async function getEntryForPreview(url) {
+    const entries = await fetch(url);
+
+    let entry;
+    if (entries.length === 0) {
+        entry = {
+            title: "Lorem Ipsum",
+            date: new Date(),
+            guid: "c21bc6c8-d351-4000-aa1f-e7ff928084cd",
+            link: "http://www.example.com/sample-item.html",
+            content: "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Integer gravida a purus in commodo. Sed risus eros, pharetra sit amet sagittis vel, porta nec magna. Sed sollicitudin blandit ornare. Pellentesque a lacinia dui. Etiam ullamcorper, nisl at pharetra fringilla, enim nunc blandit quam, nec vestibulum purus lorem in urna.",
+            summary: "Aliquam malesuada nibh eget arcu egestas, id pellentesque urna egestas. Phasellus lacus est, viverra in dolor quis, aliquet elementum nisi. Donec hendrerit elit pretium vehicula pharetra. Pellentesque aliquam elit id rutrum imperdiet. Phasellus ac enim at lacus sodales condimentum vitae quis sapien.",
+            imageUrl: getPublicUrl('static/mailtrain-notext.png'),
+            customTags: {
+                placerat: "Ligula at consequat",
+                accumsan: {
+                    mauris: "Placerat nec justo",
+                    ornare: "Nunc egestas"
+                },
+                fringilla: 42,
+                purus: [
+                    {
+                        consequat: "Vivamus",
+                        enim: "volutpat blandit"
+                    },
+                    {
+                        consequat: "Phasellus",
+                        enim: "sed semper"
+                    }
+                ]
+            }
+        };
+    } else {
+        entry = entries[0];
+    }
+
+    return entry;
+}
+
 module.exports.spawn = bluebird.promisify(spawn);
 module.exports.scheduleCheck = scheduleCheck;
+module.exports.fetch = fetch;
+module.exports.getEntryForPreview = getEntryForPreview;

server/lib/message-sender.js

@@ -43,7 +43,7 @@ class MessageSender {
 
         Option #1
         - settings.type in [MessageType.REGULAR, MessageType.TRIGGERED, MessageType.TEST]
-        - campaignCid / campaignId
+        - campaign / campaignCid / campaignId
         - listId / listCid [optional if campaign is provided]
         - sendConfigurationId [optional if campaign is provided]
         - attachments [optional]
@@ -68,7 +68,9 @@ class MessageSender {
             if (this.type === MessageType.REGULAR || this.type === MessageType.TRIGGERED || this.type === MessageType.TEST) {
                 this.isMassMail = true;
 
-                if (settings.campaignCid) {
+                if (settings.campaign) {
+                    this.campaign = settings.campaign;
+                } else if (settings.campaignCid) {
                     this.campaign = await campaigns.rawGetByTx(tx, 'cid', settings.campaignCid);
                 } else if (settings.campaignId) {
                     this.campaign = await campaigns.rawGetByTx(tx, 'id', settings.campaignId);
@@ -155,6 +157,12 @@ class MessageSender {
                 this.tagLanguage = this.campaign.data.sourceCustom.tag_language;
             }
 
+            if (settings.rssEntry !== undefined) {
+                this.rssEntry = settings.rssEntry;
+            } else if (this.campaign && this.campaign.data.rssEntry) {
+                this.rssEntry = this.campaign.data.rssEntry;
+            }
+
             enforce(this.renderedHtml || (this.campaign && this.campaign.source === CampaignSource.URL) || this.tagLanguage);
 
             if (settings.subject !== undefined) {
@@ -192,14 +200,16 @@ class MessageSender {
                 form[key] = mergeTags[key];
             }
 
+            const sourceUrl = campaign.data.sourceUrl;
+
             const response = await request.post({
-                uri: campaign.sourceUrl,
+                uri: sourceUrl,
                 form,
                 resolveWithFullResponse: true
             });
 
             if (response.statusCode !== 200) {
-                throw new Error(`Received status code ${httpResponse.statusCode} from ${campaign.sourceUrl}`);
+                throw new Error(`Received status code ${httpResponse.statusCode} from ${sourceUrl}`);
             }
 
             html = response.body;
@@ -245,11 +255,11 @@ class MessageSender {
         };
     }
 
-    _getExtraTags(campaign) {
+    _getExtraTags() {
         const tags = {};
 
-        if (campaign && campaign.type === CampaignType.RSS_ENTRY) {
+        if (this.rssEntry) {
-            const rssEntry = campaign.data.rssEntry;
+            const rssEntry = this.rssEntry;
             tags['RSS_ENTRY_TITLE'] = rssEntry.title;
             tags['RSS_ENTRY_DATE'] = rssEntry.date;
             tags['RSS_ENTRY_LINK'] = rssEntry.link;
@@ -311,7 +321,7 @@ class MessageSender {
             const flds = this.listsFieldsGrouped.get(list.id);
 
             if (!mergeTags) {
-                mergeTags = fields.getMergeTags(flds, subscriptionGrouped, this._getExtraTags(campaign));
+                mergeTags = fields.getMergeTags(flds, subscriptionGrouped, this._getExtraTags());
             }
 
             for (const fld of flds) {
@@ -539,7 +549,8 @@ async function sendQueuedMessage(queuedMessage) {
         subject: msgData.subject,
         tagLanguage: msgData.tagLanguage,
         renderedHtml: msgData.renderedHtml,
-        renderedText: msgData.renderedText
+        renderedText: msgData.renderedText,
+        rssEntry: msgData.rssEntry
     });
 
     const campaign = cs.campaign;
@@ -696,9 +707,9 @@ async function queueSubscriptionMessage(sendConfigurationId, to, subject, encryp
     senders.scheduleCheck();
 }
 
-async function getMessage(campaignCid, listCid, subscriptionCid) {
+async function getMessage(campaignCid, listCid, subscriptionCid, settings) {
     const cs = new MessageSender();
-    await cs._init({type: MessageType.REGULAR, campaignCid, listCid});
+    await cs._init({type: MessageType.REGULAR, campaignCid, listCid, ...settings});
 
     const campaign = cs.campaign;
     const list = cs.listsByCid.get(listCid);
@@ -732,7 +743,7 @@ async function getMessage(campaignCid, listCid, subscriptionCid) {
     }
 
     const flds = cs.listsFieldsGrouped.get(list.id);
-    const mergeTags = fields.getMergeTags(flds, subscriptionGrouped, cs._getExtraTags(campaign));
+    const mergeTags = fields.getMergeTags(flds, subscriptionGrouped, cs._getExtraTags());
 
     return await cs._getMessage(mergeTags, list, subscriptionGrouped, false);
 }

server/lib/passport.js

@@ -20,7 +20,8 @@ let authMode = 'local';
 let LdapStrategy;
 let ldapStrategyOpts;
 if (config.ldap.enabled) {
-    if (!config.ldap.method || config.ldap.method == 'ldapjs') {
+    const ldapProtocol = config.ldap.secure ? 'ldaps' : 'ldap';
+    if (!config.ldap.method || config.ldap.method === 'ldapjs') {
         try {
             LdapStrategy = require('passport-ldapjs').Strategy; // eslint-disable-line global-require
             authMode = 'ldapjs';
@@ -28,7 +29,7 @@ if (config.ldap.enabled) {
 
             ldapStrategyOpts = {
                 server: {
-                    url: 'ldap://' + config.ldap.host + ':' + config.ldap.port
+                    url: ldapProtocol + '://' + config.ldap.host + ':' + config.ldap.port
                 },
                 base: config.ldap.baseDN,
                 search: {
@@ -46,7 +47,7 @@ if (config.ldap.enabled) {
         }
     }
 
-    if (!LdapStrategy && (!config.ldap.method || config.ldap.method == 'ldapauth')) {
+    if (!LdapStrategy && (!config.ldap.method || config.ldap.method === 'ldapauth')) {
         try {
             LdapStrategy = require('passport-ldapauth').Strategy; // eslint-disable-line global-require
             authMode = 'ldapauth';
@@ -54,7 +55,7 @@ if (config.ldap.enabled) {
 
             ldapStrategyOpts = {
                 server: {
-                    url: 'ldap://' + config.ldap.host + ':' + config.ldap.port,
+                    url: ldapProtocol + '://' + config.ldap.host + ':' + config.ldap.port,
                     searchBase: config.ldap.baseDN,
                     searchFilter: config.ldap.filter,
                     searchAttributes: [config.ldap.uidTag, config.ldap.nameTag, 'mail'],

server/models/campaigns.js

@@ -358,7 +358,7 @@ async function rawGetByTx(tx, key, id) {
         .first();
 
     if (!entity) {
-        throw new interoperableErrors.NotFoundError();
+        throw new shares.throwPermissionDenied();
     }
 
     if (entity.lists) {
@@ -425,6 +425,16 @@ async function getById(context, id, withPermissions = true, content = Content.AL
     });
 }
 
+async function getByCid(context, cid) {
+    return await knex.transaction(async tx => {
+        const entity = await rawGetByTx(tx,'cid', cid);
+
+        await shares.enforceEntityPermissionTx(tx, context, 'campaign', entity.id, 'view');
+
+        return entity;
+    });
+}
+
 async function _validateAndPreprocess(tx, context, entity, isCreate, content) {
     if (content === Content.ALL || content === Content.WITHOUT_SOURCE_CUSTOM || content === Content.RSS_ENTRY) {
         await namespaceHelpers.validateEntity(tx, entity);
@@ -991,6 +1001,10 @@ async function testSend(context, data) {
                 attachments: []
             };
 
+            if (campaign.type === CampaignType.RSS) {
+                messageData.rssEntry = await feedcheck.getEntryForPreview(campaign.data.feedUrl);
+            }
+
             const attachments = await files.listTx(tx, contextHelpers.getAdminContext(), 'campaign', 'attachment', campaignId);
             for (const attachment of attachments) {
                 messageData.attachments.push({
@@ -1057,6 +1071,30 @@ async function testSend(context, data) {
     senders.scheduleCheck();
 }
 
+async function getRssPreview(context, campaignCid, listCid, subscriptionCid) {
+    const campaign = await getByCid(context, campaignCid);
+    await shares.enforceEntityPermission(context, 'campaign', campaign.id, 'view');
+
+    enforce(campaign.type === CampaignType.RSS);
+
+    const list = await lists.getByCid(context, listCid);
+    await shares.enforceEntityPermission(context, 'list', list.id, 'viewTestSubscriptions');
+
+    const subscription = await subscriptions.getByCid(context, list.id, subscriptionCid);
+
+    if (!subscription.is_test) {
+        shares.throwPermissionDenied();
+    }
+
+    const settings = {
+        campaign, // this prevents message sender from fetching the campaign again
+        rssEntry: await feedcheck.getEntryForPreview(campaign.data.feedUrl)
+    };
+
+    return await messageSender.getMessage(campaignCid, listCid, subscriptionCid, settings);
+}
+
+
 module.exports.Content = Content;
 module.exports.hash = hash;
 
@@ -1073,6 +1111,7 @@ module.exports.listLinkClicksDTAjax = listLinkClicksDTAjax;
 
 module.exports.getByIdTx = getByIdTx;
 module.exports.getById = getById;
+module.exports.getByCid = getByCid;
 module.exports.create = create;
 module.exports.createRssTx = createRssTx;
 module.exports.updateWithConsistencyCheck = updateWithConsistencyCheck;
@@ -1102,3 +1141,4 @@ module.exports.getStatisticsOpened = getStatisticsOpened;
 module.exports.fetchRssCampaign = fetchRssCampaign;
 
 module.exports.testSend = testSend;
+module.exports.getRssPreview = getRssPreview;

server/models/fields.js

@@ -8,6 +8,7 @@ const interoperableErrors = require('../../shared/interoperable-errors');
 const shares = require('./shares');
 const validators = require('../../shared/validators');
 const shortid = require('shortid');
+const slugify = require('slugify');
 const segments = require('./segments');
 const { formatDate, formatBirthday, parseDate, parseBirthday } = require('../../shared/date');
 const { getFieldColumn } = require('../../shared/lists');
@@ -542,7 +543,7 @@ async function createTx(tx, context, listId, entity) {
 
     let columnName;
     if (!fieldType.grouped) {
-        columnName = ('custom_' + '_' + shortid.generate()).toLowerCase().replace(/[^a-z0-9_]/g, '_');
+        columnName = ('custom_' + slugify(entity.name, '_').substring(0, 32) + '_' + shortid.generate()).toLowerCase().replace(/[^a-z0-9_]/g, '_');
     }
 
     const filteredEntity = filterObject(entity, allowedKeysCreate);

server/models/subscriptions.js

@@ -420,7 +420,7 @@ async function list(context, listId, grouped, offset, limit) {
 }
 
 async function listTestUsersTx(tx, context, listId, segmentId, grouped) {
-    await shares.enforceEntityPermissionTx(tx, context, 'list', listId, 'viewSubscriptions');
+    await shares.enforceEntityPermissionTx(tx, context, 'list', listId, 'viewTestSubscriptions');
 
     let entitiesQry = tx(getSubscriptionTableName(listId)).orderBy('id', 'asc').where('is_test', true).limit(TEST_USERS_LIST_LIMIT);
 

server/routes/campaigns.js

@@ -0,0 +1,69 @@
+'use strict';
+
+const passport = require('../lib/passport');
+const routerFactory = require('../lib/router-async');
+const campaigns = require('../models/campaigns');
+const lists = require('../models/lists');
+const users = require('../models/users');
+const contextHelpers = require('../lib/context-helpers');
+const { AppType } = require('../../shared/app');
+
+
+users.registerRestrictedAccessTokenMethod('rssPreview', async ({campaignCid, listCid}) => {
+
+    const campaign = await campaigns.getByCid(contextHelpers.getAdminContext(), campaignCid);
+    const list = await lists.getByCid(contextHelpers.getAdminContext(), listCid);
+
+    return {
+        permissions: {
+            'campaign': {
+                [campaign.id]: new Set(['view'])
+            },
+            'list': {
+                [list.id]: new Set(['view', 'viewTestSubscriptions'])
+            }
+        }
+    };
+});
+
+async function getRouter(appType) {
+    const router = routerFactory.create();
+
+    if (appType === AppType.SANDBOXED) {
+
+        router.get('/rss-preview/:campaign/:list/:subscription', passport.loggedIn, (req, res, next) => {
+            campaigns.getRssPreview(req.context, req.params.campaign, req.params.list, req.params.subscription)
+                .then(result => {
+                    const {html} = result;
+
+                    if (html.match(/<\/body\b/i)) {
+                        res.render('partials/tracking-scripts', {
+                            layout: 'archive/layout-raw'
+                        }, (err, scripts) => {
+                            if (err) {
+                                return next(err);
+                            }
+                            const htmlWithScripts = scripts ? html.replace(/<\/body\b/i, match => scripts + match) : html;
+
+                            res.render('archive/view', {
+                                layout: 'archive/layout-raw',
+                                message: htmlWithScripts
+                            });
+                        });
+
+                    } else {
+                        res.render('archive/view', {
+                            layout: 'archive/layout-wrapped',
+                            message: html
+                        });
+                    }
+
+                })
+                .catch(err => next(err));
+        });
+    }
+
+    return router;
+}
+
+module.exports.getRouter = getRouter;

server/routes/sandboxed-mosaico.js

@@ -141,7 +141,7 @@ async function getRouter(appType) {
             const tmpl = await mosaicoTemplates.getById(req.context, castToInteger(req.params.mosaicoTemplateId));
 
             res.set('Content-Type', 'text/html');
-            res.send(base(tmpl.data.html, getTrustedUrl(), getSandboxUrl('', req.context), getPublicUrl()));
+            res.send(base(tmpl.data.html, tmpl.tag_language, getTrustedUrl(), getSandboxUrl('', req.context), getPublicUrl()));
         });
 
         // Mosaico looks for block thumbnails in edres folder relative to index.html of the template. We respond to such requests here.

server/routes/subscriptions.js

@@ -1,8 +1,6 @@
 'use strict';
 
 const passport = require('../lib/passport');
-const shares = require('../models/shares');
-const contextHelpers = require('../lib/context-helpers');
 const router = require('../lib/router-async').create();
 const subscriptions = require('../models/subscriptions');
 const {castToInteger} = require('../lib/helpers');

server/services/feedcheck.js

@@ -3,10 +3,10 @@
 const config = require('../lib/config');
 const log = require('../lib/log');
 const knex = require('../lib/knex');
-const feedparser = require('feedparser-promised');
 const { CampaignType, CampaignStatus, CampaignSource } = require('../../shared/campaigns');
 const campaigns = require('../models/campaigns');
 const contextHelpers = require('../lib/context-helpers');
+const {fetch} = require('../lib/feedcheck');
 require('../lib/fork');
 
 const { tLog } = require('../lib/translate');
@@ -19,39 +19,6 @@ let running = false;
 
 let periodicTimeout = null;
 
-async function fetch(url) {
-    const httpOptions = {
-        uri: url,
-        headers: {
-            'user-agent': 'Mailtrain',
-            'accept': 'text/html,application/xhtml+xml'
-        }
-    };
-
-    const items = await feedparser.parse(httpOptions);
-
-    const entries = [];
-    for (const item of items) {
-        const entry = {
-            title: item.title,
-            date: item.date || item.pubdate || item.pubDate || new Date(),
-            guid: item.guid || item.link,
-            link: item.link,
-            content: item.description || item.summary,
-            summary: item.summary || item.description,
-            imageUrl: item.image.url,
-        };
-
-        if ('mt:entries-json' in item) {
-            entry.customTags = JSON.parse(item['mt:entries-json']['#'])
-        }
-
-        entries.push(entry);
-    }
-
-    return entries;
-}
-
 async function run() {
     if (running) {
         return;

server/setup/knex/config.js

@@ -4,6 +4,6 @@ if (!process.env.NODE_CONFIG_DIR) {
     process.env.NODE_CONFIG_DIR = __dirname + '/../../config';
 }
 
-const config = require('server/setup/knex/config');
+const config = require('../../lib/config');
 
 module.exports = config;

server/setup/knex/fixes/fix-20190726150000_shorten_field_column_names.js

@@ -0,0 +1,69 @@
+'use strict';
+
+const config = require('../config');
+const knex = require('../../../lib/knex');
+const shortid = require('shortid');
+const slugify = require('slugify');
+
+async function run() {
+    const lists = await knex('lists');
+    for (const list of lists) {
+        console.log(`Processing list ${list.id}`);
+        const fields = await knex('custom_fields').whereNotNull('column').where('list', list.id);
+
+        const fieldsMap = new Map();
+        const prefixesMap = new Map();
+
+        for (const field of fields) {
+            const oldName = field.column;
+            const newName = ('custom_' + slugify(field.name, '_').substring(0, 32) + '_' + shortid.generate()).toLowerCase().replace(/[^a-z0-9_]/g, '_');
+            const formerPrefix = ('custom_' + slugify(field.name, '_') + '_').toLowerCase().replace(/[^a-z0-9_]/g, '');
+
+            fieldsMap.set(oldName, newName);
+            prefixesMap.set(formerPrefix, newName);
+
+            await knex('custom_fields').where('id', field.id).update('column', newName);
+
+            await knex.schema.table('subscription__' + list.id, table => {
+                table.renameColumn(oldName, newName);
+                table.renameColumn('source_' + oldName, 'source_' + newName);
+            });
+        }
+
+
+        function processRule(rule) {
+            if (rule.type === 'all' || rule.type === 'some' || rule.type === 'none') {
+                for (const childRule of rule.rules) {
+                    processRule(childRule);
+                }
+            } else {
+                let newName = fieldsMap.get(rule.column);
+                if (newName) {
+                    rule.column = newName;
+                    return;
+                }
+
+                for (const [formerPrefix, newName] of prefixesMap.entries()) {
+                    if (rule.column.startsWith(formerPrefix)) {
+                        rule.column = newName;
+                        return;
+                    }
+                }
+            }
+        }
+
+        const segments = await knex('segments').where('list', list.id);
+        for (const segment of segments) {
+            const settings = JSON.parse(segment.settings);
+            processRule(settings.rootRule);
+            await knex('segments').where('id', segment.id).update({settings: JSON.stringify(settings)});
+        }
+    }
+
+    await knex('knex_migrations').where('name', '20190726150000_shorten_field_column_names.js').del();
+
+    console.log('All fixes done');
+    process.exit();
+}
+
+run().catch(err => console.error(err));

server/setup/knex/migrations/20170506102634_v1_to_v2.js

@@ -11,6 +11,8 @@ const { EntityVals: TriggerEntityVals, EventVals: TriggerEventVals } = require('
 const { SubscriptionSource } = require('../../../../shared/lists');
 const {DOMParser, XMLSerializer} = require('xmldom');
 const log = require('../../../lib/log');
+const shortid = require('shortid');
+const slugify = require('slugify');
 
 const entityTypesAddNamespace = ['list', 'custom_form', 'template', 'campaign', 'report', 'report_template', 'user'];
 const shareableEntityTypes = ['list', 'custom_form', 'template', 'campaign', 'report', 'report_template', 'namespace', 'send_configuration', 'mosaico_template'];
@@ -236,16 +238,54 @@ async function migrateUsers(knex) {
     });
 }
 
+async function shortenFieldColumnNames(knex, list) {
+    const fields = await knex('custom_fields').whereNotNull('column').where('list', list.id);
+
+    const fieldsMap = new Map();
+
+    for (const field of fields) {
+        const oldName = field.column;
+        const newName = ('custom_' + slugify(field.name, '_').substring(0,32) + '_' + shortid.generate()).toLowerCase().replace(/[^a-z0-9_]/g, '_');
+
+        fieldsMap.set(oldName, newName);
+
+        await knex('custom_fields').where('id', field.id).update('column', newName);
+
+        await knex.schema.table('subscription__' + list.id, table => {
+            table.renameColumn(oldName, newName);
+        });
+    }
+
+
+    function processRule(rule) {
+        if (rule.type === 'all' || rule.type === 'some' || rule.type === 'none') {
+            for (const childRule of rule.rules) {
+                processRule(childRule);
+            }
+        } else {
+            rule.column = fieldsMap.get(rule.column) || rule.column /* this is to handle "email" column */;
+        }
+    }
+
+    const segments = await knex('segments').where('list', list.id);
+    for (const segment of segments) {
+        const settings = JSON.parse(segment.settings);
+        processRule(settings.rootRule);
+        await knex('segments').where('id', segment.id).update({settings: JSON.stringify(settings)});
+    }
+}
+
 async function migrateSubscriptions(knex) {
     await knex.schema.dropTableIfExists('subscription');
 
     const lists = await knex('lists');
     for (const list of lists) {
+        await shortenFieldColumnNames(knex, list);
+
         await knex.schema.raw('ALTER TABLE `subscription__' + list.id + '` ADD `unsubscribed` timestamp NULL DEFAULT NULL');
         await knex.schema.raw('ALTER TABLE `subscription__' + list.id + '` ADD `source_email` int(11) DEFAULT NULL');
         await knex.schema.raw('ALTER TABLE `subscription__' + list.id + '` ADD `hash_email` varchar(255) CHARACTER SET ascii');
 
-
         const fields = await knex('custom_fields').where('list', list.id);
         const info = await knex('subscription__' + list.id).columnInfo();
         for (const field of fields) {
@@ -1251,11 +1291,12 @@ exports.up = (knex, Promise) => (async() => {
     await migrateCustomFields(knex);
     log.verbose('Migration', 'Custom fields complete')
 
-    await migrateSubscriptions(knex);
-
     await migrateSegments(knex);
     log.verbose('Migration', 'Segments complete')
 
+    await migrateSubscriptions(knex);
+    log.verbose('Migration', 'Subscriptions complete')
+
     await migrateReports(knex);
     log.verbose('Migration', 'Reports complete')
 

server/setup/knex/migrations/20190726150000_shorten_field_column_names.js

@@ -1,21 +0,0 @@
-const shortid = require('shortid');
-
-exports.up = (knex, Promise) => (async() => {
-    const fields = await knex('custom_fields').whereNotNull('column');
-
-    for (const field of fields) {
-        const listId = field.list;
-        const oldName = field.column;
-        const newName = ('custom_' + '_' + shortid.generate()).toLowerCase().replace(/[^a-z0-9_]/g, '_');
-
-        await knex('custom_fields').where('id', field.id).update('column', newName);
-
-        await knex.schema.table('subscription__' + listId, table => {
-            table.renameColumn(oldName, newName);
-            table.renameColumn('source_' + oldName, 'source_' + newName);
-        });
-    }
-})();
-
-exports.down = (knex, Promise) => (async() => {
-})();

shared/templates.js

@@ -44,28 +44,28 @@ function getMergeTagsForBases(trustedBaseUrl, sandboxBaseUrl, publicBaseUrl) {
     };
 }
 
-function base(text, trustedBaseUrl, sandboxBaseUrl, publicBaseUrl) {
+function base(text, tagLanguage, trustedBaseUrl, sandboxBaseUrl, publicBaseUrl) {
     const bases = _getBases(trustedBaseUrl, sandboxBaseUrl, publicBaseUrl);
 
-    text = text.split('[URL_BASE]').join(bases.publicBaseUrl);
+    text = text.split(renderTag(tagLanguage, 'URL_BASE')).join(bases.publicBaseUrl);
-    text = text.split('[TRUSTED_URL_BASE]').join(bases.trustedBaseUrl);
+    text = text.split(renderTag(tagLanguage, 'TRUSTED_URL_BASE')).join(bases.trustedBaseUrl);
-    text = text.split('[SANDBOX_URL_BASE]').join(bases.sandboxBaseUrl);
+    text = text.split(renderTag(tagLanguage, 'SANDBOX_URL_BASE')).join(bases.sandboxBaseUrl);
-    text = text.split('[ENCODED_URL_BASE]').join(encodeURIComponent(bases.publicBaseUrl));
+    text = text.split(renderTag(tagLanguage, 'ENCODED_URL_BASE')).join(encodeURIComponent(bases.publicBaseUrl));
-    text = text.split('[ENCODED_TRUSTED_URL_BASE]').join(encodeURIComponent(bases.trustedBaseUrl));
+    text = text.split(renderTag(tagLanguage, 'ENCODED_TRUSTED_URL_BASE')).join(encodeURIComponent(bases.trustedBaseUrl));
-    text = text.split('[ENCODED_SANDBOX_URL_BASE]').join(encodeURIComponent(bases.sandboxBaseUrl));
+    text = text.split(renderTag(tagLanguage, 'ENCODED_SANDBOX_URL_BASE')).join(encodeURIComponent(bases.sandboxBaseUrl));
 
     return text;
 }
 
-function unbase(text, trustedBaseUrl, sandboxBaseUrl, publicBaseUrl, treatAllAsPublic = false) {
+function unbase(text, tagLanguage, trustedBaseUrl, sandboxBaseUrl, publicBaseUrl, treatAllAsPublic = false) {
     const bases = _getBases(trustedBaseUrl, sandboxBaseUrl, publicBaseUrl);
 
-    text = text.split(bases.publicBaseUrl).join('[URL_BASE]');
+    text = text.split(bases.publicBaseUrl).join(renderTag(tagLanguage, 'URL_BASE'));
-    text = text.split(bases.trustedBaseUrl).join(treatAllAsPublic ? '[URL_BASE]' : '[TRUSTED_URL_BASE]');
+    text = text.split(bases.trustedBaseUrl).join(renderTag(tagLanguage, treatAllAsPublic ? 'URL_BASE' : 'TRUSTED_URL_BASE'));
-    text = text.split(bases.sandboxBaseUrl).join(treatAllAsPublic ? '[URL_BASE]' : '[SANDBOX_URL_BASE]');
+    text = text.split(bases.sandboxBaseUrl).join(renderTag(tagLanguage, treatAllAsPublic ? 'URL_BASE' : 'SANDBOX_URL_BASE'));
-    text = text.split(encodeURIComponent(bases.publicBaseUrl)).join('[ENCODED_URL_BASE]');
+    text = text.split(encodeURIComponent(bases.publicBaseUrl)).join(renderTag(tagLanguage, 'ENCODED_URL_BASE'));
-    text = text.split(encodeURIComponent(bases.trustedBaseUrl)).join(treatAllAsPublic ? '[ENCODED_URL_BASE]' : '[ENCODED_TRUSTED_URL_BASE]');
+    text = text.split(encodeURIComponent(bases.trustedBaseUrl)).join(renderTag(tagLanguage, treatAllAsPublic ? 'ENCODED_URL_BASE' : 'ENCODED_TRUSTED_URL_BASE'));
-    text = text.split(encodeURIComponent(bases.sandboxBaseUrl)).join(treatAllAsPublic ? '[ENCODED_URL_BASE]' : '[ENCODED_SANDBOX_URL_BASE]');
+    text = text.split(encodeURIComponent(bases.sandboxBaseUrl)).join(renderTag(tagLanguage, treatAllAsPublic ? 'ENCODED_URL_BASE' : 'ENCODED_SANDBOX_URL_BASE'));
 
     return text;
 }