From 6c8e4ea339ef1904dfbffdd56dab031bece1134d Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Wed, 9 Sep 2020 12:27:08 +0300
Subject: [PATCH] Added payloads for no-content requests

---
 app/controllers/api/account.php  | 33 +++++---------------------------
 src/Appwrite/Utopia/Response.php |  2 +-
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index c48557edc1..5a86298aae 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -107,13 +107,6 @@ App::post('/v1/account')
             throw new Exception('Failed saving user to DB', 500);
         }
 
-        $webhooks
-            ->setParam('payload', [
-                'name' => $name,
-                'email' => $email,
-            ])
-        ;
-
         $audits
             ->setParam('userId', $user->getId())
             ->setParam('event', 'account.create')
@@ -237,14 +230,7 @@ App::post('/v1/account/sessions')
         if (false === $profile) {
             throw new Exception('Failed saving user to DB', 500);
         }
-
-        $webhooks
-            ->setParam('payload', [
-                'name' => $profile->getAttribute('name', ''),
-                'email' => $profile->getAttribute('email', ''),
-            ])
-        ;
-
+        
         $audits
             ->setParam('userId', $profile->getId())
             ->setParam('event', 'account.sessions.create')
@@ -990,10 +976,7 @@ App::delete('/v1/account')
         ;
 
         $webhooks
-            ->setParam('payload', [
-                'name' => $user->getAttribute('name', ''),
-                'email' => $user->getAttribute('email', ''),
-            ])
+            ->setParam('payload', $response->output($user, Response::MODEL_USER))
         ;
 
         if (!Config::getParam('domainVerification')) {
@@ -1048,10 +1031,7 @@ App::delete('/v1/account/sessions/:sessionId')
                 ;
 
                 $webhooks
-                    ->setParam('payload', [
-                        'name' => $user->getAttribute('name', ''),
-                        'email' => $user->getAttribute('email', ''),
-                    ])
+                    ->setParam('payload', $response->output($user, Response::MODEL_USER))
                 ;
 
                 if (!Config::getParam('domainVerification')) {
@@ -1105,12 +1085,9 @@ App::delete('/v1/account/sessions')
                 ->setParam('event', 'account.sessions.delete')
                 ->setParam('resource', '/user/'.$user->getId())
             ;
-
+            
             $webhooks
-                ->setParam('payload', [
-                    'name' => $user->getAttribute('name', ''),
-                    'email' => $user->getAttribute('email', ''),
-                ])
+                ->setParam('payload', $response->output($user, Response::MODEL_USER))
             ;
 
             if (!Config::getParam('domainVerification')) {
diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php
index ec5e24497c..5f282d5877 100644
--- a/src/Appwrite/Utopia/Response.php
+++ b/src/Appwrite/Utopia/Response.php
@@ -210,7 +210,7 @@ class Response extends SwooleResponse
     /**
      * Generate valid response object from document data
      */
-    protected function output(Document $document, string $model): array
+    public function output(Document $document, string $model): array
     {
         $data       = $document;
         $model      = $this->getModel($model);