Refactor UsersService and tests: update addUser to support optional role parameter, enhance resolveUserFieldValue with improved default handling, and adjust workflows for compatibility.

Author: byjg

tests/TestUsersBase.php

@@ -174,7 +174,7 @@ public function testIsAdmin(): void
         // Check user has no role initially
         $user3 = $this->object->getById($this->prefix . '3');
         $this->assertFalse($user3->hasRole('admin'));
-        $this->assertEmpty($user3->getRole());
+        $this->assertEquals("foobar", $user3->getRole());
 
         // Set a role
         $login = $this->__chooseValue('user3', '[email protected]');
@@ -220,7 +220,6 @@ protected function expectedToken(string $tokenData, string $login, int $userId):
             'tokenData' => $tokenData,
             'userid' => $userId,
             'name' => $user->getName(),
-            'role' => $user->getRole(),
         ];
 
         $tokenResult = $this->object->isValidToken($loginCreated, $jwtWrapper, $userToken->token);
@@ -230,11 +229,8 @@ protected function expectedToken(string $tokenData, string $login, int $userId):
 
         // Compare user fields (excluding timestamps which may differ)
         $this->assertEquals($user->getUserid(), $tokenResult->user->getUserid());
-        $this->assertEquals($user->getName(), $tokenResult->user->getName());
-        $this->assertEquals($user->getEmail(), $tokenResult->user->getEmail());
-        $this->assertEquals($user->getUsername(), $tokenResult->user->getUsername());
-        $this->assertEquals($user->getPassword(), $tokenResult->user->getPassword());
-        $this->assertEquals($user->getRole(), $tokenResult->user->getRole());
+        $this->assertEquals($user->get("userData"), "userValue");
+        $this->assertEquals($user->get("userData"), $tokenResult->user->get("userData"));
     }
 
     /**
@@ -332,7 +328,7 @@ public function testCreateAuthTokenIncludesDefaultUserFields(): void
 
         $this->assertArrayHasKey('userid', $userToken->data);
         $this->assertArrayHasKey('name', $userToken->data);
-        $this->assertArrayHasKey('role', $userToken->data);
+        $this->assertArrayNotHasKey('role', $userToken->data); // Role isn't set because is null
         $this->assertEquals(2, $userToken->data['userid']);
     }
 

tests/UsersDBDataset2ByUserNameTestUsersBase.php

@@ -51,9 +51,9 @@ public function __setUp($loginField)
             $loginField
         );
 
-        $this->object->addUser('User 1', 'user1', '[email protected]', 'pwd1');
+        $this->object->addUser('User 1', 'user1', '[email protected]', 'pwd1', "role3");
         $this->object->addUser('User 2', 'user2', '[email protected]', 'pwd2');
-        $this->object->addUser('User 3', 'user3', '[email protected]', 'pwd3');
+        $this->object->addUser('User 3', 'user3', '[email protected]', 'pwd3', "foobar");
     }
 
     #[\Override]

tests/UsersDBDatasetByUsernameTestUsersBase.php

@@ -64,7 +64,7 @@ public function __setUp($loginField)
         $this->assertMatchesRegularExpression('/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/', $user->getCreatedAt());
 
         $this->object->addUser('User 2', 'user2', '[email protected]', 'pwd2');
-        $this->object->addUser('User 3', 'user3', '[email protected]', 'pwd3');
+        $this->object->addUser('User 3', 'user3', '[email protected]', 'pwd3', 'foobar');
     }
 
     #[\Override]

tests/UsersDBDatasetDefinitionTest.php

@@ -74,7 +74,7 @@ public function __setUp($loginField)
             new MyUserModel('User 2', '[email protected]', 'user2', 'pwd2', '', 'other 2')
         );
         $this->object->save(
-            new MyUserModel('User 3', '[email protected]', 'user3', 'pwd3', '', 'other 3')
+            new MyUserModel('User 3', '[email protected]', 'user3', 'pwd3', 'foobar', 'other 3')
         );
     }