From fff951c8fb1fc05c1b0ed165efa9937dcf8b1fc7 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Mon, 22 Jun 2020 21:38:14 +0300
Subject: [PATCH] Fixed tests

---
 app/app.php                     |  2 --
 app/controllers/api/account.php | 13 +++++++------
 app/controllers/api/users.php   | 14 +++-----------
 3 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/app/app.php b/app/app.php
index 8aa9905a35..64a4967568 100644
--- a/app/app.php
+++ b/app/app.php
@@ -180,8 +180,6 @@ $utopia->init(function () use ($utopia, $request, $response, &$user, $project, $
         }
     }, $user->getAttribute('memberships', []));
 
-    $user->setAttribute('roles', Authorization::getRoles());
-
     // TDOO Check if user is god
 
     if (!\in_array($scope, $scopes)) {
diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index ccb3f50b3e..56e1ffe8a0 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -25,6 +25,7 @@ use Appwrite\Database\Validator\Authorization;
 use Appwrite\Template\Template;
 use Appwrite\OpenSSL\OpenSSL;
 use Appwrite\URL\URL as URLParser;
+use Appwrite\Utopia\Response as UtopiaResponse;
 use DeviceDetector\DeviceDetector;
 use GeoIp2\Database\Reader;
 use Utopia\Validator\ArrayList;
@@ -133,8 +134,8 @@ $utopia->post('/v1/account')
                 ->setParam('resource', 'users/'.$user->getId())
             ;
 
-            $response->json($user->getArrayCopy());
-            //$response->dynamic($user);
+            $response->setStatusCode(UtopiaResponse::STATUS_CODE_CREATED);
+            $response->dynamic($user->setAttribute('roles', Authorization::getRoles()));
         }
     );
 
@@ -528,7 +529,7 @@ $utopia->get('/v1/account')
     ->label('sdk.response', ['200' => 'user'])
     ->action(
         function () use ($response, &$user, $oauth2Keys) {
-            $response->dynamic($user);
+            $response->dynamic($user->setAttribute('roles', Authorization::getRoles()));
         }
     );
 
@@ -709,7 +710,7 @@ $utopia->patch('/v1/account/name')
                 ->setParam('resource', 'users/'.$user->getId())
             ;
 
-            $response->dynamic($user);
+            $response->dynamic($user->setAttribute('roles', Authorization::getRoles()));
         }
     );
 
@@ -743,7 +744,7 @@ $utopia->patch('/v1/account/password')
                 ->setParam('resource', 'users/'.$user->getId())
             ;
 
-            $response->dynamic($user);
+            $response->dynamic($user->setAttribute('roles', Authorization::getRoles()));
         }
     );
 
@@ -793,7 +794,7 @@ $utopia->patch('/v1/account/email')
                 ->setParam('resource', 'users/'.$user->getId())
             ;
 
-            $response->dynamic($user);
+            $response->dynamic($user->setAttribute('roles', Authorization::getRoles()));$response->dynamic($user);
         }
     );
 
diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index d032cef947..03409bd3c7 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -3,7 +3,6 @@
 global $utopia, $response, $projectDB;
 
 use Utopia\Exception;
-use Utopia\Response;
 use Utopia\Validator\Assoc;
 use Utopia\Validator\WhiteList;
 use Utopia\Validator\Email;
@@ -18,6 +17,7 @@ use Appwrite\Auth\Validator\Password;
 use Appwrite\Database\Database;
 use Appwrite\Database\Exception\Duplicate;
 use Appwrite\Database\Validator\UID;
+use Appwrite\Utopia\Response;
 use DeviceDetector\DeviceDetector;
 use GeoIp2\Database\Reader;
 
@@ -79,16 +79,8 @@ $utopia->post('/v1/users')
                 $oauth2Keys[] = 'oauth2'.\ucfirst($key).'AccessToken';
             }
 
-            $response
-                ->setStatusCode(Response::STATUS_CODE_CREATED)
-                ->json(\array_merge($user->getArrayCopy(\array_merge([
-                    '$id',
-                    'status',
-                    'email',
-                    'registration',
-                    'emailVerification',
-                    'name',
-                ], $oauth2Keys)), ['roles' => []]));
+            $response->setStatusCode(Response::STATUS_CODE_CREATED);
+            $response->dynamic($user);
         }
     );