From 9fccd83b7a8434f40120a20b14c3030ed9d528d9 Mon Sep 17 00:00:00 2001 From: Esteban Gallego Date: Wed, 6 Sep 2023 13:21:29 -0700 Subject: [PATCH 1/6] Retrieve an admin user if Auth doesn't exist --- .../ImportExport/Exporters/ScriptExecutorExporter.php | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php b/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php index c281e3a8d8..2be29c093f 100644 --- a/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php +++ b/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php @@ -2,8 +2,10 @@ namespace ProcessMaker\ImportExport\Exporters; +use Illuminate\Support\Facades\Auth; use ProcessMaker\Events\ScriptExecutorUpdated; use ProcessMaker\Jobs\BuildScriptExecutor; +use ProcessMaker\Models\User; class ScriptExecutorExporter extends ExporterBase { @@ -19,16 +21,19 @@ public function export() : void public function import() : bool { + $authenticatedUser = Auth::user(); + $userId = $authenticatedUser ? $authenticatedUser->id : User::where('username', 'admin')->firstOrFail()->id; + switch ($this->mode) { case 'copy': case 'new': - BuildScriptExecutor::dispatch($this->model->id, auth()->user()->id); + BuildScriptExecutor::dispatch($this->model->id, $userId); break; case 'update': if (!empty($this->model->getChanges())) { $original = $this->model->getAttributes(); ScriptExecutorUpdated::dispatch($this->model->id, $original, $this->model->getChanges()); - BuildScriptExecutor::dispatch($this->model->id, auth()->user()->id); + BuildScriptExecutor::dispatch($this->model->id, $userId); } break; From e8c82121bbeaee2de5b36efdfbd86d0ca332a52c Mon Sep 17 00:00:00 2001 From: Esteban Gallego Date: Wed, 6 Sep 2023 14:17:27 -0700 Subject: [PATCH 2/6] Pluck user id only --- ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php b/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php index 2be29c093f..b15c203634 100644 --- a/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php +++ b/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php @@ -22,7 +22,7 @@ public function export() : void public function import() : bool { $authenticatedUser = Auth::user(); - $userId = $authenticatedUser ? $authenticatedUser->id : User::where('username', 'admin')->firstOrFail()->id; + $userId = $authenticatedUser ? $authenticatedUser->id : User::where('username', 'admin')->pluck('id'); switch ($this->mode) { case 'copy': From 401c246858d7179f6e648c921cbc9fc10ee9c15a Mon Sep 17 00:00:00 2001 From: Esteban Gallego Date: Wed, 6 Sep 2023 14:50:53 -0700 Subject: [PATCH 3/6] Change conditional to null --- ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php b/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php index b15c203634..07f108837f 100644 --- a/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php +++ b/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php @@ -22,7 +22,7 @@ public function export() : void public function import() : bool { $authenticatedUser = Auth::user(); - $userId = $authenticatedUser ? $authenticatedUser->id : User::where('username', 'admin')->pluck('id'); + $userId = $authenticatedUser ? $authenticatedUser->id : null; switch ($this->mode) { case 'copy': From 7652cd67e9743f5491b70e8da865f80fd4ffce57 Mon Sep 17 00:00:00 2001 From: Esteban Gallego Date: Wed, 6 Sep 2023 14:55:47 -0700 Subject: [PATCH 4/6] Remove runAs from ScriptExecutor --- .../ImportExport/Exporters/ScriptExecutorExporter.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php b/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php index 07f108837f..2bac49462a 100644 --- a/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php +++ b/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php @@ -21,19 +21,16 @@ public function export() : void public function import() : bool { - $authenticatedUser = Auth::user(); - $userId = $authenticatedUser ? $authenticatedUser->id : null; - switch ($this->mode) { case 'copy': case 'new': - BuildScriptExecutor::dispatch($this->model->id, $userId); + BuildScriptExecutor::dispatch($this->model->id); break; case 'update': if (!empty($this->model->getChanges())) { $original = $this->model->getAttributes(); ScriptExecutorUpdated::dispatch($this->model->id, $original, $this->model->getChanges()); - BuildScriptExecutor::dispatch($this->model->id, $userId); + BuildScriptExecutor::dispatch($this->model->id); } break; From d96d935bc5bf7ec8b7295ce7d2ed404c4dc29df9 Mon Sep 17 00:00:00 2001 From: Esteban Gallego Date: Wed, 6 Sep 2023 15:29:54 -0700 Subject: [PATCH 5/6] Update ScriptExecutorExporter.php --- .../ImportExport/Exporters/ScriptExecutorExporter.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php b/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php index 2bac49462a..5bdfd2274c 100644 --- a/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php +++ b/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php @@ -21,16 +21,19 @@ public function export() : void public function import() : bool { + $authenticatedUser = Auth::user(); + $userId = $authenticatedUser ? $authenticatedUser->id : 1; + switch ($this->mode) { case 'copy': case 'new': - BuildScriptExecutor::dispatch($this->model->id); + BuildScriptExecutor::dispatch($this->model->id, $userId); break; case 'update': if (!empty($this->model->getChanges())) { $original = $this->model->getAttributes(); ScriptExecutorUpdated::dispatch($this->model->id, $original, $this->model->getChanges()); - BuildScriptExecutor::dispatch($this->model->id); + BuildScriptExecutor::dispatch($this->model->id, $userId); } break; From af27daf820182bf6ad641c5f96e2ea8689ed2011 Mon Sep 17 00:00:00 2001 From: Esteban Gallego Date: Wed, 6 Sep 2023 16:32:48 -0700 Subject: [PATCH 6/6] Update ScriptExecutorExporter.php --- ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php b/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php index 5bdfd2274c..b15c203634 100644 --- a/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php +++ b/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php @@ -22,7 +22,7 @@ public function export() : void public function import() : bool { $authenticatedUser = Auth::user(); - $userId = $authenticatedUser ? $authenticatedUser->id : 1; + $userId = $authenticatedUser ? $authenticatedUser->id : User::where('username', 'admin')->pluck('id'); switch ($this->mode) { case 'copy':