fix(web-ui): Do not clear up IMAP settings when enabling/disabling IM…

…AP in the web UI
postalsys · Apr 11, 2024 · 037091b · 037091b
1 parent c97fc4a
commit 037091b
Showing 1 changed file with 18 additions and 12 deletions.
diff --git a/lib/routes-ui.js b/lib/routes-ui.js
@@ -7309,22 +7309,28 @@ ${Buffer.from(data.content, 'base64url').toString('base64')}
                     });
 
                 if (request.payload.imap) {
-                    let imapAuth = Object.assign((oldData.imap && oldData.imap.auth) || {}, { user: request.payload.imap_auth_user });
                     let imapTls = (oldData.imap && oldData.imap.tls) || {};
 
-                    if (request.payload.imap_auth_pass) {
-                        imapAuth.pass = request.payload.imap_auth_pass;
+                    let updateKeys = {
+                        tls: imapTls
+                    };
+
+                    for (let key of ['host', 'port', 'disabled', 'sentMailPath']) {
+                        if (`imap_${key}` in request.payload) {
+                            updateKeys[key] = request.payload[`imap_${key}`];
+                        }
                     }
 
-                    updates.imap = Object.assign(oldData.imap || {}, {
-                        host: request.payload.imap_host,
-                        port: request.payload.imap_port,
-                        secure: request.payload.imap_secure,
-                        disabled: request.payload.imap_disabled,
-                        sentMailPath: request.payload.imap_sentMailPath,
-                        auth: imapAuth,
-                        tls: imapTls
-                    });
+                    if ('imap_auth_user' in request.payload) {
+                        let imapAuth = Object.assign((oldData.imap && oldData.imap.auth) || {}, { user: request.payload.imap_auth_user });
+                        if (request.payload.imap_auth_pass) {
+                            imapAuth.pass = request.payload.imap_auth_pass;
+                        }
+                        updateKeys.auth = imapAuth;
+                        updateKeys.secure = request.payload.imap_secure;
+                    }
+
+                    updates.imap = Object.assign(oldData.imap || {}, updateKeys);
 
                     if (request.payload.imap_resyncDelay) {
                         updates.imap.resyncDelay = request.payload.imap_resyncDelay;