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

Subscription/unsubscription seems to work.

Browse source
This commit is contained in:
Tomas Bures 2018-01-27 16:37:14 +01:00
parent d8ee364a4b
commit e9165838dc
22 changed files with 14939 additions and 196 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lib/context-helpers.js
View file

@ -10,18 +10,18 @@ function getRequestContext(req) {
return context;
}
function getAdminContext() {
const context = {
user: {
admin: true,
id: 0,
username: '',
name: '',
email: ''
}
};
const adminContext = {
user: {
admin: true,
id: 0,
username: '',
name: '',
email: ''
}
};
return context;
function getAdminContext() {
return adminContext;
}
module.exports = {

4
lib/dt-helpers.js
View file

@ -166,13 +166,13 @@ async function ajaxListWithPermissionsTx(tx, context, fetchSpecs, params, queryF
async function ajaxList(params, queryFun, columns, options) {
return await knex.transaction(async tx => {
return ajaxListTx(tx, params, queryFun, columns, options)
return await ajaxListTx(tx, params, queryFun, columns, options)
});
}
async function ajaxListWithPermissions(context, fetchSpecs, params, queryFun, columns, options) {
return await knex.transaction(async tx => {
return ajaxListWithPermissionsTx(tx, context, fetchSpecs, params, queryFun, columns, options)
return await ajaxListWithPermissionsTx(tx, context, fetchSpecs, params, queryFun, columns, options)
});
}

2
lib/knex.js
View file

@ -8,7 +8,7 @@ const knex = require('knex')({
migrations: {
directory: __dirname + '/../setup/knex/migrations'
}
, debug: true
//, debug: true
});
module.exports = knex;

2
lib/subscription-mail-helpers.js
View file

@ -117,7 +117,7 @@ async function _sendMail(list, email, template, subject, relativeUrls, mailOpts,
const encryptionKeys = [];
for (const fld of flds) {
if (fld.type === 'gpg' && field.value) {
if (fld.type === 'gpg' && fld.value) {
encryptionKeys.push(subscription[getFieldKey(fld)].value.trim());
}
}

23
lib/tools-async.js
View file

@ -6,10 +6,13 @@ const isemail = require('isemail');
const bluebird = require('bluebird');
const mergeTemplateIntoLayout = bluebird.promisify(require('./tools').mergeTemplateIntoLayout);
const queryParams = require('./tools').queryParams;
module.exports = {
validateEmail,
mergeTemplateIntoLayout
validateEmailGetMessage,
mergeTemplateIntoLayout,
queryParams
};
async function validateEmail(address, checkBlocked) {
@ -29,3 +32,21 @@ async function validateEmail(address, checkBlocked) {
return result;
}
function validateEmailGetMessage(result, address) {
if (result !== 0) {
let message = util.format(_('Invalid email address "%s".'), address);
switch (result) {
case 5:
message += ' ' + _('MX record not found for domain');
break;
case 6:
message += ' ' + _('Address domain not found');
break;
case 12:
message += ' ' + _('Address domain name is required');
break;
}
return message;
}
}