Merge branch '2021.11' into 2022.11

tine20 · May 12, 2022 · 55c21a5 · 55c21a5
2 parents 49ecc16 + 85ee242
commit 55c21a5
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 5 deletions.
diff --git a/tests/tine20/Tinebase/ControllerTest.php b/tests/tine20/Tinebase/ControllerTest.php
@@ -35,8 +35,8 @@ class Tinebase_ControllerTest extends TestCase
      * @access protected
      */
     protected function setUp(): void
-{
-        Tinebase_TransactionManager::getInstance()->startTransaction(Tinebase_Core::getDb());
+    {
+        parent::setUp();
         $this->_instance = Tinebase_Controller::getInstance();
     }
 
@@ -47,9 +47,9 @@ protected function setUp(): void
      * @access protected
      */
     protected function tearDown(): void
-{
+    {
         Tinebase_Config::getInstance()->maintenanceMode = 0;
-        Tinebase_TransactionManager::getInstance()->rollBack();
+        parent::tearDown();
     }
 
     /**
@@ -101,6 +101,29 @@ public function testMaintenanceModeLoginFailAll()
         $this->testMaintenanceModeLoginFail(Tinebase_Config::MAINTENANCE_MODE_ALL);
     }
 
+    public function testLoginCreateMailaccount()
+    {
+        $this->_skipWithoutEmailSystemAccountConfig();
+
+        $filter = Tinebase_Model_Filter_FilterGroup::getFilterForModel(Felamimail_Model_Account::class, [
+            ['field' => 'user_id', 'operator' => 'equals', 'value' => $this->_personas['sclever']->getId()]
+        ]);
+        $emailAccounts = Admin_Controller_EmailAccount::getInstance()->search($filter);
+        Admin_Controller_EmailAccount::getInstance()->delete($emailAccounts->getArrayOfIds());
+
+        $this->_instance->login(
+            'sclever',
+            Tinebase_Helper::array_value('password', TestServer::getInstance()->getTestCredentials()),
+            new Tinebase_Http_Request()
+        );
+        Tinebase_Core::setUser($this->_originalTestUser);
+        $filter = Tinebase_Model_Filter_FilterGroup::getFilterForModel(Felamimail_Model_Account::class, [
+            ['field' => 'user_id', 'operator' => 'equals', 'value' => $this->_personas['sclever']->getId()]
+        ]);
+        $emailAccounts = Admin_Controller_EmailAccount::getInstance()->search($filter);
+        self::assertEquals(1, count($emailAccounts));
+    }
+
     /**
      * testCleanupCache
      */

diff --git a/tine20/Felamimail/Controller.php b/tine20/Felamimail/Controller.php
@@ -145,7 +145,7 @@ protected function _handleEvent(Tinebase_Event_Abstract $_eventObject)
     public function handleAccountLogin(Tinebase_Model_FullUser $_account, $pwd)
     {
         if (Tinebase_Config::getInstance()->{Tinebase_Config::IMAP}->{Tinebase_Config::IMAP_USE_SYSTEM_ACCOUNT}
-            && ! empty($_account->email)
+            && ! empty($_account->accountEmailAddress)
         ) {
             // this is sort of a weird flag to make addSystemAccount do its actual work
             $_account->imapUser = new Tinebase_Model_EmailUser(null, true);