Skip to content

Adding additional details to the error message when available #129

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

Merged
merged 1 commit into from
Apr 4, 2018
Merged

Adding additional details to the error message when available #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions messaging/messaging.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,6 +382,7 @@ type fcmResponse struct {
type fcmError struct {
Error struct {
Status string `json:"status"`
Message string `json:"message"`
Details []struct {
Type string `json:"@type"`
ErrorCode string `json:"errorCode"`
Expand Down Expand Up @@ -439,6 +440,8 @@ func (c *Client) makeSendRequest(ctx context.Context, req *fcmRequest) (string,
msg := fcmErrorCodes[code]
if msg == "" {
msg = fmt.Sprintf("server responded with an unknown error; response: %s", string(resp.Body))
} else if fe.Error.Message != "" {
msg += "; details: " + fe.Error.Message
}
return "", fmt.Errorf("http error status: %d; reason: %s", resp.Status, msg)
}
Expand Down
8 changes: 5 additions & 3 deletions messaging/messaging_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -627,16 +627,18 @@ func TestSendError(t *testing.T) {
},
{
resp: "{\"error\": {\"status\": \"INVALID_ARGUMENT\", \"message\": \"test error\"}}",
want: "http error status: 500; reason: request contains an invalid argument; code: invalid-argument",
want: "http error status: 500; reason: request contains an invalid argument; code: invalid-argument; details: test error",
},
{
resp: "{\"error\": {\"status\": \"NOT_FOUND\", \"message\": \"test error\"}}",
want: "http error status: 500; reason: app instance has been unregistered; code: registration-token-not-registered",
want: "http error status: 500; reason: app instance has been unregistered; code: registration-token-not-registered; " +
"details: test error",
},
{
resp: `{"error": {"status": "INVALID_ARGUMENT", "message": "test error", "details": [` +
`{"@type": "type.googleapis.com/google.firebase.fcm.v1.FcmErrorCode", "errorCode": "UNREGISTERED"}]}}`,
want: "http error status: 500; reason: app instance has been unregistered; code: registration-token-not-registered",
want: "http error status: 500; reason: app instance has been unregistered; code: registration-token-not-registered; " +
"details: test error",
},
{
resp: "not json",
Expand Down