appwrite · eldadfux · Jul 20, 2023 · Jul 19, 2023 · Jul 7, 2023
diff --git a/app/config/collections.php b/app/config/collections.php
@@ -1463,7 +1463,18 @@
                 'default' => null,
                 'array' => false,
                 'filters' => ['userSearch'],
-            ]
+            ],
+            [
+                '$id' => ID::custom('accessedAt'),
+                'type' => Database::VAR_DATETIME,
+                'format' => '',
+                'size' => 0,
+                'signed' => false,
+                'required' => false,
+                'default' => null,
+                'array' => false,
+                'filters' => ['datetime'],
+            ],
         ],
         'indexes' => [
             [
@@ -1528,7 +1539,14 @@
                 'attributes' => ['search'],
                 'lengths' => [],
                 'orders' => [],
-            ]
+            ],
+            [
+                '$id' => '_key_accessedAt',
+                'type' => Database::INDEX_KEY,
+                'attributes' => ['accessedAt'],
+                'lengths' => [],
+                'orders' => [],
+            ],
         ],
     ],
 

diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
@@ -867,7 +867,7 @@
         }
 
         if ($user->isEmpty()) {
-            $user = $dbForProject->getDocument('users', $userId); // Get user
+            $user->setAttributes($dbForProject->getDocument('users', $userId)->getArrayCopy()); // Get user
         }
 
         if ($membership->getAttribute('userId') !== $user->getId()) {
@@ -883,7 +883,7 @@
             ->setAttribute('confirm', true)
         ;
 
-        $user = Authorization::skip(fn() => $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('emailVerification', true)));
+        Authorization::skip(fn() => $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('emailVerification', true)));
 
         // Log user in
 

diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
@@ -169,9 +169,9 @@
             }
         }
 
-    /*
-     * Background Jobs
-     */
+        /*
+        * Background Jobs
+        */
         $events
             ->setEvent($route->getLabel('event', ''))
             ->setProject($project)
@@ -369,15 +369,16 @@
     ->inject('request')
     ->inject('response')
     ->inject('project')
+    ->inject('user')
     ->inject('events')
     ->inject('audits')
     ->inject('usage')
     ->inject('deletes')
     ->inject('database')
     ->inject('mode')
     ->inject('dbForProject')
-    ->action(function (App $utopia, Request $request, Response $response, Document $project, Event $events, Audit $audits, Stats $usage, Delete $deletes, EventDatabase $database, string $mode, Database $dbForProject) use ($parseLabel) {
-
+    ->inject('dbForConsole')
+    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $events, Audit $audits, Stats $usage, Delete $deletes, EventDatabase $database, string $mode, Database $dbForProject, Database $dbForConsole) use ($parseLabel) {
         $responsePayload = $response->getPayload();
 
         if (!empty($events->getEvent())) {
@@ -437,7 +438,6 @@
 
         $route = $utopia->match($request);
         $requestParams = $route->getParamsValues();
-        $user = $audits->getUser();
 
         /**
          * Audit labels
@@ -450,10 +450,7 @@
             }
         }
 
-        $pattern = $route->getLabel('audits.userId', null);
-        if (!empty($pattern)) {
-            $userId = $parseLabel($pattern, $responsePayload, $requestParams, $user);
-            $user = $dbForProject->getDocument('users', $userId);
+        if (!$user->isEmpty()) {
             $audits->setUser($user);
         }
 
@@ -564,6 +561,22 @@
                 ->setParam('project.{scope}.network.outbound', $response->getSize())
                 ->submit();
         }
+
+        /**
+         * Update user last activity
+         */
+        if (!$user->isEmpty()) {
+            $accessedAt = $user->getAttribute('accessedAt', '');
+            if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_USER_ACCCESS)) > $accessedAt) {
+                $user->setAttribute('accessedAt', DateTime::now());
+
+                if (APP_MODE_ADMIN !== $mode) {
+                    $dbForProject->updateDocument('users', $user->getId(), $user);
+                } else {
+                    $dbForConsole->updateDocument('users', $user->getId(), $user);
+                }
+            }
+        }
     });
 
 App::init()

