Allow users to be verified with both emails if cloudron mail is enabled

src/test/user-test.js

@@ -576,6 +576,25 @@ describe('User', function () {
                 done();
             });
         });
+
+        it('succeeds for both emails with cloudron mail', function (done) {
+            // user settingsdb instead of settings, to not trigger further events
+            settingsdb.set(settings.MAIL_CONFIG_KEY, JSON.stringify({ enabled: true }), function (error) {
+                expect(error).not.to.be.ok();
+
+                user.verifyWithEmail(EMAIL, PASSWORD, function (error, result) {
+                    expect(error).to.not.be.ok();
+                    expect(result).to.be.ok();
+
+                    user.verifyWithEmail(USERNAME + '@' + config.fqdn(), PASSWORD, function (error, result) {
+                        expect(error).to.not.be.ok();
+                        expect(result).to.be.ok();
+
+                        settingsdb.set(settings.MAIL_CONFIG_KEY, JSON.stringify({ enabled: false }), done);
+                    });
+                });
+            });
+        });
     });
 
     describe('retrieving', function () {