From a8f5d0d5b2aa66d7b09a12eee368c3bd72e9a3e8 Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Tue, 27 Feb 2024 11:49:53 -0500 Subject: [PATCH 1/2] Remove _user when task is SelfService --- ProcessMaker/Managers/DataManager.php | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ProcessMaker/Managers/DataManager.php b/ProcessMaker/Managers/DataManager.php index 73c8de7d6f..adcc3e5d5f 100644 --- a/ProcessMaker/Managers/DataManager.php +++ b/ProcessMaker/Managers/DataManager.php @@ -91,6 +91,10 @@ private function loadUserData(array $data = [], ProcessRequestToken $token = nul unset($userData['remember_token']); $data['_user'] = $userData; } + // Magic variable: _user is removed when the task is SelfService. + if ($token->is_self_service === 1) { + unset($data['_user']); + } return $data; } @@ -123,12 +127,7 @@ private function loadTokenData(array $data = [], ProcessRequestToken $token = nu } // Magic Variable: _user - $user = $token->user ?: Auth::user(); - if ($user) { - $userData = $user->attributesToArray(); - unset($userData['remember_token']); - $data['_user'] = $userData; - } + $data = $this->loadUserData($data, $token); // Magic Variable: _request $request = $token->getInstance() ?: $token->processRequest; From c77ed1b001c71e707aae168bd069f01f434b386e Mon Sep 17 00:00:00 2001 From: "Marco A. Nina Mena" Date: Tue, 27 Feb 2024 13:13:17 -0500 Subject: [PATCH 2/2] Validate token --- ProcessMaker/Managers/DataManager.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProcessMaker/Managers/DataManager.php b/ProcessMaker/Managers/DataManager.php index adcc3e5d5f..0e1e3575f8 100644 --- a/ProcessMaker/Managers/DataManager.php +++ b/ProcessMaker/Managers/DataManager.php @@ -92,7 +92,7 @@ private function loadUserData(array $data = [], ProcessRequestToken $token = nul $data['_user'] = $userData; } // Magic variable: _user is removed when the task is SelfService. - if ($token->is_self_service === 1) { + if ($token && $token->is_self_service === 1) { unset($data['_user']); }