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

PMCORE-3405

Browse Source
This commit is contained in:
root
2021-10-07 16:10:28 -04:00
parent 9122c83d56
commit aa4c64569c
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -807,7 +807,8 @@ class RBAC
$this->sSystem = $sSystem;
$fieldsSystem = $this->systemObj->loadByCode($sSystem);
$fieldsRoles = $this->usersRolesObj->getRolesBySystem($fieldsSystem['SYS_UID'], $sUser);
$fieldsPermissions = $this->usersRolesObj->getAllPermissions($fieldsRoles['ROL_UID'], $sUser);
$rolUid = isset($fieldsRoles['ROL_UID']) ? $fieldsRoles['ROL_UID'] : null;
$fieldsPermissions = $this->usersRolesObj->getAllPermissions($rolUid, $sUser);
$this->aUserInfo['USER_INFO'] = $this->userObj->load($sUser);
$this->aUserInfo[$sSystem]['SYS_UID'] = $fieldsSystem['SYS_UID'];
$this->aUserInfo[$sSystem]['ROLE'] = $fieldsRoles;

2
workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php
View File

@@ -432,7 +432,7 @@ class Server implements iAuthenticate
$tokenData = $server->getAccessTokenData($request);
// Set the User Uid
self::$userId = $tokenData['user_id'];
self::$userId = isset($tokenData['user_id']) ? $tokenData['user_id'] : null;
}
return self::$userId;
}