mailboxdb: merge into mail.js

2021-08-17 15:45:57 -07:00
parent 98ef6dfae9
commit fa9938f50a
12 changed files with 727 additions and 1233 deletions
--- a/src/cloudron.js
+++ b/src/cloudron.js
@@ -209,15 +209,9 @@ function runSystemChecks(callback) {
    ], callback);
 }

-function checkMailStatus(callback) {
-    assert.strictEqual(typeof callback, 'function');
-
-    mail.checkConfiguration(async function (error, message) {
-        if (error) return callback(error);
-
-        await safe(notifications.alert(notifications.ALERT_MAIL_STATUS, 'Email is not configured properly', message));
-        callback();
-    });
+async function checkMailStatus() {
+    const message = await mail.checkConfiguration();
+    await notifications.alert(notifications.ALERT_MAIL_STATUS, 'Email is not configured properly', message);
 }

 async function checkRebootRequired() {