From 48d6e53d22ad4121d5dfc6095fa7ce5262e6b421 Mon Sep 17 00:00:00 2001
From: Andris Reinman <andris@kreata.ee>
Date: Mon, 18 Jun 2018 16:29:10 +0300
Subject: [PATCH] fixed api without imap

---
 api.js              | 2 +-
 lib/api/messages.js | 2 +-
 lib/api/users.js    | 2 +-
 lib/maildropper.js  | 6 +++---
 package.json        | 5 ++---
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/api.js b/api.js
index 251e0d13..7cd2a6fc 100644
--- a/api.js
+++ b/api.js
@@ -106,7 +106,7 @@ server.use(
 );
 
 module.exports = done => {
-    if (!config.imap.enabled) {
+    if (!config.api.enabled) {
         return setImmediate(() => done(null, false));
     }
 
diff --git a/lib/api/messages.js b/lib/api/messages.js
index 9cc66a0b..7d1793a0 100644
--- a/lib/api/messages.js
+++ b/lib/api/messages.js
@@ -4,7 +4,7 @@ const config = require('wild-config');
 const log = require('npmlog');
 const Joi = require('../joi');
 const MongoPaging = require('mongo-cursor-pagination-node6');
-const addressparser = require('addressparser');
+const addressparser = require('nodemailer/lib/addressparser');
 const ObjectID = require('mongodb').ObjectID;
 const tools = require('../tools');
 const consts = require('../consts');
diff --git a/lib/api/users.js b/lib/api/users.js
index da67f9cf..7e16b719 100644
--- a/lib/api/users.js
+++ b/lib/api/users.js
@@ -7,7 +7,7 @@ const ObjectID = require('mongodb').ObjectID;
 const tools = require('../tools');
 const errors = require('../errors');
 const openpgp = require('openpgp');
-const addressparser = require('addressparser');
+const addressparser = require('nodemailer/lib/addressparser');
 const libmime = require('libmime');
 const consts = require('../consts');
 
diff --git a/lib/maildropper.js b/lib/maildropper.js
index 8f2a9165..fed2108d 100644
--- a/lib/maildropper.js
+++ b/lib/maildropper.js
@@ -1,14 +1,14 @@
 'use strict';
 
 const SeqIndex = require('seq-index');
-const DkimStream = require('./dkim-stream');
+const RelaxedBody = require('nodemailer/lib/dkim/relaxed-body');
 const MessageSplitter = require('./message-splitter');
 const seqIndex = new SeqIndex();
 const GridFSBucket = require('mongodb').GridFSBucket;
 const uuid = require('uuid');
 const os = require('os');
 const hostname = os.hostname().toLowerCase();
-const addressparser = require('addressparser');
+const addressparser = require('nodemailer/lib/addressparser');
 const punycode = require('punycode');
 const tools = require('./tools');
 
@@ -117,7 +117,7 @@ class Maildropper {
         }
 
         let messageSplitter = new MessageSplitter();
-        let dkimStream = new DkimStream();
+        let dkimStream = new RelaxedBody();
 
         messageSplitter.once('headers', headers => {
             envelope.headers = headers;
diff --git a/package.json b/package.json
index df086ff6..f608b2b3 100644
--- a/package.json
+++ b/package.json
@@ -30,7 +30,6 @@
         "request": "^2.87.0"
     },
     "dependencies": {
-        "addressparser": "1.0.1",
         "bcryptjs": "2.4.3",
         "bugsnag": "2.4.2",
         "generate-password": "1.4.0",
@@ -55,7 +54,7 @@
         "mongodb": "3.1.0-beta4",
         "mongodb-extended-json": "1.10.0",
         "node-forge": "0.7.5",
-        "nodemailer": "4.6.6",
+        "nodemailer": "4.6.7",
         "npmlog": "4.1.2",
         "openpgp": "3.0.11",
         "pem": "^1.12.5",
@@ -63,7 +62,7 @@
         "restify": "7.2.1",
         "restify-logger": "2.0.1",
         "seq-index": "1.1.0",
-        "smtp-server": "3.4.5",
+        "smtp-server": "3.4.6",
         "speakeasy": "2.0.0",
         "tlds": "1.203.1",
         "u2f": "0.1.3",