Merge pull request #8639 from appwrite/fix-scheduled-executions

Fix: scheduled executions data

src/Appwrite/Event/Event.php

@@ -54,6 +54,7 @@ class Event
     protected array $context = [];
     protected ?Document $project = null;
     protected ?Document $user = null;
+    protected ?string $userId = null;
     protected bool $paused = false;
 
     /**
@@ -145,6 +146,18 @@ class Event
         return $this;
     }
 
+    /**
+     * Set user ID for this event.
+     *
+     * @return self
+     */
+    public function setUserId(string $userId): self
+    {
+        $this->userId = $userId;
+
+        return $this;
+    }
+
     /**
      * Get user responsible for triggering this event.
      *
@@ -155,6 +168,14 @@ class Event
         return $this->user;
     }
 
+    /**
+     * Get user responsible for triggering this event.
+     */
+    public function getUserId(): ?string
+    {
+        return $this->userId;
+    }
+
     /**
      * Set payload for this event.
      *
@@ -303,6 +324,7 @@ class Event
         return $client->enqueue([
             'project' => $this->project,
             'user' => $this->user,
+            'userId' => $this->userId,
             'payload' => $this->payload,
             'context' => $this->context,
             'events' => Event::generateEvents($this->getEvent(), $this->getParams())

src/Appwrite/Event/Func.php

@@ -222,6 +222,7 @@ class Func extends Event
         return $client->enqueue([
             'project' => $this->project,
             'user' => $this->user,
+            'userId' => $this->userId,
             'function' => $this->function,
             'functionId' => $this->functionId,
             'execution' => $this->execution,

src/Appwrite/Platform/Tasks/ScheduleExecutions.php

@@ -45,23 +45,27 @@ class ScheduleExecutions extends ScheduleBase
                 continue;
             }
 
+            $data = $dbForConsole->getDocument(
+                'schedules',
+                $schedule['$id'],
+            )->getAttribute('data', []);
+
             $delay = $scheduledAt->getTimestamp() - (new \DateTime())->getTimestamp();
 
-
-            \go(function () use ($queueForFunctions, $schedule, $delay) {
+            \go(function () use ($queueForFunctions, $schedule, $delay, $data) {
                 Co::sleep($delay);
 
-                $queueForFunctions
-                    ->setType('schedule')
+                $queueForFunctions->setType('schedule')
                     // Set functionId instead of function as we don't have $dbForProject
                     // TODO: Refactor to use function instead of functionId
                     ->setFunctionId($schedule['resource']['functionId'])
                     ->setExecution($schedule['resource'])
-                    ->setMethod($schedule['data']['method'] ?? 'POST')
-                    ->setPath($schedule['data']['path'] ?? '/')
-                    ->setHeaders($schedule['data']['headers'] ?? [])
-                    ->setBody($schedule['data']['body'] ?? '')
+                    ->setMethod($data['method'] ?? 'POST')
+                    ->setPath($data['path'] ?? '/')
+                    ->setHeaders($data['headers'] ?? [])
+                    ->setBody($data['body'] ?? '')
                     ->setProject($schedule['project'])
+                    ->setUserId($data['userId'] ?? '')
                     ->trigger();
             });
 

src/Appwrite/Platform/Workers/Functions.php

@@ -71,12 +71,6 @@ class Functions extends Action
             throw new Exception('Missing payload');
         }
 
-        $payload = $message->getPayload() ?? [];
-
-        if (empty($payload)) {
-            throw new Exception('Missing payload');
-        }
-
         $type = $payload['type'] ?? '';
         $events = $payload['events'] ?? [];
         $data = $payload['body'] ?? '';
@@ -85,9 +79,23 @@ class Functions extends Action
         $function = new Document($payload['function'] ?? []);
         $functionId = $payload['functionId'] ?? '';
         $user = new Document($payload['user'] ?? []);
+        $userId = $payload['userId'] ?? '';
         $method = $payload['method'] ?? 'POST';
         $headers = $payload['headers'] ?? [];
         $path = $payload['path'] ?? '/';
+        $jwt = $payload['jwt'] ?? '';
+
+        if ($user->isEmpty() && !empty($userId)) {
+            $user = $dbForProject->getDocument('users', $userId);
+        }
+
+        if (empty($jwt) && !$user->isEmpty()) {
+            $jwtExpiry = $function->getAttribute('timeout', 900);
+            $jwtObj = new JWT(System::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', $jwtExpiry, 0);
+            $jwt = $jwtObj->encode([
+                'userId' => $user->getId(),
+            ]);
+        }
 
         if ($project->getId() === 'console') {
             return;
@@ -157,7 +165,6 @@ class Functions extends Action
          */
         switch ($type) {
             case 'http':
-                $jwt = $payload['jwt'] ?? '';
                 $execution = new Document($payload['execution'] ?? []);
                 $user = new Document($payload['user'] ?? []);
                 $this->execute(
@@ -194,9 +201,9 @@ class Functions extends Action
                     path: $path,
                     method: $method,
                     headers: $headers,
-                    data: null,
-                    user: null,
-                    jwt: null,
+                    data: $data,
+                    user: $user,
+                    jwt: $jwt,
                     event: null,
                     eventData: null,
                     executionId: $execution->getId() ?? null