From 51e3fc8cabea308805091b14b639342b5c978311 Mon Sep 17 00:00:00 2001
From: shimon <shimon@appwrite.io>
Date: Sat, 13 Aug 2022 12:59:34 +0300
Subject: [PATCH] some fixes

---
 app/controllers/api/account.php | 2 +-
 app/controllers/api/users.php   | 7 +++++++
 app/controllers/shared/api.php  | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 720c6feee..412af21e9 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -1321,7 +1321,7 @@ App::get('/v1/account/logs')
     ->action(function (int $limit, int $offset, Response $response, Document $user, Locale $locale, Reader $geodb, Database $dbForProject, Stats $usage) {
 
         $audit = new EventAudit($dbForProject);
-
+        var_dump($user);
         $logs = $audit->getLogsByUser($user->getId(), $limit, $offset);
 
         $output = [];
diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index af58c5ca6..4750c3590 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -354,6 +354,7 @@ App::patch('/v1/users/:userId/status')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].update.status')
     ->label('scope', 'users.write')
+    ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'updateStatus')
@@ -389,6 +390,7 @@ App::patch('/v1/users/:userId/verification')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].update.verification')
     ->label('scope', 'users.write')
+    ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'updateEmailVerification')
@@ -424,6 +426,7 @@ App::patch('/v1/users/:userId/verification/phone')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].update.verification')
     ->label('scope', 'users.write')
+    ->label('audits.resource', 'user/{response.$id}')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'updatePhoneVerification')
@@ -624,6 +627,7 @@ App::patch('/v1/users/:userId/prefs')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].update.prefs')
     ->label('scope', 'users.write')
+    ->label('audits.resource', 'user/{request.userId}')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'updatePrefs')
@@ -659,6 +663,7 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].sessions.[sessionId].delete')
     ->label('scope', 'users.write')
+    ->label('audits.resource', 'user/{request.userId}')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'deleteSession')
@@ -707,6 +712,7 @@ App::delete('/v1/users/:userId/sessions')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].sessions.[sessionId].delete')
     ->label('scope', 'users.write')
+    ->label('audits.resource', 'user/{user.$id}')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'deleteSessions')
@@ -753,6 +759,7 @@ App::delete('/v1/users/:userId')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].delete')
     ->label('scope', 'users.write')
+    ->label('audits.resource', 'user/{request.userId}')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'users')
     ->label('sdk.method', 'delete')
diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index 30d77cd35..492143791 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -269,7 +269,7 @@ App::shutdown()
                 $replace = $parts[1];
 
                 $params = match ($namespace) {
-                    'user' => $user,
+                    'user' => (array)$user,
                     'request' => $requestParams,
                     default => $responsePayload,
                 };