Skip to content

Throw ErrorResponseException instead of Guzzle Exception #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open

Throw ErrorResponseException instead of Guzzle Exception #83

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
fb7d14c
Remove copied content from Contact, add ApiKeyName
mogilvie Jul 13, 2021
560af89
Return the package ErrorResponseException
mogilvie Jul 13, 2021
90c8979
Merge branch 'Weble:develop' into develop
mogilvie Jul 13, 2021
766761a
Throw error response exception on 400 exceptions
mogilvie Jul 13, 2021
e2b71b6
Remove } from error message or end of line.
mogilvie Jul 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/Client.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ public function call(string $uri, string $method, array $data = [], array $rawDa
$this->httpClient->$method($this->getUrl() . $uri, $options)
);
} catch (ClientException $e) {

// Retry?
if ($e->getCode() === 401 && ! $this->retriedRefresh) {
$this->oAuthClient->refreshAccessToken();
Expand All @@ -205,6 +206,14 @@ public function call(string $uri, string $method, array $data = [], array $rawDa
return $this->call($uri, $method, $data);
}

// Throw an error response exception on 400 Bad Request to return the Zoho error message.
if (400 === $e->getCode()) {
preg_match('/"code":(\d*)/', $e->getMessage(), $zohoErrorCode);
preg_match('/"message":(.*)[}|\n]/', $e->getMessage(), $zohoErrorMessage);

throw new ErrorResponseException($zohoErrorMessage[1], $zohoErrorCode[1], $e);
}

throw $e;
}
}
Expand Down