feat: streamlined role-revocation logic

2026-08-10 16:24:41 +02:00
parent b39a78da82
commit fd5d478a5c
14 changed files with 426 additions and 22 deletions
@@ -213,6 +213,54 @@ class UserDataHandlerTest extends TestCase
        ];
    }

+    public function testUpdateLocalUserGrantsTheTeamerRoleToAUserWhoBecameATeamer(): void
+    {
+        // created as a candidate for approval, made a teamer in the CRM afterwards
+        $user = (new User())
+            ->setFirstName('First')
+            ->setLastName('Last')
+            ->setEmail('[email protected]')
+            ->setRoles([User::PENDING_ROLES['ROLE_ADMIN']])
+        ;
+
+        $handler = new UserDataHandler($this->entityManager, $this->logger);
+        $handler->updateLocalUser($user, $this->createProfileResponse(), true, [], [User::PENDING_ROLES['ROLE_ADMIN']]);
+
+        $this->assertSame(['ROLE_TEAMER'], $user->getAssignedRoles());
+        $this->assertSame([User::PENDING_ROLES['ROLE_ADMIN']], $user->getPendingRoles());
+    }
+
+    public function testUpdateLocalUserKeepsTheTeamerRoleOfSomebodyTheCrmNoLongerReportsAsTeamer(): void
+    {
+        // the role may have been granted manually and must survive a login
+        $user = (new User())
+            ->setFirstName('First')
+            ->setLastName('Last')
+            ->setEmail('[email protected]')
+            ->setRoles(['ROLE_ADMIN', 'ROLE_TEAMER'])
+        ;
+
+        $handler = new UserDataHandler($this->entityManager, $this->logger);
+        $handler->updateLocalUser($user, $this->createProfileResponse(), false, [], []);
+
+        $this->assertSame(['ROLE_ADMIN', 'ROLE_TEAMER'], $user->getAssignedRoles());
+    }
+
+    public function testUpdateLocalUserGrantsTheTeamerRoleOnlyOnce(): void
+    {
+        $user = (new User())
+            ->setFirstName('First')
+            ->setLastName('Last')
+            ->setEmail('[email protected]')
+            ->setRoles(['ROLE_TEAMER'])
+        ;
+
+        $handler = new UserDataHandler($this->entityManager, $this->logger);
+        $handler->updateLocalUser($user, $this->createProfileResponse(), true, [], []);
+
+        $this->assertSame(['ROLE_TEAMER'], $user->getAssignedRoles());
+    }
+
    public function testDisableForRevokedCrmRolesBlocksTheUserAndDropsThePendingMarkers(): void
    {
        $user = (new User())
@@ -239,7 +287,7 @@ class UserDataHandlerTest extends TestCase
        $this->assertSame([], $user->getPendingRoles());
    }

-    public function testDisableForRevokedCrmRolesLeavesAnExistingBlockUntouched(): void
+    public function testDisableForRevokedCrmRolesLeavesAnExistingBlockUntouchedButStillFlushes(): void
    {
        $disabledAt = new \DateTimeImmutable('2026-01-01 08:00:00');

@@ -253,8 +301,9 @@ class UserDataHandlerTest extends TestCase
            ->setDisabledReasonInternal('Siehe Vorgang 4711.')
        ;

+        // findLocalUser() may have refreshed the BusPro ids on the way here
        $this->entityManager
-            ->expects($this->never())
+            ->expects($this->once())
            ->method('flush');

        $handler = new UserDataHandler($this->entityManager, $this->logger);