Updated PGP handling

This commit is contained in:
Andris Reinman 2017-08-03 15:53:21 +03:00
parent e3ebad198f
commit ba1fc7f3ad

View file

@ -92,6 +92,7 @@ module.exports = (db, server, messageHandler) => {
subject: true,
'mimeTree.parsedHeader.from': true,
'mimeTree.parsedHeader.sender': true,
'mimeTree.parsedHeader.content-type': true,
ha: true,
intro: true,
unseen: true,
@ -172,6 +173,20 @@ module.exports = (db, server, messageHandler) => {
draft: messageData.draft,
url: server.router.render('message', { user, mailbox, message: messageData.uid })
};
let parsedContentType = parsedHeader['content-type'];
if (parsedContentType) {
response.contentType = {
value: parsedContentType.value
};
if (parsedContentType.hasParams) {
response.contentType.params = parsedContentType.params;
}
if (parsedContentType.subtype === 'encrypted') {
response.encrypted = true;
}
}
return response;
})
};
@ -265,6 +280,7 @@ module.exports = (db, server, messageHandler) => {
subject: true,
'mimeTree.parsedHeader.from': true,
'mimeTree.parsedHeader.sender': true,
'mimeTree.parsedHeader.content-type': true,
ha: true,
intro: true,
unseen: true,
@ -335,6 +351,21 @@ module.exports = (db, server, messageHandler) => {
draft: messageData.draft,
url: server.router.render('message', { user, mailbox: messageData.mailbox, message: messageData.uid })
};
let parsedContentType = parsedHeader['content-type'];
if (parsedContentType) {
response.contentType = {
value: parsedContentType.value
};
if (parsedContentType.hasParams) {
response.contentType.params = parsedContentType.params;
}
if (parsedContentType.subtype === 'encrypted') {
response.encrypted = true;
}
}
return response;
})
};
@ -499,7 +530,7 @@ module.exports = (db, server, messageHandler) => {
};
ensureSeen(() => {
res.json({
let response = {
success: true,
id: message,
from: from[0],
@ -521,7 +552,23 @@ module.exports = (db, server, messageHandler) => {
return attachment;
}),
raw: server.router.render('raw', { user, mailbox, message })
});
};
let parsedContentType = parsedHeader['content-type'];
if (parsedContentType) {
response.contentType = {
value: parsedContentType.value
};
if (parsedContentType.hasParams) {
response.contentType.params = parsedContentType.params;
}
if (parsedContentType.subtype === 'encrypted') {
response.encrypted = true;
}
}
res.json(response);
return next();
});
});