nodemailer/wildduck
1
1
Fork 0
mirror of https://github.com/nodemailer/wildduck.git synced 2025-10-22 03:37:05 +08:00
Code Issues Projects Releases Packages Wiki Activity

handle name parsing failures

Browse source
This commit is contained in:
Andris Reinman 2020-02-19 10:12:49 +02:00
parent 0b09f1d87e
commit fa695adc70
No known key found for this signature in database
GPG key ID: 5388A30A31834D83
3 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/api/updates.js
View file

@ -337,7 +337,7 @@ function loadJournalStream(db, req, res, user, lastEventId, done) {
if (!e || !e.command) { if (!e || !e.command) {
// skip // skip
return processNext(); return setImmediate(processNext);
} }
switch (e.command) { switch (e.command) {
@ -354,10 +354,16 @@ function loadJournalStream(db, req, res, user, lastEventId, done) {
break; break;
} }
res.write(formatJournalData(e)); try {
let data = formatJournalData(e);
res.write(data);
} catch (err) {
console.error(err);
console.error(e);
}
processed++; processed++;
processNext(); return setImmediate(processNext);
}); });
}; };

2
lib/api/users.js
View file

@ -1,5 +1,6 @@
'use strict'; 'use strict';
const log = require('npmlog');
const config = require('wild-config'); const config = require('wild-config');
const Joi = require('../joi'); const Joi = require('../joi');
const MongoPaging = require('mongo-cursor-pagination'); const MongoPaging = require('mongo-cursor-pagination');
@ -727,6 +728,7 @@ module.exports = (db, server, userHandler) => {
try { try {
id = await userHandler.create(result.value); id = await userHandler.create(result.value);
} catch (err) { } catch (err) {
log.error('API', err);
res.json({ res.json({
error: err.message, error: err.message,
code: err.code, code: err.code,

3
lib/user-handler.js
View file

@ -1501,8 +1501,8 @@ class UserHandler {
} }
if (this.messageHandler && !data.emptyAddress) { if (this.messageHandler && !data.emptyAddress) {
let parsedName = humanname.parse(userData.name || '');
try { try {
let parsedName = humanname.parse(userData.name || '');
await this.pushDefaultMessages(userData, { await this.pushDefaultMessages(userData, {
NAME: userData.name || userData.username || address, NAME: userData.name || userData.username || address,
FNAME: parsedName.firstName, FNAME: parsedName.firstName,
@ -1511,6 +1511,7 @@ class UserHandler {
EMAIL: address EMAIL: address
}); });
} catch (err) { } catch (err) {
log.error('DB', 'PARSEFAIL name=%s error=%s', userData.name, err.message);
// ignore? // ignore?
} }
} }