From 227d8dbb7063deaf94ace1218b06767beb023ea3 Mon Sep 17 00:00:00 2001 From: Eldad Fux Date: Thu, 6 Aug 2020 12:54:56 +0300 Subject: [PATCH] Fixed prefs parsing --- app/controllers/api/account.php | 25 ++----------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php index 49769d759f..80c6dc8e8d 100644 --- a/app/controllers/api/account.php +++ b/app/controllers/api/account.php @@ -574,14 +574,7 @@ App::get('/v1/account/prefs') /** @var Appwrite\Swoole\Response $response */ /** @var Appwrite\Database\Document $user */ - $prefs = $user->getAttribute('prefs', '{}'); - - try { - $prefs = \json_decode($prefs, true); - $prefs = ($prefs) ? $prefs : []; - } catch (\Exception $error) { - throw new Exception('Failed to parse prefs', 500); - } + $prefs = $user->getAttribute('prefs', new \stdClass); $response->json($prefs); }, ['response', 'user']); @@ -887,13 +880,6 @@ App::patch('/v1/account/prefs') /** @var Appwrite\Database\Database $projectDB */ /** @var Appwrite\Event\Event $audits */ - $old = \json_decode($user->getAttribute('prefs', '{}'), true); - $old = ($old) ? $old : []; - - $user = $projectDB->updateDocument(\array_merge($user->getArrayCopy(), [ - 'prefs' => \json_encode(\array_merge($old, $prefs)), - ])); - if (false === $user) { throw new Exception('Failed saving user to DB', 500); } @@ -903,14 +889,7 @@ App::patch('/v1/account/prefs') ->setParam('resource', 'users/'.$user->getId()) ; - $prefs = $user->getAttribute('prefs', '{}'); - - try { - $prefs = \json_decode($prefs, true); - $prefs = ($prefs) ? $prefs : []; - } catch (\Exception $error) { - throw new Exception('Failed to parse prefs', 500); - } + $prefs = $user->getAttribute('prefs', new \stdClass); $response->json($prefs); }, ['response', 'user', 'projectDB', 'audits']);