Fix case where mailbox already exists

2018-09-25 17:04:17 -07:00
parent 1fed7335cf
commit 78d3aafd7a
1 changed files with 3 additions and 2 deletions
--- a/src/apps.js
+++ b/src/apps.js
@@ -720,9 +720,10 @@ function configure(appId, data, user, auditSource, callback) {
            } else {
                error = mail.validateName(data.mailboxName);
                if (error) return callback(error);
-                // make the mailboxName follow any new location
-                mailboxName = data.mailboxName || (app.mailboxName.endsWith('.app') ? mailboxNameForLocation(location, app.manifest) : app.mailboxName);
+                mailboxName = data.mailboxName;
            }
+        } else { // keep existing name or follow the new location
+            mailboxName = app.mailboxName.endsWith('.app') ? mailboxNameForLocation(location, app.manifest) : app.mailboxName;
        }

        if ('alternateDomains' in data) {