From aa4c64569c865162efcc0ba48d94ad0d13b0cdb2 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 7 Oct 2021 16:10:28 -0400 Subject: [PATCH] PMCORE-3405 --- gulliver/system/class.rbac.php | 3 ++- workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gulliver/system/class.rbac.php b/gulliver/system/class.rbac.php index 00b430293..4f916a778 100644 --- a/gulliver/system/class.rbac.php +++ b/gulliver/system/class.rbac.php @@ -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; diff --git a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php index fe67ef7e4..cde74a348 100644 --- a/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php +++ b/workflow/engine/src/ProcessMaker/Services/OAuth2/Server.php @@ -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; }