diff --git a/app/init.php b/app/init.php
@@ -100,6 +100,7 @@
 const APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT = 60; // Default maximum write rate period in seconds
 const APP_LIMIT_LIST_DEFAULT = 25; // Default maximum number of items to return in list API calls
 const APP_KEY_ACCCESS = 24 * 60 * 60; // 24 hours
+const APP_USER_ACCCESS = 24 * 60 * 60; // 24 hours
 const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
 const APP_CACHE_BUSTER = 506;
 const APP_VERSION_STABLE = '1.3.7';

diff --git a/composer.json b/composer.json
@@ -43,13 +43,13 @@
         "ext-sockets": "*",
         "appwrite/php-clamav": "1.1.*",
         "appwrite/php-runtimes": "0.11.*",
-        "utopia-php/abuse": "0.26.*",
+        "utopia-php/abuse": "0.27.*",
         "utopia-php/analytics": "0.2.*",
-        "utopia-php/audit": "0.28.*",
+        "utopia-php/audit": "0.29.*",
         "utopia-php/cache": "0.8.*",
         "utopia-php/cli": "0.13.*",
         "utopia-php/config": "0.2.*",
-        "utopia-php/database": "0.37.*",
+        "utopia-php/database": "0.38.*",
         "utopia-php/domains": "1.1.*",
         "utopia-php/framework": "0.28.*",
         "utopia-php/image": "0.5.*",

diff --git a/composer.lock b/composer.lock
diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php
@@ -429,7 +429,7 @@ public function getModels(): array
      */
     public function dynamic(Document $document, string $model): void
     {
-        $output = $this->output($document, $model);
+        $output = $this->output(new Document($document->getArrayCopy()), $model);
 
         // If filter is set, parse the output
         if (self::hasFilter()) {
@@ -470,33 +470,33 @@ public function dynamic(Document $document, string $model): void
      */
     public function output(Document $document, string $model): array
     {
-        $data       = $document;
+        $data       = new Document($document->getArrayCopy());
         $model      = $this->getModel($model);
         $output     = [];
 
-        $document = $model->filter($document);
+        $data = $model->filter($document);
 
         if ($model->isAny()) {
-            $this->payload = $document->getArrayCopy();
+            $this->payload = $data->getArrayCopy();
 
             return $this->payload;
         }
 
         foreach ($model->getRules() as $key => $rule) {
             if (!$document->isSet($key) && $rule['required']) { // do not set attribute in response if not required
                 if (\array_key_exists('default', $rule)) {
-                    $document->setAttribute($key, $rule['default']);
+                    $data->setAttribute($key, $rule['default']);
                 } else {
                     throw new Exception('Model ' . $model->getName() . ' is missing response key: ' . $key);
                 }
             }
 
             if ($rule['array']) {
-                if (!is_array($data[$key])) {
+                if (!is_array($document[$key])) {
                     throw new Exception($key . ' must be an array of type ' . $rule['type']);
                 }
 
-                foreach ($data[$key] as $index => $item) {
+                foreach ($document[$key] as $index => $item) {
                     if ($item instanceof Document) {
                         if (\is_array($rule['type'])) {
                             foreach ($rule['type'] as $type) {
@@ -524,7 +524,7 @@ public function output(Document $document, string $model): array
                     }
                 }
             } else {
-                if ($data[$key] instanceof Document) {
+                if ($document[$key] instanceof Document) {
                     $data[$key] = $this->output($data[$key], $rule['type']);
                 }
             }

diff --git a/src/Appwrite/Utopia/Response/Model/User.php b/src/Appwrite/Utopia/Response/Model/User.php
@@ -120,6 +120,12 @@ public function __construct()
                 'default' => new \stdClass(),
                 'example' => ['theme' => 'pink', 'timezone' => 'UTC'],
             ])
+            ->addRule('accessedAt', [
+                'type' => self::TYPE_DATETIME,
+                'description' => 'Most recent access date in ISO 8601 format.',
+                'default' => '',
+                'example' => self::TYPE_DATETIME_EXAMPLE,
+            ])
         ;
     }