fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/PMCORE-2150 (pull request #7478)

Browse Source 
PMCORE-2150 PMFUpdateUser() function doesn't update due date to all users in RBAC_USERS

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Roly Rudy Gutierrez Pinto
2020-09-28 19:25:05 +00:00
committed by Julio Cesar Laura Avendaño
parent 8e77f9d4ab edeae3ff3b
commit d5020bd2d4
2 changed files with 25 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gulliver/system/class.rbac.php
View File

@@ -1169,12 +1169,14 @@ class RBAC
$dataCase['USR_STATUS'] = 1; $dataCase['USR_STATUS'] = 1;
} }
} }
$currentUser = $this->userObj;
$this->userObj = new RbacUsers();
$this->userObj->update($dataCase); $this->userObj->update($dataCase);
if ($rolCode != '') { if ($rolCode != '') {
$this->removeRolesFromUser($dataCase['USR_UID']); $this->removeRolesFromUser($dataCase['USR_UID']);
$this->assignRoleToUser($dataCase['USR_UID'], $rolCode); $this->assignRoleToUser($dataCase['USR_UID'], $rolCode);
} }
$this->userObj = $currentUser;
} }
/** /**

22
tests/unit/gulliver/system/rbacTest.php
View File

@@ -28,4 +28,26 @@ class rbacTest extends TestCase
]; ];
$this->assertContains($subset, $authorizedActions); $this->assertContains($subset, $authorizedActions);
} }
/**
* This test the updateUser method.
* @test
* @covers \RBAC::updateUser()
*/
public function it_should_test_updateUser_method()
{
$data = [
'USR_UID' => '00000000000000000000000000000001',
'USR_DUE_DATE' => '2050-01-01',
'USR_STATUS' => 'ACTIVE'
];
$rolCode = 'PROCESSMAKER_ADMIN';
$rbac = new RBAC();
$rbac->initRBAC();
$result = $rbac->updateUser($data, $rolCode);
//assert
$user = \ProcessMaker\Model\RbacUsers::where('USR_UID', '=', $data['USR_UID'])->first()->toArray();
$this->assertEquals($data['USR_DUE_DATE'], $user['USR_DUE_DATE']);
}
} }