Skip to content

Commit fe1e7a0

Browse files
chemidyhiranya911
authored andcommitted
fix FcmErrorCode error type (#192)
* fix FcmErrorCode error type * update changelog
1 parent 9f9a563 commit fe1e7a0

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
# Unreleased
22

3+
- [fixed] Fixing error handling in FCM. The SDK now checks the key
4+
`type.googleapis.com/google.firebase.fcm.v1.FcmError` to set error code.
35
- [added] `messaging.ApsAlert` type now supports subtitle in its payload.
46

57
# v3.4.0

messaging/messaging.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ func (c *Client) makeSendRequest(ctx context.Context, req *fcmRequest) (string,
633633
json.Unmarshal(resp.Body, &fe) // ignore any json parse errors at this level
634634
var serverCode string
635635
for _, d := range fe.Error.Details {
636-
if d.Type == "type.googleapis.com/google.firebase.fcm.v1.FcmErrorCode" {
636+
if d.Type == "type.googleapis.com/google.firebase.fcm.v1.FcmError" {
637637
serverCode = d.ErrorCode
638638
break
639639
}

messaging/messaging_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@ func TestSendError(t *testing.T) {
812812
},
813813
{
814814
resp: `{"error": {"status": "INVALID_ARGUMENT", "message": "test error", "details": [` +
815-
`{"@type": "type.googleapis.com/google.firebase.fcm.v1.FcmErrorCode", "errorCode": "UNREGISTERED"}]}}`,
815+
`{"@type": "type.googleapis.com/google.firebase.fcm.v1.FcmError", "errorCode": "UNREGISTERED"}]}}`,
816816
want: "http error status: 500; reason: app instance has been unregistered; code: registration-token-not-registered; " +
817817
"details: test error",
818818
check: IsRegistrationTokenNotRegistered,

0 commit comments

Comments
 (0)