From 753f7cec399042158bcdc2d23ee3be6048b11eba Mon Sep 17 00:00:00 2001 From: Cyrille Hemidy Date: Thu, 15 Nov 2018 18:20:50 +0100 Subject: [PATCH 1/2] fix FcmErrorCode error type --- src/messaging/messaging-api-request.ts | 2 +- test/unit/messaging/messaging.spec.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/messaging/messaging-api-request.ts b/src/messaging/messaging-api-request.ts index ea1286f6ea..dfee224a76 100644 --- a/src/messaging/messaging-api-request.ts +++ b/src/messaging/messaging-api-request.ts @@ -45,7 +45,7 @@ export class FirebaseMessagingRequestHandler { return response.error; } if (validator.isArray(response.error.details)) { - const fcmErrorType = 'type.googleapis.com/google.firebase.fcm.v1.FcmErrorCode'; + const fcmErrorType = 'type.googleapis.com/google.firebase.fcm.v1.FcmError'; for (const element of response.error.details) { if (element['@type'] === fcmErrorType) { return element.errorCode; diff --git a/test/unit/messaging/messaging.spec.ts b/test/unit/messaging/messaging.spec.ts index f01986b0b7..1236bef5ad 100644 --- a/test/unit/messaging/messaging.spec.ts +++ b/test/unit/messaging/messaging.spec.ts @@ -413,7 +413,7 @@ describe('Messaging', () => { message: 'test error message', details: [ { - '@type': 'type.googleapis.com/google.firebase.fcm.v1.FcmErrorCode', + '@type': 'type.googleapis.com/google.firebase.fcm.v1.FcmError', 'errorCode': 'UNREGISTERED', }, ], From a043f0c27af793100ae1819a3d12a89fdfc7c5c3 Mon Sep 17 00:00:00 2001 From: Cyrille Hemidy Date: Thu, 15 Nov 2018 18:29:26 +0100 Subject: [PATCH 2/2] add changelog --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 42f464d765..f58fa947d3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Unreleased -- +- [fixed] Fixing error handling in FCM. The SDK now checks the key + type.googleapis.com/google.firebase.fcm.v1.FcmError to set error code. # v6.1.0