Cutlery/beestat
1
0
Fork 0
mirror of https://github.com/beestat/app.git synced 2025-05-31 20:26:32 -04:00
Code Actions Packages Releases Activity

Switched ecobee class fully over to cora exception handling

Browse Source
This commit is contained in:
Jon Ziebell 2020-06-23 22:14:39 -04:00
parent 7012c34fd7
commit 8caaa185be
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/ecobee.php
View File

@ -121,10 +121,10 @@ class ecobee extends external_api {
header('Location: ' . $this->setting->get('beestat_root_uri')); header('Location: ' . $this->setting->get('beestat_root_uri'));
} }
else if(isset($error) === true) { else if(isset($error) === true) {
throw new Exception($error_description); throw new cora\exception($error_description, 10506, false);
} }
else { else {
throw new Exception('Unhandled error'); throw new cora\exception('Unhandled error', 10507, false);
} }
} }
@ -195,7 +195,14 @@ class ecobee extends external_api {
if($this::$log_mysql !== 'all') { if($this::$log_mysql !== 'all') {
$this->log_mysql($curl_response, true); $this->log_mysql($curl_response, true);
} }
throw new Exception('Invalid JSON'); throw new cora\exception(
'Ecobee returned invalid JSON.',
10502,
true,
[
'curl_response' => $curl_response
]
);
} }
// If the token was expired, refresh it and try again. Trying again sets // If the token was expired, refresh it and try again. Trying again sets
@ -211,7 +218,7 @@ class ecobee extends external_api {
if($this::$log_mysql !== 'all') { if($this::$log_mysql !== 'all') {
$this->log_mysql($curl_response); $this->log_mysql($curl_response);
} }
throw new Exception($response['status']['message']); throw new cora\exception($response['status']['message'], 10503);
} }
} }
else if (isset($response['status']) === true && $response['status']['code'] === 16) { else if (isset($response['status']) === true && $response['status']['code'] === 16) {
@ -228,7 +235,7 @@ class ecobee extends external_api {
if($this::$log_mysql !== 'all') { if($this::$log_mysql !== 'all') {
$this->log_mysql($curl_response, true); $this->log_mysql($curl_response, true);
} }
throw new Exception($response['status']['message']); throw new cora\exception($response['status']['message'], 10504);
} }
else if (isset($response['error']) === true) { else if (isset($response['error']) === true) {
// Authorization errors are a bit different // Authorization errors are a bit different
@ -236,7 +243,7 @@ class ecobee extends external_api {
if($this::$log_mysql !== 'all') { if($this::$log_mysql !== 'all') {
$this->log_mysql($curl_response, true); $this->log_mysql($curl_response, true);
} }
throw new Exception(isset($response['error_description']) === true ? $response['error_description'] : $response['error']); throw new cora\exception(isset($response['error_description']) === true ? $response['error_description'] : $response['error'], 10505);
} }
else { else {
return $response; return $response;