From 9a3ad01dc95bc7af2c7aa4ae67463eecb964c99d Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Mon, 11 Jul 2016 15:47:53 -0400 Subject: [PATCH] actually display prefinery error to users --- controller/action/DownloadActions.class.php | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/controller/action/DownloadActions.class.php b/controller/action/DownloadActions.class.php index 7263bc53..03eae3e9 100644 --- a/controller/action/DownloadActions.class.php +++ b/controller/action/DownloadActions.class.php @@ -172,9 +172,19 @@ class DownloadActions extends Actions $data = json_decode($body, true); - if (!$data || !isset($data['share_link'])) + if (!$data) { - throw new PrefinerySubscribeException('Missing share_link.'); + throw new PrefinerySubscribeException('Received empty response.'); + } + else if (isset($data['errors'])) + { + throw new PrefinerySubscribeException(implode("\n", array_map(function($error) { + return $error['message']; + }, (array)$data['errors']))); + } + else if (!isset($data['share_link'])) + { + throw new PrefinerySubscribeException('Missing share_link'); } $shareLink = $data['share_link'];