Skip to content

Commit 96a4eb2

Browse files
committed
FOUR-29250 ProcessRequestToken: improve getElementDestinationMustacheContext
- Log warning when falling back from DataManager to request data - Use auth()->user() instead of Auth facade - Use JSON_THROW_ON_ERROR for context normalization
1 parent f8aac11 commit 96a4eb2

1 file changed

Lines changed: 2 additions & 3 deletions

File tree

ProcessMaker/Models/ProcessRequestToken.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,15 @@
1717
use ProcessMaker\Events\ActivityAssigned;
1818
use ProcessMaker\Events\ActivityReassignment;
1919
use ProcessMaker\Facades\WorkflowUserManager;
20+
use ProcessMaker\Managers\DataManager;
21+
use ProcessMaker\Models\MustacheExpressionEvaluator;
2022
use ProcessMaker\Nayra\Bpmn\TokenTrait;
2123
use ProcessMaker\Nayra\Contracts\Bpmn\ActivityInterface;
2224
use ProcessMaker\Nayra\Contracts\Bpmn\FlowElementInterface;
2325
use ProcessMaker\Nayra\Contracts\Bpmn\MultiInstanceLoopCharacteristicsInterface;
2426
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
2527
use ProcessMaker\Nayra\Managers\WorkflowManagerDefault;
2628
use ProcessMaker\Nayra\Storage\BpmnDocument;
27-
use ProcessMaker\Managers\DataManager;
28-
use ProcessMaker\Models\MustacheExpressionEvaluator;
2929
use ProcessMaker\Notifications\ActivityActivatedNotification;
3030
use ProcessMaker\Notifications\TaskReassignmentNotification;
3131
use ProcessMaker\Query\Expression;
@@ -1457,7 +1457,6 @@ private function getElementDestinationMustacheContext(): array
14571457
$request = $this->processRequest;
14581458
$context = array_merge($request->data ?? [], $request ? (new DataManager())->updateRequestMagicVariable([], $request) : []);
14591459
$user = $this->user ?? auth()->user();
1460-
14611460
if ($user) {
14621461
$userData = $user->attributesToArray();
14631462
unset($userData['remember_token']);

0 commit comments

Comments
 (0)