Patches for custom workflow users

karrierekick-dev · Jan 22, 2024 · bba3e06 · bba3e06
1 parent a01348b
commit bba3e06
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/Workflows/Config/config.php b/Workflows/Config/config.php
@@ -4,4 +4,5 @@
     'name' => 'Workflows',
 	'process_cron' => env('WORKFLOWS_PROCESS_CRON', '0 * * * *'),
 	'user_full_name' => env('WORKFLOWS_USER_FULL_NAME', 'Workflow'),
+    'user_email' => env('WORKFLOWS_USER_EMAIL', ''),
 ];
diff --git a/Workflows/Entities/Workflow.php b/Workflows/Entities/Workflow.php
@@ -17,6 +17,8 @@ class Workflow extends Model
     // This is obligatory.
     public $rememberCacheDriver = 'array';
 
+    public static $userRunningTheWorkflow = null;
+
     const TYPE_AUTOMATIC = 1;
 	const TYPE_MANUAL    = 2;
 
@@ -694,19 +696,24 @@ public static function runAutomaticForConversation($conversation, $trigger = '')
     /**
      * Run manually.
      */
-    public function runManually($conversation)
+    public function runManually($conversation, $userRunningTheWorkflow=null)
     {
         // $workflow = Workflow::find($workflow_id);
 
         // if (!$workflow) {
         //     return false;
         // }
 
+        if ($userRunningTheWorkflow)
+            self::$userRunningTheWorkflow = $userRunningTheWorkflow;
+
         if (!$conversation) {
             return false;
         }
 
-        $this->performActions($conversation);
+        $this->performActions($conversation, $userRunningTheWorkflow);
+
+        self::$userRunningTheWorkflow = null;
     }
 
     public static function getConditionConfig($type, $mailbox_id)
@@ -1379,6 +1386,13 @@ public function performActions($conversation/*, $mark_processed = true*/)
      */
     public static function getUser()
     {
+        if (self::$userRunningTheWorkflow)
+            return self::$userRunningTheWorkflow;
+
+        $email = config('workflows.user_email');
+        if ($email)
+            return User::where('email', $email)->first();
+
         if (!empty(self::$wf_user)) {
             return self::$wf_user;
         }

diff --git a/Workflows/Http/Controllers/WorkflowsController.php b/Workflows/Http/Controllers/WorkflowsController.php
@@ -247,7 +247,7 @@ public function ajax(Request $request)
 
                         $prev_mailbox_id = $conversation->mailbox_id;
 
-                        $workflow->runManually($conversation);
+                        $workflow->runManually($conversation, $user);
 
                         // If conversation moved to another mailbox, check permissions.
                         if ($prev_mailbox_id != $conversation->mailbox_id) {