Merge pull request #4 from nutshellcrm/better-401

flav · flav · commit 03f0f17206bf · 2015-04-08T10:51:14.000-04:00
Throw exception on JSON-RPC error in endpoint discovery
diff --git a/NutshellApi.php b/NutshellApi.php
@@ -160,6 +160,9 @@ protected function _getApiEndpointForUser($username) {
 		curl_close($curl);
 
 		$decoded = $this->json_decode($result);
+		if ($decoded->error !== NULL) {
+			throw new NutshellApiException($decoded->error->message);
+		}
 		return 'https://' . $decoded->result->api . '/api/v1/json';
 	}
 	

Original file line number	Diff line number	Diff line change
`@@ -160,6 +160,9 @@ protected function _getApiEndpointForUser($username) {`
`160`	`160`	`curl_close($curl);`
`161`	`161`
`162`	`162`	`$decoded = $this->json_decode($result);`
	`163`	`+ if ($decoded->error !== NULL) {`
	`164`	`+ throw new NutshellApiException($decoded->error->message);`
	`165`	`+ }`
`163`	`166`	`return 'https://' . $decoded->result->api . '/api/v1/json';`
`164`	`167`	`}`
`165`	`168`